From 37f0bcf5e68c1cb538eae7f4510483c6cc09bd77 Mon Sep 17 00:00:00 2001 From: mcmartin Date: Sun, 6 Apr 2008 07:53:42 +0000 Subject: [PATCH] Moved all resource ID construction into its own file for easy replacement git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2960 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/src/sc2code/Makeinfo | 2 +- sc2/src/sc2code/{gravwell.c => cons_res.c} | 19 ++++++++++++++++++- sc2/src/sc2code/element.h | 2 -- sc2/src/sc2code/encount.c | 1 + sc2/src/sc2code/init.c | 1 + sc2/src/sc2code/melee.c | 1 + sc2/src/sc2code/planets/lander.c | 10 ++-------- sc2/src/sc2code/planets/scan.c | 10 ++-------- 9 files changed, 27 insertions(+), 20 deletions(-) rename sc2/src/sc2code/{gravwell.c => cons_res.c} (80%) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 6bddd1fc5..08cee3166 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.7: +- Isolated all constructed resources into cons_res.c - Michael - Fixed a crash when conversing with music disabled - Michael - Moved all resources into starcon.ls2 - Michael - Fixed compile errors when compiling without joystick support - Michael diff --git a/sc2/src/sc2code/Makeinfo b/sc2/src/sc2code/Makeinfo index 2f439da96..b39d1d46a 100644 --- a/sc2/src/sc2code/Makeinfo +++ b/sc2/src/sc2code/Makeinfo @@ -3,7 +3,7 @@ uqm_CFILES="battle.c battlecontrols.c border.c build.c cleanup.c clock.c cnctdlg.c collide.c comm.c commanim.c commglue.c confirm.c credits.c cyborg.c demo.c displist.c dummy.c encount.c flash.c fmv.c galaxy.c gameev.c gameinp.c gameopt.c gendef.c getchar.c globdata.c gravity.c - gravwell.c grpinfo.c hyper.c init.c intel.c intro.c ipdisp.c load.c + cons_res.c grpinfo.c hyper.c init.c intel.c intro.c ipdisp.c load.c loadmele.c loadship.c master.c melee.c menu.c misc.c oscill.c outfit.c pickmele.c pickship.c plandata.c process.c restart.c save.c settings.c setup.c setupmenu.c ship.c shipstat.c shipyard.c sis.c diff --git a/sc2/src/sc2code/gravwell.c b/sc2/src/sc2code/cons_res.c similarity index 80% rename from sc2/src/sc2code/gravwell.c rename to sc2/src/sc2code/cons_res.c index 5a329d36e..4500958e6 100644 --- a/sc2/src/sc2code/gravwell.c +++ b/sc2/src/sc2code/cons_res.c @@ -21,7 +21,6 @@ #include "nameref.h" #include "setup.h" - FRAME planet[NUM_VIEWS]; void @@ -78,3 +77,21 @@ free_gravity_well (void) } } +FRAME +load_life_form (BYTE selector) +{ + return CaptureDrawable (LoadGraphic (MAKE_RESOURCE ( + GET_PACKAGE (LIFE00_MASK_PMAP_ANIM) + selector, + GFXRES, + GET_INSTANCE (LIFE00_MASK_PMAP_ANIM) + selector))); +} + +MUSIC_REF +load_orbit_theme (BYTE selector) +{ + RES_PACKAGE rp = GET_PACKAGE (ORBIT1_MUSIC); + RES_INSTANCE ri = GET_INSTANCE (ORBIT1_MUSIC) + selector; + RES_TYPE rt = GET_TYPE (ORBIT1_MUSIC); + + return LoadMusic (MAKE_RESOURCE (rp, rt, ri)); +} diff --git a/sc2/src/sc2code/element.h b/sc2/src/sc2code/element.h index 1d10d1df7..b4623799d 100644 --- a/sc2/src/sc2code/element.h +++ b/sc2/src/sc2code/element.h @@ -207,8 +207,6 @@ extern BOOLEAN DeltaCrew (ELEMENT *ElementPtr, SIZE crew_delta); extern void PreProcessStatus (ELEMENT *ShipPtr); extern void PostProcessStatus (ELEMENT *ShipPtr); -extern void load_gravity_well (BYTE selector); -extern void free_gravity_well (void); extern void spawn_planet (void); extern void spawn_asteroid (ELEMENT *ElementPtr); extern void animation_preprocess (ELEMENT *ElementPtr); diff --git a/sc2/src/sc2code/encount.c b/sc2/src/sc2code/encount.c index 6fe63727c..11d6fa82e 100644 --- a/sc2/src/sc2code/encount.c +++ b/sc2/src/sc2code/encount.c @@ -22,6 +22,7 @@ #include "battlecontrols.h" #include "build.h" #include "colors.h" +#include "cons_res.h" #include "controls.h" #include "gameopt.h" #include "gamestr.h" diff --git a/sc2/src/sc2code/init.c b/sc2/src/sc2code/init.c index a00a3a21f..3bca8cec8 100644 --- a/sc2/src/sc2code/init.c +++ b/sc2/src/sc2code/init.c @@ -18,6 +18,7 @@ #include "build.h" #include "colors.h" +#include "cons_res.h" #include "element.h" #include "globdata.h" #include "init.h" diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c index da23b849d..9a7390ef5 100644 --- a/sc2/src/sc2code/melee.c +++ b/sc2/src/sc2code/melee.c @@ -22,6 +22,7 @@ #include "colors.h" #include "comm.h" // for getLineWithinWidth +#include "cons_res.h" #include "controls.h" #include "file.h" #include "fmv.h" diff --git a/sc2/src/sc2code/planets/lander.c b/sc2/src/sc2code/planets/lander.c index c989a0a16..a5917d470 100644 --- a/sc2/src/sc2code/planets/lander.c +++ b/sc2/src/sc2code/planets/lander.c @@ -1872,15 +1872,9 @@ LoadLanderData (void) { COUNT i; - RES_TYPE rt; - RES_INSTANCE ri; - RES_PACKAGE rp; - rt = GET_TYPE (ORBIT1_MUSIC); - ri = GET_INSTANCE (ORBIT1_MUSIC); - rp = GET_PACKAGE (ORBIT1_MUSIC); - for (i = 0; i < NUM_ORBIT_THEMES; ++i, ++ri) - OrbitMusic[i] = LoadMusic (MAKE_RESOURCE (rp, rt, ri)); + for (i = 0; i < NUM_ORBIT_THEMES; ++i) + OrbitMusic[i] = load_orbit_theme (i); } } } diff --git a/sc2/src/sc2code/planets/scan.c b/sc2/src/sc2code/planets/scan.c index 330696911..cefbaa4b8 100644 --- a/sc2/src/sc2code/planets/scan.c +++ b/sc2/src/sc2code/planets/scan.c @@ -17,6 +17,7 @@ */ #include "build.h" +#include "cons_res.h" #include "controls.h" #include "encount.h" #include "gamestr.h" @@ -35,7 +36,6 @@ #include "libs/inplib.h" #include "libs/mathlib.h" - extern FRAME SpaceJunkFrame; // define SPIN_ON_SCAN to allow the planet to spin @@ -1384,13 +1384,7 @@ GeneratePlanetSide (void) life_init_tab[i] = (BYTE)which_node + 1; pSolarSysState->PlanetSideFrame[i + 3] = - CaptureDrawable (LoadGraphic ( - MAKE_RESOURCE ( - GET_PACKAGE (LIFE00_MASK_PMAP_ANIM) - + which_node, GFXRES, - GET_INSTANCE (LIFE00_MASK_PMAP_ANIM) - + which_node))); - + load_life_form (which_node); break; }