Major revamp of the resource system. Only RMP files remain.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2962 8092fc87-c524-0410-9efc-e669fe64eaf9
2008-04-09 05:54:22 +00:00
parent 206bebd6bd
commit 7cead51fb3
257 changed files with 1253 additions and 2625 deletions
@@ -429,15 +429,40 @@ mountDirZips (uio_MountHandle *contentHandle, uio_DirHandle *dirHandle, const ch
 	uio_DirList_free (dirList);
 }

+int
+loadIndices (uio_DirHandle *dir)
+{
+	uio_DirList *indices;
+	int i;
+
+	indices = uio_getDirList (dir, "", ".rmp$",
+			match_MATCH_REGEX);		
+
+	if (indices != NULL)
+	{
+		int i;
+		
+		for (i = 0; i < indices->numNames; i++)
+		{
+			log_add (log_Debug, "Loading resouce index '%s'", indices->names[i]);
+			LoadResourceIndex (dir, indices->names[i]);
+		}			
+	}
+	uio_DirList_free (indices);
+	
+	/* Return the number of index files loaded. */
+	return i;
+}
+
 BOOLEAN
 loadAddon (const char *addon)
 {
 	uio_DirHandle *addonsDir, *addonDir;
-	uio_DirList *indices;
-	
+
 	addonsDir = uio_openDirRelative (contentDir, "addons", 0);
 	if (addonsDir == NULL)
-	{	// No addon dir found.
+	{
+		// No addon dir found.
 		log_add (log_Warning, "Warning: There's no 'addons' "
 				"directory in the 'content' directory;\n\t'--addon' "
 				"options are ignored.");
@@ -450,27 +475,14 @@ loadAddon (const char *addon)
 		uio_closeDir (addonsDir);
 		return FALSE;
 	}
-		
-	indices = uio_getDirList (addonDir, "", ".rmp$",
-			match_MATCH_REGEX);		

-	if (indices != NULL)
-	{
-		int i;
-		
-		for (i = 0; i < indices->numNames; i++)
-		{
-			res_LoadFilename (addonDir, indices->names[i]);
-		}			
-	}
-	uio_DirList_free (indices);
+	loadIndices (addonDir);		
+
 	uio_closeDir (addonDir);
 	uio_closeDir (addonsDir);
 	return TRUE;
 }

-
-
 void
 prepareAddons (const char **addons)
 {
@@ -73,6 +73,7 @@ void prepareSaveDir (void);
 void prepareAddons (const char **addons);

 BOOLEAN loadAddon (const char *addon);
+int loadIndices (uio_DirHandle *baseDir);

 #endif

@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ARILOU_FONT 0x3e800103L
+#define ARILOU_FONT "comm.arilou.font"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ARILOU_PMAP_ANIM 0x3e800302L
-#define ARILOU_COLOR_MAP 0x3e800404L
+#define ARILOU_PMAP_ANIM "comm.arilou.graphics"
+#define ARILOU_COLOR_MAP "comm.arilou.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ARILOU_MUSIC 0x3e800006L
+#define ARILOU_MUSIC "comm.arilou.music"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ARILOU_CONVERSATION_PHRASES 0x3e800204L
+#define ARILOU_CONVERSATION_PHRASES "comm.arilou.dialogue"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define BLACKURQ_FONT 0x3ea00103L
+#define BLACKURQ_FONT "comm.kohrah.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define BLACKURQ_PMAP_ANIM 0x3ea00402L
+#define BLACKURQ_PMAP_ANIM "comm.kohrah.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define BLACKURQ_MUSIC 0x3ea00006L
+#define BLACKURQ_MUSIC "comm.kohrah.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define BLACKURQ_CONVERSATION_PHRASES 0x3ea00204L
-#define BLACKURQ_COLOR_MAP 0x3ea00304L
+#define BLACKURQ_CONVERSATION_PHRASES "comm.kohrah.dialogue"
+#define BLACKURQ_COLOR_MAP "comm.kohrah.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define CHMMR_FONT 0x3ec00103L
+#define CHMMR_FONT "comm.chmmr.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define CHMMR_PMAP_ANIM 0x3ec00402L
+#define CHMMR_PMAP_ANIM "comm.chmmr.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define CHMMR_MUSIC 0x3ec00006L
+#define CHMMR_MUSIC "comm.chmmr.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define CHMMR_CONVERSATION_PHRASES 0x3ec00204L
-#define CHMMR_COLOR_MAP 0x3ec00304L
+#define CHMMR_CONVERSATION_PHRASES "comm.chmmr.dialogue"
+#define CHMMR_COLOR_MAP "comm.chmmr.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define COMMANDER_FONT 0x3ee00303L
+#define COMMANDER_FONT "comm.commander.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define COMMANDER_PMAP_ANIM 0x3ee00702L
+#define COMMANDER_PMAP_ANIM "comm.commander.graphics"
@@ -2,6 +2,6 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define COMMANDER_MUSIC 0x3ee00006L
-#define STARBASE_ALT_MUSIC 0x3ee00106L
-#define COMMANDER_LOWPOW_MUSIC 0x3ee00206L
+#define COMMANDER_MUSIC "comm.commander.music"
+#define STARBASE_ALT_MUSIC "comm.starbase.music"
+#define COMMANDER_LOWPOW_MUSIC "comm.comlowpw.music"
@@ -2,6 +2,6 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define COMMANDER_COLOR_MAP 0x3ee00404L
-#define COMMANDER_CONVERSATION_PHRASES 0x3ee00504L
-#define STARBASE_CONVERSATION_PHRASES 0x3ee00604L
+#define COMMANDER_COLOR_MAP "comm.commander.colortable"
+#define COMMANDER_CONVERSATION_PHRASES "comm.commander.dialogue"
+#define STARBASE_CONVERSATION_PHRASES "comm.starbase.dialogue"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define DRUUGE_FONT 0x3f000103L
+#define DRUUGE_FONT "comm.druuge.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define DRUUGE_PMAP_ANIM 0x3f000402L
+#define DRUUGE_PMAP_ANIM "comm.druuge.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define DRUUGE_MUSIC 0x3f000006L
+#define DRUUGE_MUSIC "comm.druuge.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define DRUUGE_CONVERSATION_PHRASES 0x3f000204L
-#define DRUUGE_COLOR_MAP 0x3f000304L
+#define DRUUGE_CONVERSATION_PHRASES "comm.druuge.dialogue"
+#define DRUUGE_COLOR_MAP "comm.druuge.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ILWRATH_FONT 0x3f200103L
+#define ILWRATH_FONT "comm.ilwrath.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ILWRATH_PMAP_ANIM 0x3f200402L
+#define ILWRATH_PMAP_ANIM "comm.ilwrath.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ILWRATH_MUSIC 0x3f200006L
+#define ILWRATH_MUSIC "comm.ilwrath.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ILWRATH_CONVERSATION_PHRASES 0x3f200204L
-#define ILWRATH_COLOR_MAP 0x3f200304L
+#define ILWRATH_CONVERSATION_PHRASES "comm.ilwrath.dialogue"
+#define ILWRATH_COLOR_MAP "comm.ilwrath.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define MELNORME_FONT 0x3f400103L
+#define MELNORME_FONT "comm.melnorme.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define MELNORME_PMAP_ANIM 0x3f400402L
+#define MELNORME_PMAP_ANIM "comm.melnorme.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define MELNORME_MUSIC 0x3f400006L
+#define MELNORME_MUSIC "comm.melnorme.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define MELNORME_CONVERSATION_PHRASES 0x3f400204L
-#define MELNORME_COLOR_MAP 0x3f400304L
+#define MELNORME_CONVERSATION_PHRASES "comm.melnorme.dialogue"
+#define MELNORME_COLOR_MAP "comm.melnorme.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define MYCON_FONT 0x3f600103L
+#define MYCON_FONT "comm.mycon.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define MYCON_PMAP_ANIM 0x3f600402L
+#define MYCON_PMAP_ANIM "comm.mycon.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define MYCON_MUSIC 0x3f600006L
+#define MYCON_MUSIC "comm.mycon.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define MYCON_CONVERSATION_PHRASES 0x3f600204L
-#define MYCON_COLOR_MAP 0x3f600304L
+#define MYCON_CONVERSATION_PHRASES "comm.mycon.dialogue"
+#define MYCON_COLOR_MAP "comm.mycon.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ORZ_FONT 0x3f800103L
+#define ORZ_FONT "comm.orz.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ORZ_PMAP_ANIM 0x3f800402L
+#define ORZ_PMAP_ANIM "comm.orz.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ORZ_MUSIC 0x3f800006L
+#define ORZ_MUSIC "comm.orz.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ORZ_CONVERSATION_PHRASES 0x3f800204L
-#define ORZ_COLOR_MAP 0x3f800304L
+#define ORZ_CONVERSATION_PHRASES "comm.orz.dialogue"
+#define ORZ_COLOR_MAP "comm.orz.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define PKUNK_FONT 0x3fa00103L
+#define PKUNK_FONT "comm.pkunk.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define PKUNK_PMAP_ANIM 0x3fa00402L
+#define PKUNK_PMAP_ANIM "comm.pkunk.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define PKUNK_MUSIC 0x3fa00006L
+#define PKUNK_MUSIC "comm.pkunk.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define PKUNK_CONVERSATION_PHRASES 0x3fa00204L
-#define PKUNK_COLOR_MAP 0x3fa00304L
+#define PKUNK_CONVERSATION_PHRASES "comm.pkunk.dialogue"
+#define PKUNK_COLOR_MAP "comm.pkunk.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SHOFIXTI_FONT 0x3fc00103L
+#define SHOFIXTI_FONT "comm.shofixti.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SHOFIXTI_PMAP_ANIM 0x3fc00402L
+#define SHOFIXTI_PMAP_ANIM "comm.shofixti.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SHOFIXTI_MUSIC 0x3fc00006L
+#define SHOFIXTI_MUSIC "comm.shofixti.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SHOFIXTI_CONVERSATION_PHRASES 0x3fc00204L
-#define SHOFIXTI_COLOR_MAP 0x3fc00304L
+#define SHOFIXTI_CONVERSATION_PHRASES "comm.shofixti.dialogue"
+#define SHOFIXTI_COLOR_MAP "comm.shofixti.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SLYLANDRO_FONT 0x3fe00103L
+#define SLYLANDRO_FONT "comm.slyhome.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SLYLANDRO_PMAP_ANIM 0x3fe00402L
+#define SLYLANDRO_PMAP_ANIM "comm.slyhome.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SLYLANDRO_MUSIC 0x3fe00006L
+#define SLYLANDRO_MUSIC "comm.slyhome.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SLYLANDRO_CONVERSATION_PHRASES 0x3fe00204L
-#define SLYLANDRO_COLOR_MAP 0x3fe00304L
+#define SLYLANDRO_CONVERSATION_PHRASES "comm.slyhome.dialogue"
+#define SLYLANDRO_COLOR_MAP "comm.slyhome.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SLYLAND_FONT 0x40000103L
+#define SLYLAND_FONT "comm.slylandro.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SLYLAND_PMAP_ANIM 0x40000402L
+#define SLYLAND_PMAP_ANIM "comm.slylandro.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SLYLAND_MUSIC 0x40000006L
+#define SLYLAND_MUSIC "comm.slylandro.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SLYLAND_CONVERSATION_PHRASES 0x40000204L
-#define SLYLAND_COLOR_MAP 0x40000304L
+#define SLYLAND_CONVERSATION_PHRASES "comm.slylandro.dialogue"
+#define SLYLAND_COLOR_MAP "comm.slylandro.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SPATHI_FONT 0x40200303L
+#define SPATHI_FONT "comm.spathi.font"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SPATHI_PMAP_ANIM 0x40200802L
-#define SPATHI_HOME_PMAP_ANIM 0x40200902L
+#define SPATHI_PMAP_ANIM "comm.spathi.graphics"
+#define SPATHI_HOME_PMAP_ANIM "comm.spahome.graphics"
@@ -2,6 +2,6 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SPATHI_MUSIC 0x40200006L
-#define SPAHOME_MUSIC 0x40200106L
-#define FWIFFO_MUSIC 0x40200206L
+#define SPATHI_MUSIC "comm.spathi.music"
+#define SPAHOME_MUSIC "comm.spahome.music"
+#define FWIFFO_MUSIC "comm.spafwiff.music"
@@ -2,7 +2,7 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SPATHI_CONVERSATION_PHRASES 0x40200404L
-#define SPATHI_HOME_COLOR_MAP 0x40200504L
-#define SPATHI_HOME_CONVERSATION_PHRASES 0x40200604L
-#define SPATHI_COLOR_MAP 0x40200704L
+#define SPATHI_CONVERSATION_PHRASES "comm.spathi.dialogue"
+#define SPATHI_HOME_COLOR_MAP "comm.spahome.colortable"
+#define SPATHI_HOME_CONVERSATION_PHRASES "comm.spahome.dialogue"
+#define SPATHI_COLOR_MAP "comm.spathi.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SUPOX_FONT 0x40400103L
+#define SUPOX_FONT "comm.supox.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SUPOX_PMAP_ANIM 0x40400402L
+#define SUPOX_PMAP_ANIM "comm.supox.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SUPOX_MUSIC 0x40400006L
+#define SUPOX_MUSIC "comm.supox.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SUPOX_CONVERSATION_PHRASES 0x40400204L
-#define SUPOX_COLOR_MAP 0x40400304L
+#define SUPOX_CONVERSATION_PHRASES "comm.supox.dialogue"
+#define SUPOX_COLOR_MAP "comm.supox.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SYREEN_FONT 0x40600103L
+#define SYREEN_FONT "comm.syreen.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SYREEN_PMAP_ANIM 0x40600402L
+#define SYREEN_PMAP_ANIM "comm.syreen.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SYREEN_MUSIC 0x40600006L
+#define SYREEN_MUSIC "comm.syreen.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define SYREEN_CONVERSATION_PHRASES 0x40600204L
-#define SYREEN_COLOR_MAP 0x40600304L
+#define SYREEN_CONVERSATION_PHRASES "comm.syreen.dialogue"
+#define SYREEN_COLOR_MAP "comm.syreen.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define TALKING_PET_FONT 0x40800103L
+#define TALKING_PET_FONT "comm.talkingpet.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define TALKING_PET_PMAP_ANIM 0x40800402L
+#define TALKING_PET_PMAP_ANIM "comm.talkingpet.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define TALKING_PET_MUSIC 0x40800006L
+#define TALKING_PET_MUSIC "comm.talkingpet.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define TALKING_PET_CONVERSATION_PHRASES 0x40800204L
-#define TALKING_PET_COLOR_MAP 0x40800304L
+#define TALKING_PET_CONVERSATION_PHRASES "comm.talkingpet.dialogue"
+#define TALKING_PET_COLOR_MAP "comm.talkingpet.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define THRADD_FONT 0x40a00103L
+#define THRADD_FONT "comm.thraddash.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define THRADD_PMAP_ANIM 0x40a00402L
+#define THRADD_PMAP_ANIM "comm.thraddash.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define THRADD_MUSIC 0x40a00006L
+#define THRADD_MUSIC "comm.thraddash.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define THRADD_CONVERSATION_PHRASES 0x40a00204L
-#define THRADD_COLOR_MAP 0x40a00304L
+#define THRADD_CONVERSATION_PHRASES "comm.thraddash.dialogue"
+#define THRADD_COLOR_MAP "comm.thraddash.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define UMGAH_FONT 0x40c00103L
+#define UMGAH_FONT "comm.umgah.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define UMGAH_PMAP_ANIM 0x40c00402L
+#define UMGAH_PMAP_ANIM "comm.umgah.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define UMGAH_MUSIC 0x40c00006L
+#define UMGAH_MUSIC "comm.umgah.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define UMGAH_CONVERSATION_PHRASES 0x40c00204L
-#define UMGAH_COLOR_MAP 0x40c00304L
+#define UMGAH_CONVERSATION_PHRASES "comm.umgah.dialogue"
+#define UMGAH_COLOR_MAP "comm.umgah.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define URQUAN_FONT 0x40e00103L
+#define URQUAN_FONT "comm.urquan.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define URQUAN_PMAP_ANIM 0x40e00402L
+#define URQUAN_PMAP_ANIM "comm.urquan.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define URQUAN_MUSIC 0x40e00006L
+#define URQUAN_MUSIC "comm.urquan.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define URQUAN_CONVERSATION_PHRASES 0x40e00204L
-#define URQUAN_COLOR_MAP 0x40e00304L
+#define URQUAN_CONVERSATION_PHRASES "comm.urquan.dialogue"
+#define URQUAN_COLOR_MAP "comm.urquan.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define UTWIG_FONT 0x41000203L
+#define UTWIG_FONT "comm.utwig.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define UTWIG_PMAP_ANIM 0x41000502L
+#define UTWIG_PMAP_ANIM "comm.utwig.graphics"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define UTWIG_MUSIC 0x41000006L
-#define UTWIG_ULTRON_MUSIC 0x41000106L
+#define UTWIG_MUSIC "comm.utwig.music"
+#define UTWIG_ULTRON_MUSIC "comm.utwigult.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define UTWIG_CONVERSATION_PHRASES 0x41000304L
-#define UTWIG_COLOR_MAP 0x41000404L
+#define UTWIG_CONVERSATION_PHRASES "comm.utwig.dialogue"
+#define UTWIG_COLOR_MAP "comm.utwig.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define VUX_FONT 0x41200103L
+#define VUX_FONT "comm.vux.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define VUX_PMAP_ANIM 0x41200402L
+#define VUX_PMAP_ANIM "comm.vux.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define VUX_MUSIC 0x41200006L
+#define VUX_MUSIC "comm.vux.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define VUX_CONVERSATION_PHRASES 0x41200204L
-#define VUX_COLOR_MAP 0x41200304L
+#define VUX_CONVERSATION_PHRASES "comm.vux.dialogue"
+#define VUX_COLOR_MAP "comm.vux.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define YEHAT_FONT 0x41400203L
+#define YEHAT_FONT "comm.yehat.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define YEHAT_PMAP_ANIM 0x41400602L
+#define YEHAT_PMAP_ANIM "comm.yehat.graphics"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define YEHAT_MUSIC 0x41400006L
-#define REBEL_MUSIC 0x41400106L
+#define YEHAT_MUSIC "comm.yehat.music"
+#define REBEL_MUSIC "comm.yehat.rebel.music"
@@ -2,6 +2,6 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define YEHAT_CONVERSATION_PHRASES 0x41400304L
-#define REBEL_CONVERSATION_PHRASES 0x41400404L
-#define YEHAT_COLOR_MAP 0x41400504L
+#define YEHAT_CONVERSATION_PHRASES "comm.yehat.dialogue"
+#define REBEL_CONVERSATION_PHRASES "comm.yehat.rebel.dialogue"
+#define YEHAT_COLOR_MAP "comm.yehat.colortable"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ZOQFOTPIK_FONT 0x41600103L
+#define ZOQFOTPIK_FONT "comm.zoqfotpik.font"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ZOQFOTPIK_PMAP_ANIM 0x41600402L
+#define ZOQFOTPIK_PMAP_ANIM "comm.zoqfotpik.graphics"
@@ -2,4 +2,4 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ZOQFOTPIK_MUSIC 0x41600006L
+#define ZOQFOTPIK_MUSIC "comm.zoqfotpik.music"
@@ -2,5 +2,5 @@
   should not be edited directly.  Modify the master resource list
   instead and regenerate. */

-#define ZOQFOTPIK_CONVERSATION_PHRASES 0x41600204L
-#define ZOQFOTPIK_COLOR_MAP 0x41600304L
+#define ZOQFOTPIK_CONVERSATION_PHRASES "comm.zoqfotpik.dialogue"
+#define ZOQFOTPIK_COLOR_MAP "comm.zoqfotpik.colortable"
@@ -16,20 +16,40 @@
 *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

+#include <stdio.h>
+
+#include "cons_res.h"
 #include "element.h"
 #include "resinst.h"
 #include "nameref.h"
 #include "setup.h"

+static const char *planet_types[] = {
+	"oolite", "yttric", "quasidegenerate", "lanthanide", "treasure",
+	"urea", "metal", "radioactive", "opalescent", "cyanic",
+	"acid", "alkali", "halide", "green", "copper",
+	"carbide", "ultramarine", "noble", "azure", "chondrite",
+	"purple", "superdense", "pellucid", "dust", "crimson",
+	"cimmerian", "infrared", "selenic", "auric", "fluorescent",
+	"ultraviolet", "plutonic", "rainbow", "shattered", "sapphire",
+	"organic", "xenolithic", "redux", "primordial", "emerald",
+	"chlorine", "magnetic", "water", "telluric", "hydrocarbon",
+	"iodine", "vinylogous", "ruby", "magma", "maroon",
+	"bluegas", "cyangas", "greengas", "greygas", "orangegas",
+	"purplegas", "redgas", "violetgas", "yellowgas"
+};
+
+static const char *planet_sizes[] = {
+	"large", "medium", "small"
+}; 
+
 FRAME planet[NUM_VIEWS];
+static char buffer[80];

 void
 load_gravity_well (BYTE selector)
 {
 	COUNT i;
-	RES_TYPE rt;
-	RES_INSTANCE ri;
-	RES_PACKAGE rp;

 	if (selector == NUMBER_OF_PLANET_TYPES)
 	{
@@ -40,26 +60,21 @@ load_gravity_well (BYTE selector)
 	}
 	else
 	{
+		const char *ptype;
 		if (selector & PLANET_SHIELDED)
 		{
-			rt = GET_TYPE (SHIELDED_BIG_MASK_PMAP_ANIM);
-			ri = GET_INSTANCE (SHIELDED_BIG_MASK_PMAP_ANIM);
-			rp = GET_PACKAGE (SHIELDED_BIG_MASK_PMAP_ANIM);
+			ptype = "slaveshield";
 		}
 		else
 		{
-			rt = GET_TYPE (PLANET00_BIG_MASK_PMAP_ANIM);
-			ri = GET_INSTANCE (PLANET00_BIG_MASK_PMAP_ANIM)
-					+ (selector * NUM_VIEWS);
-			rp = GET_PACKAGE (PLANET00_BIG_MASK_PMAP_ANIM)
-					+ selector;
+			ptype = planet_types[selector];
 		}

-		for (i = 0; i < NUM_VIEWS; ++i, ++ri)
+		for (i = 0; i < NUM_VIEWS; ++i)
 		{
-			planet[i] = CaptureDrawable (
-					LoadGraphic (MAKE_RESOURCE (rp, rt, ri))
-					);
+			snprintf (buffer, 79, "planet.%s.%s", ptype, planet_sizes[i]);
+			buffer[79] = '\0';
+			planet[i] = CaptureDrawable (LoadGraphic (buffer));
 		}
 	}

@@ -80,18 +95,15 @@ 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)));
+	snprintf (buffer, 79, "graphics.life.%d", selector);
+	buffer[79] = '\0'; /* Shouldn't be necessary, but better safe than sorry */
+	return CaptureDrawable (LoadGraphic (buffer));
 }

 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));
+	snprintf (buffer, 79, "music.orbit%d", selector + 1);
+	buffer[79] = '\0'; /* Shouldn't be necessary, but better safe than sorry */	
+	return LoadMusic (buffer);
 }
@@ -50,7 +50,7 @@ static FRAME CreditsBack;
 typedef struct
 {
 	int size;
-	DWORD res;
+	RESOURCE res;
 	FONT font;
 } FONT_SIZE_DEF;

--- a/Show More
+++ b/Show More