3do videos now controlled as an addon pack.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3104 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/sc2code/setup.c

@@ -125,6 +125,11 @@ LoadKernel (int argc, char *argv[])
 		loadAddon ("remix");
 	}
 
+	if (optWhichIntro == OPT_3DO)
+	{
+		loadAddon ("3dovideo");
+	}
+
 	/* Now load the rest of the addons, in order. */
 	prepareAddons (optAddons);
 

sc2/src/starcon2.c

@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 		/* .whichCoarseScan = */    OPT_PC,
 		/* .whichMenu = */          OPT_PC,
 		/* .whichFont = */          OPT_PC,
-		/* .whichIntro = */         OPT_3DO,
+		/* .whichIntro = */         OPT_PC,
 		/* .whichShield	= */        OPT_PC,
 		/* .smoothScroll = */       OPT_PC,
 		/* .meleeScale = */         TFB_SCALE_TRILINEAR,