Moved the 3DO music into an addon pack '3domusic'.

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

sc2/ChangeLog

@@ -1,5 +1,6 @@
 Changes towards version 0.7:
-- Major change in resource index scheme. 
+- 3DO music separated into an addon pack - Michael
+- Major change in resource index scheme - Michael
   - .lst replaced (mapping to IDs instead of to files)
   - .rmp files give the mapping from IDs to files. 
   - Addons provide additional files instead of overriding UIO

sc2/content/3domusic.rmp

@@ -1,12 +0,0 @@
-music.arispace = lbm/arispace.ogg
-music.battle = lbm/battle.ogg
-music.hyper = lbm/hyper.ogg
-music.orbit1 = ipanims/orbit1.ogg
-music.orbit2 = ipanims/orbit2.ogg
-music.orbit3 = ipanims/orbit3.ogg
-music.orbit4 = ipanims/orbit4.ogg
-music.orbit5 = ipanims/orbit5.ogg
-music.outfit = lbm/outfit.ogg
-music.shipyard = lbm/shipyard.ogg
-music.space = ipanims/space.ogg
-music.starbase = lbm/starbase.ogg

sc2/content/addons/3domusic/3domusic.rmp

@@ -0,0 +1,13 @@
+music.arispace = addons/3domusic/arispace.ogg
+music.battle = addons/3domusic/battle.ogg
+music.hyper = addons/3domusic/hyper.ogg
+music.orbit1 = addons/3domusic/orbit1.ogg
+music.orbit2 = addons/3domusic/orbit2.ogg
+music.orbit3 = addons/3domusic/orbit3.ogg
+music.orbit4 = addons/3domusic/orbit4.ogg
+music.orbit5 = addons/3domusic/orbit5.ogg
+music.outfit = addons/3domusic/outfit.ogg
+music.shipyard = addons/3domusic/shipyard.ogg
+music.space = addons/3domusic/space.ogg
+music.starbase = addons/3domusic/starbase.ogg
+music.credits = addons/3domusic/credits.ogg

sc2/content/starcon.ls2

@@ -438,13 +438,13 @@
 260 263   2 graphics.yeg__sml
 261  12   6 music.battle
 262 264   2 credits.background
-282  13   6 credits.creditsmusic
+282  13   6 music.credits
 283 284   2 graphics.sisskeleton
 284 285   2 graphics.orbenter
 285 286   2 graphics.setupmenu
 285 287   4 text.setupmenu
-286  98   4 ship.slides/intro.text
+286  98   4 slides.intro
-287  99   4 ship.slides/ending.text
+287  99   4 slides.ending
 288   5   3 credits.font.pt13
 288   6   3 credits.font.pt17
 288   7   3 credits.font.pt45

sc2/content/uqm.rmp

@@ -202,7 +202,6 @@ comm.zoqfot.music = comm/zoqfot/zoqfot.mod
 comm.zoqfot.resources = comm/zoqfot.ls2
 credits.background = credits/credback.ani
 credits.credits = credits/credits.txt
-credits.creditsmusic = credits/credits.ogg
 credits.font.pt13 = credits/pt13.fon
 credits.font.pt17 = credits/pt17.fon
 credits.font.pt45 = credits/pt45.fon
@@ -742,8 +741,8 @@ ship.sis_ship.graphics.sis.small = sis_ship/sis.sml
 ship.sis_ship.graphics.sishyper = sis_ship/sishyper.ani
 ship.sis_ship.icons = sis_ship/sisicons.ani
 ship.sis_ship.sounds = sis_ship/sissound.snd
-ship.slides/ending.text = slides/ending/ending.txt
+slides.ending = slides/ending/ending.txt
-ship.slides/intro.text = slides/intro/intro.txt
+slides.intro = slides/intro/intro.txt
 ship.slylandr.code = slylandr/slylandr.cod
 ship.slylandr.ditty = slylandr/slyditty.mod
 ship.slylandr.graphics.captain = slylandr/slycap.ani

sc2/src/sc2code/setup.c

@@ -115,11 +115,10 @@ LoadKernel (int argc, char *argv[])
 	if (hResIndex == 0)
 		return FALSE;
 
-	/* TODO: This code must die once 3domusic becomes an addon
+	/* TODO: This code must die once addons are convenient to use. */
-	 * pack in its own right. */
 	if (optWhichMusic == OPT_3DO)
 	{
-		res_LoadFilename (contentDir, "3domusic.rmp");
+		res_LoadFilename (contentDir, "addons/3domusic/3domusic.rmp");
 	}
 
 	/* Now load the rest of the addons, in order. */