From 52c333a8503808e8cd318e375a644072fb5c0feb Mon Sep 17 00:00:00 2001 From: mcmartin Date: Mon, 10 Dec 2007 03:42:38 +0000 Subject: [PATCH] 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 | 3 ++- sc2/content/3domusic.rmp | 12 ------------ sc2/content/addons/3domusic/3domusic.rmp | 13 +++++++++++++ sc2/content/{lbm => addons/3domusic}/arispace.ogg | Bin sc2/content/{lbm => addons/3domusic}/battle.ogg | Bin .../{credits => addons/3domusic}/credits.ogg | Bin sc2/content/{lbm => addons/3domusic}/hyper.ogg | Bin .../{ipanims => addons/3domusic}/orbit1.ogg | Bin .../{ipanims => addons/3domusic}/orbit2.ogg | Bin .../{ipanims => addons/3domusic}/orbit3.ogg | Bin .../{ipanims => addons/3domusic}/orbit4.ogg | Bin .../{ipanims => addons/3domusic}/orbit5.ogg | Bin sc2/content/{lbm => addons/3domusic}/outfit.ogg | Bin sc2/content/{lbm => addons/3domusic}/shipyard.ogg | Bin sc2/content/{ipanims => addons/3domusic}/space.ogg | Bin sc2/content/{lbm => addons/3domusic}/starbase.ogg | Bin sc2/content/starcon.ls2 | 6 +++--- sc2/content/uqm.rmp | 5 ++--- sc2/src/sc2code/setup.c | 5 ++--- 19 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 sc2/content/3domusic.rmp create mode 100644 sc2/content/addons/3domusic/3domusic.rmp rename sc2/content/{lbm => addons/3domusic}/arispace.ogg (100%) rename sc2/content/{lbm => addons/3domusic}/battle.ogg (100%) rename sc2/content/{credits => addons/3domusic}/credits.ogg (100%) rename sc2/content/{lbm => addons/3domusic}/hyper.ogg (100%) rename sc2/content/{ipanims => addons/3domusic}/orbit1.ogg (100%) rename sc2/content/{ipanims => addons/3domusic}/orbit2.ogg (100%) rename sc2/content/{ipanims => addons/3domusic}/orbit3.ogg (100%) rename sc2/content/{ipanims => addons/3domusic}/orbit4.ogg (100%) rename sc2/content/{ipanims => addons/3domusic}/orbit5.ogg (100%) rename sc2/content/{lbm => addons/3domusic}/outfit.ogg (100%) rename sc2/content/{lbm => addons/3domusic}/shipyard.ogg (100%) rename sc2/content/{ipanims => addons/3domusic}/space.ogg (100%) rename sc2/content/{lbm => addons/3domusic}/starbase.ogg (100%) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 339379a1f..e3cf3d198 100644 --- a/sc2/ChangeLog +++ b/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 diff --git a/sc2/content/3domusic.rmp b/sc2/content/3domusic.rmp deleted file mode 100644 index 3e0f71b79..000000000 --- a/sc2/content/3domusic.rmp +++ /dev/null @@ -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 diff --git a/sc2/content/addons/3domusic/3domusic.rmp b/sc2/content/addons/3domusic/3domusic.rmp new file mode 100644 index 000000000..5db1c909f --- /dev/null +++ b/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 diff --git a/sc2/content/lbm/arispace.ogg b/sc2/content/addons/3domusic/arispace.ogg similarity index 100% rename from sc2/content/lbm/arispace.ogg rename to sc2/content/addons/3domusic/arispace.ogg diff --git a/sc2/content/lbm/battle.ogg b/sc2/content/addons/3domusic/battle.ogg similarity index 100% rename from sc2/content/lbm/battle.ogg rename to sc2/content/addons/3domusic/battle.ogg diff --git a/sc2/content/credits/credits.ogg b/sc2/content/addons/3domusic/credits.ogg similarity index 100% rename from sc2/content/credits/credits.ogg rename to sc2/content/addons/3domusic/credits.ogg diff --git a/sc2/content/lbm/hyper.ogg b/sc2/content/addons/3domusic/hyper.ogg similarity index 100% rename from sc2/content/lbm/hyper.ogg rename to sc2/content/addons/3domusic/hyper.ogg diff --git a/sc2/content/ipanims/orbit1.ogg b/sc2/content/addons/3domusic/orbit1.ogg similarity index 100% rename from sc2/content/ipanims/orbit1.ogg rename to sc2/content/addons/3domusic/orbit1.ogg diff --git a/sc2/content/ipanims/orbit2.ogg b/sc2/content/addons/3domusic/orbit2.ogg similarity index 100% rename from sc2/content/ipanims/orbit2.ogg rename to sc2/content/addons/3domusic/orbit2.ogg diff --git a/sc2/content/ipanims/orbit3.ogg b/sc2/content/addons/3domusic/orbit3.ogg similarity index 100% rename from sc2/content/ipanims/orbit3.ogg rename to sc2/content/addons/3domusic/orbit3.ogg diff --git a/sc2/content/ipanims/orbit4.ogg b/sc2/content/addons/3domusic/orbit4.ogg similarity index 100% rename from sc2/content/ipanims/orbit4.ogg rename to sc2/content/addons/3domusic/orbit4.ogg diff --git a/sc2/content/ipanims/orbit5.ogg b/sc2/content/addons/3domusic/orbit5.ogg similarity index 100% rename from sc2/content/ipanims/orbit5.ogg rename to sc2/content/addons/3domusic/orbit5.ogg diff --git a/sc2/content/lbm/outfit.ogg b/sc2/content/addons/3domusic/outfit.ogg similarity index 100% rename from sc2/content/lbm/outfit.ogg rename to sc2/content/addons/3domusic/outfit.ogg diff --git a/sc2/content/lbm/shipyard.ogg b/sc2/content/addons/3domusic/shipyard.ogg similarity index 100% rename from sc2/content/lbm/shipyard.ogg rename to sc2/content/addons/3domusic/shipyard.ogg diff --git a/sc2/content/ipanims/space.ogg b/sc2/content/addons/3domusic/space.ogg similarity index 100% rename from sc2/content/ipanims/space.ogg rename to sc2/content/addons/3domusic/space.ogg diff --git a/sc2/content/lbm/starbase.ogg b/sc2/content/addons/3domusic/starbase.ogg similarity index 100% rename from sc2/content/lbm/starbase.ogg rename to sc2/content/addons/3domusic/starbase.ogg diff --git a/sc2/content/starcon.ls2 b/sc2/content/starcon.ls2 index 2ca36ef93..51cef4836 100644 --- a/sc2/content/starcon.ls2 +++ b/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 -287 99 4 ship.slides/ending.text +286 98 4 slides.intro +287 99 4 slides.ending 288 5 3 credits.font.pt13 288 6 3 credits.font.pt17 288 7 3 credits.font.pt45 diff --git a/sc2/content/uqm.rmp b/sc2/content/uqm.rmp index 149bc374b..dccb5fd67 100644 --- a/sc2/content/uqm.rmp +++ b/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 -ship.slides/intro.text = slides/intro/intro.txt +slides.ending = slides/ending/ending.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 diff --git a/sc2/src/sc2code/setup.c b/sc2/src/sc2code/setup.c index b3d5f55e4..a31fcd022 100644 --- a/sc2/src/sc2code/setup.c +++ b/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 - * pack in its own right. */ + /* TODO: This code must die once addons are convenient to use. */ 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. */