Separated RESOURCEs from the resources they specify

in ship and comm structures.



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

sc2/ChangeLog

@@ -1,4 +1,6 @@
 Changes towards version 0.7:
+- Split out RESOURCEs from the loaded data in RACE_DESC and LOCDATA
+  structures - Michael
 - Normalized all loaded resources to be flat MEM_HANDLEs - Michael
 - Prevent overflow for planet weight when scanning a planet (bug #1025)
   - from Benjamin Alan Weaver

sc2/src/sc2code/comm.c

@@ -867,7 +867,7 @@ AlienTalkSegue (COUNT wait_track)
 		}
 		pCurInputState->Initialized = TRUE;
 
-		PlayMusic ((MUSIC_REF)CommData.AlienSong, TRUE, 1);
+		PlayMusic (CommData.AlienSong, TRUE, 1);
 		SetMusicVolume (BACKGROUND_VOL);
 
 		{
@@ -1313,21 +1313,21 @@ HailAlien (void)
 	SetResourceIndex (hOldIndex);
 
 	CommData.AlienFrame = CaptureDrawable (
-			LoadGraphic ((RESOURCE)CommData.AlienFrame));
+			LoadGraphic (CommData.AlienFrameRes));
 	CommData.AlienFont = CaptureFont ((FONT_REF)
-			LoadFont ((RESOURCE)CommData.AlienFont));
+			LoadFont (CommData.AlienFontRes));
 	CommData.AlienColorMap = CaptureColorMap (
-			LoadColorMap ((RESOURCE)CommData.AlienColorMap));
+			LoadColorMap (CommData.AlienColorMapRes));
 	if ((CommData.AlienSongFlags & LDASF_USE_ALTERNATE)
-			&& CommData.AlienAltSong)
+			&& CommData.AlienAltSongRes)
-		SongRef = LoadMusic ((RESOURCE)CommData.AlienAltSong);
+		SongRef = LoadMusic (CommData.AlienAltSongRes);
 	if (SongRef)
 		CommData.AlienSong = SongRef;
 	else
-		CommData.AlienSong = LoadMusic ((RESOURCE)CommData.AlienSong);
+		CommData.AlienSong = LoadMusic (CommData.AlienSongRes);
 
 	CommData.ConversationPhrases = CaptureStringTable (
-			LoadStringTable ((RESOURCE)CommData.ConversationPhrases));
+			LoadStringTable (CommData.ConversationPhrasesRes));
 
 	SubtitleText.baseline = CommData.AlienTextBaseline;
 	SubtitleText.align = CommData.AlienTextAlign;
@@ -1415,7 +1415,7 @@ HailAlien (void)
 	LockMutex (GraphicsLock);
 
 	DestroyStringTable (ReleaseStringTable (CommData.ConversationPhrases));
-	DestroyMusic ((MUSIC_REF)CommData.AlienSong);
+	DestroyMusic (CommData.AlienSong);
 	DestroyColorMap (ReleaseColorMap (CommData.AlienColorMap));
 	DestroyFont (ReleaseFont (CommData.AlienFont));
 	DestroyDrawable (ReleaseDrawable (CommData.AlienFrame));
@@ -1478,7 +1478,7 @@ InitCommunication (RESOURCE which_comm)
 	}
 	else
 	{
-		if (which_comm == (RESOURCE) YEHAT_REBEL_CONVERSATION)
+		if (which_comm == YEHAT_REBEL_CONVERSATION)
 		{
 			status = YEHAT_REBEL_SHIP;
 			which_comm = YEHAT_CONVERSATION;
@@ -1517,7 +1517,7 @@ InitCommunication (RESOURCE which_comm)
 
 		LocDataPtr = init_race (
 				status != YEHAT_REBEL_SHIP ? which_comm :
-				(RESOURCE)YEHAT_REBEL_CONVERSATION);
+				YEHAT_REBEL_CONVERSATION);
 		if (LocDataPtr)
 			CommData = *LocDataPtr;
 	}

sc2/src/sc2code/comm/arilou/arilouc.c

@@ -28,17 +28,17 @@ static LOCDATA arilou_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)ARILOU_PMAP_ANIM, /* AlienFrame */
+	ARILOU_PMAP_ANIM, /* AlienFrame */
-	(FONT)ARILOU_FONT, /* AlienFont */
+	ARILOU_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)ARILOU_COLOR_MAP, /* AlienColorMap */
+	ARILOU_COLOR_MAP, /* AlienColorMap */
 	ARILOU_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	ARILOU_CONVERSATION_PHRASES, /* PlayerPhrases */
 	20, /* NumAnimations */
@@ -221,6 +221,10 @@ static LOCDATA arilou_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/blackur/blackurc.c

@@ -25,17 +25,17 @@ static LOCDATA blackurq_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)BLACKURQ_PMAP_ANIM, /* AlienFrame */
+	BLACKURQ_PMAP_ANIM, /* AlienFrame */
-	(FONT)BLACKURQ_FONT, /* AlienFont */
+	BLACKURQ_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)BLACKURQ_COLOR_MAP, /* AlienColorMap */
+	BLACKURQ_COLOR_MAP, /* AlienColorMap */
 	BLACKURQ_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	BLACKURQ_CONVERSATION_PHRASES, /* PlayerPhrases */
 	8, /* NumAnimations */
@@ -123,6 +123,10 @@ static LOCDATA blackurq_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/chmmr/chmmrc.c

@@ -28,17 +28,17 @@ static LOCDATA chmmr_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)CHMMR_PMAP_ANIM, /* AlienFrame */
+	CHMMR_PMAP_ANIM, /* AlienFrame */
-	(FONT)CHMMR_FONT, /* AlienFont */
+	CHMMR_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)CHMMR_COLOR_MAP, /* AlienColorMap */
+	CHMMR_COLOR_MAP, /* AlienColorMap */
 	CHMMR_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	CHMMR_CONVERSATION_PHRASES, /* PlayerPhrases */
 	6, /* NumAnimations */
@@ -109,6 +109,10 @@ static LOCDATA chmmr_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/comandr/comandr.c

@@ -27,8 +27,8 @@ static LOCDATA commander_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)COMMANDER_PMAP_ANIM, /* AlienFrame */
+	COMMANDER_PMAP_ANIM, /* AlienFrame */
-	(FONT)COMMANDER_FONT, /* AlienFont */
+	COMMANDER_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
@@ -37,7 +37,7 @@ static LOCDATA commander_desc =
 	VALIGN_MIDDLE, /* AlienTextValign */
 	COMMANDER_COLOR_MAP, /* AlienColorMap */
 	COMMANDER_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	COMMANDER_CONVERSATION_PHRASES, /* PlayerPhrases */
 	3, /* NumAnimations */
@@ -84,6 +84,10 @@ static LOCDATA commander_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void
@@ -698,7 +702,7 @@ init_commander_comm ()
 	{	
 		commander_desc.AlienAmbientArray[2].AnimFlags &= ~ANIM_DISABLED;
 		// use alternate 'low-power' track if available
-		commander_desc.AlienAltSong = COMMANDER_LOWPOW_MUSIC;
+		commander_desc.AlienAltSongRes = COMMANDER_LOWPOW_MUSIC;
 		commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 	}
 

sc2/src/sc2code/comm/druuge/druugec.c

@@ -29,17 +29,17 @@ static LOCDATA druuge_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)DRUUGE_PMAP_ANIM, /* AlienFrame */
+	DRUUGE_PMAP_ANIM, /* AlienFrame */
-	(FONT)DRUUGE_FONT, /* AlienFont */
+	DRUUGE_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_MIDDLE, /* AlienTextValign */
-	(COLORMAP)DRUUGE_COLOR_MAP, /* AlienColorMap */
+	DRUUGE_COLOR_MAP, /* AlienColorMap */
 	DRUUGE_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	DRUUGE_CONVERSATION_PHRASES, /* PlayerPhrases */
 	11, /* NumAnimations */
@@ -150,6 +150,10 @@ static LOCDATA druuge_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static COUNT SlaveryCount = 0;

sc2/src/sc2code/comm/ilwrath/ilwrathc.c

@@ -28,17 +28,17 @@ static LOCDATA ilwrath_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)ILWRATH_PMAP_ANIM, /* AlienFrame */
+	ILWRATH_PMAP_ANIM, /* AlienFrame */
-	(FONT)ILWRATH_FONT, /* AlienFont */
+	ILWRATH_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_MIDDLE, /* AlienTextValign */
-	(COLORMAP)ILWRATH_COLOR_MAP, /* AlienColorMap */
+	ILWRATH_COLOR_MAP, /* AlienColorMap */
 	ILWRATH_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	ILWRATH_CONVERSATION_PHRASES, /* PlayerPhrases */
 	4, /* NumAnimations */
@@ -93,6 +93,10 @@ static LOCDATA ilwrath_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/melnorm/melnorm.c

@@ -39,8 +39,8 @@ static LOCDATA melnorme_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)MELNORME_PMAP_ANIM, /* AlienFrame */
+	MELNORME_PMAP_ANIM, /* AlienFrame */
-	(FONT)MELNORME_FONT, /* AlienFont */
+	MELNORME_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
@@ -49,7 +49,7 @@ static LOCDATA melnorme_desc =
 	VALIGN_TOP, /* AlienTextValign */
 	MELNORME_COLOR_MAP, /* AlienColorMap */
 	MELNORME_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	MELNORME_CONVERSATION_PHRASES, /* PlayerPhrases */
 	4, /* NumAnimations */
@@ -104,6 +104,10 @@ static LOCDATA melnorme_desc =
 		0, /* BlockMask */
 	},
 	&melnorme_numbers_english, /* AlienNumberSpeech - default */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static COUNT melnorme_digit_names[] =

sc2/src/sc2code/comm/mycon/myconc.c

@@ -29,17 +29,17 @@ static LOCDATA mycon_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)MYCON_PMAP_ANIM, /* AlienFrame */
+	MYCON_PMAP_ANIM, /* AlienFrame */
-	(FONT)MYCON_FONT, /* AlienFont */
+	MYCON_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)MYCON_COLOR_MAP, /* AlienColorMap */
+	MYCON_COLOR_MAP, /* AlienColorMap */
 	MYCON_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	MYCON_CONVERSATION_PHRASES, /* PlayerPhrases */
 	5, /* NumAnimations */
@@ -102,6 +102,10 @@ static LOCDATA mycon_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static BYTE MadeChoice;

sc2/src/sc2code/comm/orz/orzc.c

@@ -27,17 +27,17 @@ static LOCDATA orz_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)ORZ_PMAP_ANIM, /* AlienFrame */
+	ORZ_PMAP_ANIM, /* AlienFrame */
-	(FONT)ORZ_FONT, /* AlienFont */
+	ORZ_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)ORZ_COLOR_MAP, /* AlienColorMap */
+	ORZ_COLOR_MAP, /* AlienColorMap */
 	ORZ_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	ORZ_CONVERSATION_PHRASES, /* PlayerPhrases */
 	12 /* 13 */, /* NumAnimations */
@@ -164,6 +164,10 @@ static LOCDATA orz_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/pkunk/pkunkc.c

@@ -29,17 +29,17 @@ static LOCDATA pkunk_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)PKUNK_PMAP_ANIM, /* AlienFrame */
+	PKUNK_PMAP_ANIM, /* AlienFrame */
-	(FONT)PKUNK_FONT, /* AlienFont */
+	PKUNK_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)PKUNK_COLOR_MAP, /* AlienColorMap */
+	PKUNK_COLOR_MAP, /* AlienColorMap */
 	PKUNK_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	PKUNK_CONVERSATION_PHRASES, /* PlayerPhrases */
 	3, /* NumAnimations */
@@ -89,6 +89,10 @@ static LOCDATA pkunk_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static BOOLEAN

sc2/src/sc2code/comm/rebel/rebel.c

@@ -28,17 +28,17 @@ static LOCDATA yehat_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)YEHAT_PMAP_ANIM, /* AlienFrame */
+	YEHAT_PMAP_ANIM, /* AlienFrame */
-	(FONT)YEHAT_FONT, /* AlienFont */
+	YEHAT_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* (SIS_TEXT_WIDTH - 16) * 2 / 3, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_MIDDLE, /* AlienTextValign */
-	(COLORMAP)YEHAT_COLOR_MAP, /* AlienColorMap */
+	YEHAT_COLOR_MAP, /* AlienColorMap */
 	YEHAT_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	REBEL_CONVERSATION_PHRASES, /* PlayerPhrases */
 	15, /* NumAnimations */
@@ -186,6 +186,10 @@ static LOCDATA yehat_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void
@@ -436,7 +440,7 @@ init_rebel_yehat_comm (void)
 	yehat_desc.AlienTextWidth = (SIS_TEXT_WIDTH - 16) * 2 / 3;
 
 	// use alternate "Rebels" track if available
-	yehat_desc.AlienAltSong = REBEL_MUSIC;
+	yehat_desc.AlienAltSongRes = REBEL_MUSIC;
 	yehat_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 
 	SET_GAME_STATE (BATTLE_SEGUE, 0);

sc2/src/sc2code/comm/shofixt/shofixt.c

@@ -28,17 +28,17 @@ static LOCDATA shofixti_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)SHOFIXTI_PMAP_ANIM, /* AlienFrame */
+	SHOFIXTI_PMAP_ANIM, /* AlienFrame */
-	(FONT)SHOFIXTI_FONT, /* AlienFont */
+	SHOFIXTI_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)SHOFIXTI_COLOR_MAP, /* AlienColorMap */
+	SHOFIXTI_COLOR_MAP, /* AlienColorMap */
 	SHOFIXTI_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	SHOFIXTI_CONVERSATION_PHRASES, /* PlayerPhrases */
 	11, /* NumAnimations */
@@ -150,6 +150,10 @@ static LOCDATA shofixti_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static RESPONSE_REF shofixti_name;

sc2/src/sc2code/comm/slyhome/slyhome.c

@@ -27,17 +27,17 @@ static LOCDATA slylandro_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)SLYLANDRO_PMAP_ANIM, /* AlienFrame */
+	SLYLANDRO_PMAP_ANIM, /* AlienFrame */
-	(FONT)SLYLANDRO_FONT, /* AlienFont */
+	SLYLANDRO_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)SLYLANDRO_COLOR_MAP, /* AlienColorMap */
+	SLYLANDRO_COLOR_MAP, /* AlienColorMap */
 	SLYLANDRO_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	SLYLANDRO_CONVERSATION_PHRASES, /* PlayerPhrases */
 	13, /* NumAnimations */
@@ -164,6 +164,10 @@ static LOCDATA slylandro_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/slyland/slyland.c

@@ -30,17 +30,17 @@ static LOCDATA slylandro_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)SLYLAND_PMAP_ANIM, /* AlienFrame */
+	SLYLAND_PMAP_ANIM, /* AlienFrame */
-	(FONT)SLYLAND_FONT, /* AlienFont */
+	SLYLAND_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)SLYLAND_COLOR_MAP, /* AlienColorMap */
+	SLYLAND_COLOR_MAP, /* AlienColorMap */
 	SLYLAND_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	SLYLAND_CONVERSATION_PHRASES, /* PlayerPhrases */
 	6, /* NumAnimations */
@@ -111,6 +111,10 @@ static LOCDATA slylandro_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static RESPONSE_REF threat,

sc2/src/sc2code/comm/spahome/spahome.c

@@ -29,17 +29,17 @@ static LOCDATA spahome_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)SPATHI_HOME_PMAP_ANIM, /* AlienFrame */
+	SPATHI_HOME_PMAP_ANIM, /* AlienFrame */
-	(FONT)SPATHI_FONT, /* AlienFont */
+	SPATHI_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)SPATHI_HOME_COLOR_MAP, /* AlienColorMap */
+	SPATHI_HOME_COLOR_MAP, /* AlienColorMap */
 	SPATHI_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	SPATHI_HOME_CONVERSATION_PHRASES, /* PlayerPhrases */
 	14, /* NumAnimations */
@@ -177,6 +177,10 @@ static LOCDATA spahome_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void
@@ -996,7 +1000,7 @@ init_spahome_comm ()
 	spahome_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
 
 	// use alternate "Safe Ones" track if available
-	spahome_desc.AlienAltSong = SPAHOME_MUSIC;
+	spahome_desc.AlienAltSongRes = SPAHOME_MUSIC;
 	spahome_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 
 	if (GET_GAME_STATE (SPATHI_MANNER) == 3)

sc2/src/sc2code/comm/spathi/spathic.c

@@ -28,17 +28,17 @@ static LOCDATA spathi_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)SPATHI_PMAP_ANIM, /* AlienFrame */
+	SPATHI_PMAP_ANIM, /* AlienFrame */
-	(FONT)SPATHI_FONT, /* AlienFont */
+	SPATHI_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)SPATHI_COLOR_MAP, /* AlienColorMap */
+	SPATHI_COLOR_MAP, /* AlienColorMap */
 	SPATHI_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	SPATHI_CONVERSATION_PHRASES, /* PlayerPhrases */
 	8, /* NumAnimations */
@@ -138,6 +138,10 @@ static LOCDATA spathi_desc =
 	},
 #endif /* NEVER */
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void
@@ -806,7 +810,7 @@ init_spathi_comm (void)
 
 	if (GET_GAME_STATE (FOUND_PLUTO_SPATHI) == 1)
 	{	// use alternate Fwiffo track if available
-		spathi_desc.AlienAltSong = FWIFFO_MUSIC;
+		spathi_desc.AlienAltSongRes = FWIFFO_MUSIC;
 		spathi_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 	}
 	else

sc2/src/sc2code/comm/starbas/starbas.c

@@ -39,17 +39,17 @@ static LOCDATA commander_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)COMMANDER_PMAP_ANIM, /* AlienFrame */
+	COMMANDER_PMAP_ANIM, /* AlienFrame */
-	(FONT)COMMANDER_FONT, /* AlienFont */
+	COMMANDER_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_MIDDLE, /* AlienTextValign */
-	(COLORMAP)COMMANDER_COLOR_MAP, /* AlienColorMap */
+	COMMANDER_COLOR_MAP, /* AlienColorMap */
 	COMMANDER_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	STARBASE_CONVERSATION_PHRASES, /* PlayerPhrases */
 	10, /* NumAnimations */
@@ -152,6 +152,10 @@ static LOCDATA commander_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static DWORD CurBulletinMask;
@@ -1942,7 +1946,7 @@ init_starbase_comm ()
 	commander_desc.AlienTextBaseline.y = 20;
 
 	// use alternate Starbase track if available
-	commander_desc.AlienAltSong = STARBASE_ALT_MUSIC;
+	commander_desc.AlienAltSongRes = STARBASE_ALT_MUSIC;
 	commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 
 	CurBulletinMask = 0;

sc2/src/sc2code/comm/supox/supoxc.c

@@ -28,17 +28,17 @@ static LOCDATA supox_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)SUPOX_PMAP_ANIM, /* AlienFrame */
+	SUPOX_PMAP_ANIM, /* AlienFrame */
-	(FONT)SUPOX_FONT, /* AlienFont */
+	SUPOX_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)SUPOX_COLOR_MAP, /* AlienColorMap */
+	SUPOX_COLOR_MAP, /* AlienColorMap */
 	SUPOX_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	SUPOX_CONVERSATION_PHRASES, /* PlayerPhrases */
 	4, /* NumAnimations */
@@ -94,6 +94,10 @@ static LOCDATA supox_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/syreen/syreenc.c

@@ -29,17 +29,17 @@ static LOCDATA syreen_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)SYREEN_PMAP_ANIM, /* AlienFrame */
+	SYREEN_PMAP_ANIM, /* AlienFrame */
-	(FONT)SYREEN_FONT, /* AlienFont */
+	SYREEN_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)SYREEN_COLOR_MAP, /* AlienColorMap */
+	SYREEN_COLOR_MAP, /* AlienColorMap */
 	SYREEN_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	SYREEN_CONVERSATION_PHRASES, /* PlayerPhrases */
 	15, /* NumAnimations */
@@ -184,6 +184,10 @@ static LOCDATA syreen_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/talkpet/talkpet.c

@@ -27,17 +27,17 @@ static LOCDATA talkpet_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)TALKING_PET_PMAP_ANIM, /* AlienFrame */
+	TALKING_PET_PMAP_ANIM, /* AlienFrame */
-	(FONT)TALKING_PET_FONT, /* AlienFont */
+	TALKING_PET_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)TALKING_PET_COLOR_MAP, /* AlienColorMap */
+	TALKING_PET_COLOR_MAP, /* AlienColorMap */
 	TALKING_PET_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	TALKING_PET_CONVERSATION_PHRASES, /* PlayerPhrases */
 	16, /* NumAnimations */
@@ -191,6 +191,10 @@ static LOCDATA talkpet_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 #define STROBE_RATE   15

sc2/src/sc2code/comm/thradd/thraddc.c

@@ -29,17 +29,17 @@ static LOCDATA thradd_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)THRADD_PMAP_ANIM, /* AlienFrame */
+	THRADD_PMAP_ANIM, /* AlienFrame */
-	(FONT)THRADD_FONT, /* AlienFont */
+	THRADD_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)THRADD_COLOR_MAP, /* AlienColorMap */
+	THRADD_COLOR_MAP, /* AlienColorMap */
 	THRADD_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	THRADD_CONVERSATION_PHRASES, /* PlayerPhrases */
 	8, /* NumAnimations */
@@ -127,6 +127,10 @@ static LOCDATA thradd_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static int

sc2/src/sc2code/comm/umgah/umgahc.c

@@ -28,17 +28,17 @@ static LOCDATA umgah_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)UMGAH_PMAP_ANIM, /* AlienFrame */
+	UMGAH_PMAP_ANIM, /* AlienFrame */
-	(FONT)UMGAH_FONT, /* AlienFont */
+	UMGAH_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)UMGAH_COLOR_MAP, /* AlienColorMap */
+	UMGAH_COLOR_MAP, /* AlienColorMap */
 	UMGAH_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	UMGAH_CONVERSATION_PHRASES, /* PlayerPhrases */
 	16, /* NumAnimations */
@@ -189,6 +189,10 @@ static LOCDATA umgah_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/urquan/urquanc.c

@@ -25,17 +25,17 @@ static LOCDATA urquan_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)URQUAN_PMAP_ANIM, /* AlienFrame */
+	URQUAN_PMAP_ANIM, /* AlienFrame */
-	(FONT)URQUAN_FONT, /* AlienFont */
+	URQUAN_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_TOP, /* AlienTextValign */
-	(COLORMAP)URQUAN_COLOR_MAP, /* AlienColorMap */
+	URQUAN_COLOR_MAP, /* AlienColorMap */
 	URQUAN_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	URQUAN_CONVERSATION_PHRASES, /* PlayerPhrases */
 	7, /* NumAnimations */
@@ -114,6 +114,10 @@ static LOCDATA urquan_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/utwig/utwigc.c

@@ -29,17 +29,17 @@ static LOCDATA utwig_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)UTWIG_PMAP_ANIM, /* AlienFrame */
+	UTWIG_PMAP_ANIM, /* AlienFrame */
-	(FONT)UTWIG_FONT, /* AlienFont */
+	UTWIG_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_MIDDLE, /* AlienTextValign */
-	(COLORMAP)UTWIG_COLOR_MAP, /* AlienColorMap */
+	UTWIG_COLOR_MAP, /* AlienColorMap */
 	UTWIG_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	UTWIG_CONVERSATION_PHRASES, /* PlayerPhrases */
 	16, /* NumAnimations */
@@ -191,6 +191,10 @@ static LOCDATA utwig_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void
@@ -969,7 +973,7 @@ init_utwig_comm (void)
 
 	if (GET_GAME_STATE (UTWIG_HAVE_ULTRON))
 	{	// use alternate 'Happy Utwig!' track
-		utwig_desc.AlienAltSong = UTWIG_ULTRON_MUSIC;
+		utwig_desc.AlienAltSongRes = UTWIG_ULTRON_MUSIC;
 		utwig_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 	}
 	else

sc2/src/sc2code/comm/vux/vuxc.c

@@ -25,8 +25,8 @@ static LOCDATA vux_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)VUX_PMAP_ANIM, /* AlienFrame */
+	VUX_PMAP_ANIM, /* AlienFrame */
-	(FONT)VUX_FONT, /* AlienFont */
+	VUX_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
@@ -35,7 +35,7 @@ static LOCDATA vux_desc =
 	VALIGN_TOP, /* AlienTextValign */
 	VUX_COLOR_MAP, /* AlienColorMap */
 	VUX_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	VUX_CONVERSATION_PHRASES, /* PlayerPhrases */
 	17, /* NumAnimations */
@@ -194,6 +194,10 @@ static LOCDATA vux_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/yehat/yehatc.c

@@ -30,17 +30,17 @@ static LOCDATA yehat_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)YEHAT_PMAP_ANIM, /* AlienFrame */
+	YEHAT_PMAP_ANIM, /* AlienFrame */
-	(FONT)YEHAT_FONT, /* AlienFont */
+	YEHAT_FONT, /* AlienFont */
 	WHITE_COLOR, /* AlienTextFColor */
 	BLACK_COLOR, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* (SIS_TEXT_WIDTH - 16) * 2 / 3, */ /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_MIDDLE, /* AlienTextValign */
-	(COLORMAP)YEHAT_COLOR_MAP, /* AlienColorMap */
+	YEHAT_COLOR_MAP, /* AlienColorMap */
 	YEHAT_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	YEHAT_CONVERSATION_PHRASES, /* PlayerPhrases */
 	15, /* NumAnimations */
@@ -185,6 +185,10 @@ static LOCDATA yehat_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 static void

sc2/src/sc2code/comm/zoqfot/zoqfotc.c

@@ -45,17 +45,17 @@ static LOCDATA zoqfot_desc =
 	NULL, /* init_encounter_func */
 	NULL, /* post_encounter_func */
 	NULL, /* uninit_encounter_func */
-	(FRAME)ZOQFOTPIK_PMAP_ANIM, /* AlienFrame */
+	ZOQFOTPIK_PMAP_ANIM, /* AlienFrame */
-	(FONT)ZOQFOTPIK_FONT, /* AlienFont */
+	ZOQFOTPIK_FONT, /* AlienFont */
 	0, /* AlienTextFColor */
 	0, /* AlienTextBColor */
 	{0, 0}, /* AlienTextBaseline */
 	0, /* AlienTextWidth */
 	ALIGN_CENTER, /* AlienTextAlign */
 	VALIGN_MIDDLE, /* AlienTextValign */
-	(COLORMAP)ZOQFOTPIK_COLOR_MAP, /* AlienColorMap */
+	ZOQFOTPIK_COLOR_MAP, /* AlienColorMap */
 	ZOQFOTPIK_MUSIC, /* AlienSong */
-	0, /* AlienAltSong */
+	NULL_RESOURCE, /* AlienAltSong */
 	0, /* AlienSongFlags */
 	ZOQFOTPIK_CONVERSATION_PHRASES, /* PlayerPhrases */
 	3, /* NumAnimations */
@@ -103,6 +103,10 @@ static LOCDATA zoqfot_desc =
 		0, /* BlockMask */
 	},
 	NULL, /* AlienNumberSpeech - none */
+	/* Filler for loaded resources */
+	NULL, NULL, NULL,
+	NULL_HANDLE,
+	NULL,
 };
 
 enum

sc2/src/sc2code/globdata.h

@@ -21,6 +21,7 @@
 
 #include "clock.h"
 #include "libs/gfxlib.h"
+#include "libs/reslib.h"
 #include "sis.h"
 #include "velocity.h"
 
@@ -136,19 +137,19 @@ typedef struct
 	COUNT (*uninit_encounter_func) (void);
 			/* Called when encounter is done for cleanup */
 
-	FRAME AlienFrame;
+	RESOURCE AlienFrameRes;
-	FONT AlienFont;
+	RESOURCE AlienFontRes;
 	COLOR AlienTextFColor, AlienTextBColor;
 	POINT AlienTextBaseline;
 	COUNT AlienTextWidth;
 	TEXT_ALIGN AlienTextAlign;
 	TEXT_VALIGN AlienTextValign;
-	COLORMAP AlienColorMap;
+	RESOURCE AlienColorMapRes;
-	DWORD AlienSong;
+	RESOURCE AlienSongRes;
-	DWORD AlienAltSong;
+	RESOURCE AlienAltSongRes;
 	LDAS_FLAGS AlienSongFlags;
 
-	STRING ConversationPhrases;
+	RESOURCE ConversationPhrasesRes;
 
 	COUNT NumAnimations;
 	ANIMATION_DESC AlienAmbientArray[MAX_ANIMATIONS];
@@ -157,6 +158,13 @@ typedef struct
 	ANIMATION_DESC AlienTalkDesc;
 
 	NUMBER_SPEECH AlienNumberSpeech;
+
+	FRAME AlienFrame;
+	FONT AlienFont;
+	COLORMAP AlienColorMap;
+	MUSIC_REF AlienSong;
+	STRING ConversationPhrases;
+	
 } LOCDATA;
 
 enum

sc2/src/sc2code/init.c

@@ -23,6 +23,7 @@
 #include "init.h"
 #include "port.h"
 #include "resinst.h"
+#include "reslib.h"
 #include "nameref.h"
 #include "setup.h"
 #include "units.h"
@@ -35,7 +36,7 @@ FRAME explosion[NUM_VIEWS];
 
 
 BOOLEAN
-load_animation (FRAME *pixarray, DWORD big_res, DWORD med_res, DWORD
+load_animation (FRAME *pixarray, RESOURCE big_res, RESOURCE med_res, RESOURCE
 		sml_res)
 {
 	DRAWABLE d;
@@ -45,7 +46,7 @@ load_animation (FRAME *pixarray, DWORD big_res, DWORD med_res, DWORD
 		return FALSE;
 	pixarray[0] = CaptureDrawable (d);
 
-	if (med_res != 0L)
+	if (med_res != NULL_RESOURCE)
 	{
 		d = LoadGraphic (med_res);
 		if (!d)
@@ -53,7 +54,7 @@ load_animation (FRAME *pixarray, DWORD big_res, DWORD med_res, DWORD
 	}
 	pixarray[1] = CaptureDrawable (d);
 
-	if (sml_res != 0L)
+	if (sml_res != NULL_RESOURCE)
 	{
 		d = LoadGraphic (sml_res);
 		if (!d)

sc2/src/sc2code/libs/reslib.h

@@ -31,6 +31,8 @@ typedef BYTE RES_TYPE;
 typedef COUNT RES_INSTANCE;
 typedef COUNT RES_PACKAGE;
 
+#define NULL_RESOURCE 0L
+
 #define TYPE_BITS 8
 #define INSTANCE_BITS 13
 #define PACKAGE_BITS 11

sc2/src/sc2code/loadship.c

@@ -45,21 +45,21 @@ load_ship (DWORD RaceResIndex, BOOLEAN LoadBattleData)
 	RDPtr->CodeRef = CodeRef;
 
 	RDPtr->ship_info.icons = CaptureDrawable (LoadGraphic (
-			(RESOURCE)RDPtr->ship_info.icons));
+			RDPtr->ship_info.icons_rsc));
 	if (!RDPtr->ship_info.icons)
 	{
 		/* goto BadLoad */
 	}
 		
 	RDPtr->ship_info.melee_icon = CaptureDrawable (LoadGraphic (
-			(RESOURCE)RDPtr->ship_info.melee_icon));
+			RDPtr->ship_info.melee_icon_rsc));
 	if (!RDPtr->ship_info.melee_icon)
 	{
 		/* goto BadLoad */
 	}
 
 	RDPtr->ship_info.race_strings =	CaptureStringTable (LoadStringTable (
-			(RESOURCE)RDPtr->ship_info.race_strings));
+			RDPtr->ship_info.race_strings_rsc));
 	if (!RDPtr->ship_info.race_strings)
 	{
 		/* goto BadLoad */
@@ -69,49 +69,49 @@ load_ship (DWORD RaceResIndex, BOOLEAN LoadBattleData)
 	{
 		DATA_STUFF *RawPtr = &RDPtr->ship_data;
 		if (!load_animation (RawPtr->ship,
-				(RESOURCE)RawPtr->ship[0],
+				RawPtr->ship_rsc[0],
-				(RESOURCE)RawPtr->ship[1],
+				RawPtr->ship_rsc[1],
-				(RESOURCE)RawPtr->ship[2]))
+				RawPtr->ship_rsc[2]))
 			goto BadLoad;
 
-		if (RawPtr->weapon[0] != 0)
+		if (RawPtr->weapon_rsc[0] != NULL_RESOURCE)
 		{
 			if (!load_animation (RawPtr->weapon,
-					(RESOURCE)RawPtr->weapon[0],
+					RawPtr->weapon_rsc[0],
-					(RESOURCE)RawPtr->weapon[1],
+					RawPtr->weapon_rsc[1],
-					(RESOURCE)RawPtr->weapon[2]))
+					RawPtr->weapon_rsc[2]))
 				goto BadLoad;
 		}
 
-		if (RawPtr->special[0] != 0)
+		if (RawPtr->special_rsc[0] != NULL_RESOURCE)
 		{
 			if (!load_animation (RawPtr->special,
-					(RESOURCE)RawPtr->special[0],
+					RawPtr->special_rsc[0],
-					(RESOURCE)RawPtr->special[1],
+					RawPtr->special_rsc[1],
-					(RESOURCE)RawPtr->special[2]))
+					RawPtr->special_rsc[2]))
 				goto BadLoad;
 		}
 
-		if (RawPtr->captain_control.background != 0)
+		if (RawPtr->captain_control.captain_rsc != NULL_RESOURCE)
 		{
 			RawPtr->captain_control.background = CaptureDrawable (LoadGraphic (
-					(RESOURCE)RawPtr->captain_control.background));
+					RawPtr->captain_control.captain_rsc));
 			if (!RawPtr->captain_control.background)
 				goto BadLoad;
 		}
 
-		if (RawPtr->victory_ditty != 0)
+		if (RawPtr->victory_ditty_rsc != NULL_RESOURCE)
 		{
 			RawPtr->victory_ditty =
-					LoadMusic ((RESOURCE)RawPtr->victory_ditty);
+					LoadMusic (RawPtr->victory_ditty_rsc);
 			if (!RawPtr->victory_ditty)
 				goto BadLoad;
 		}
 
-		if (RawPtr->ship_sounds != 0)
+		if (RawPtr->ship_sounds_rsc != NULL_RESOURCE)
 		{
 			RawPtr->ship_sounds = CaptureSound (
-					LoadSound ((RESOURCE)RawPtr->ship_sounds));
+					LoadSound (RawPtr->ship_sounds_rsc));
 			if (!RawPtr->ship_sounds)
 				goto BadLoad;
 		}
@@ -147,7 +147,7 @@ free_ship (RACE_DESC *raceDescPtr, BOOLEAN FreeIconData,
 
 		DestroyDrawable (
 				ReleaseDrawable (shipData->captain_control.background));
-		DestroyMusic ((MUSIC_REF)shipData->victory_ditty);
+		DestroyMusic (shipData->victory_ditty);
 		DestroySound (ReleaseSound (shipData->ship_sounds));
 	}
 
@@ -162,5 +162,3 @@ free_ship (RACE_DESC *raceDescPtr, BOOLEAN FreeIconData,
 
 	DestroyCodeRes (ReleaseCodeRes (raceDescPtr->CodeRef));
 }
-
-

sc2/src/sc2code/races.h

@@ -23,6 +23,7 @@
 #include "units.h"
 #include "element.h"
 #include "libs/sndlib.h"
+#include "libs/reslib.h"
 
 
 // TODO: remove RACES_PER_PLAYER remnant of SC1
@@ -52,6 +53,7 @@
 
 typedef struct captain_stuff
 {
+	RESOURCE captain_rsc;
 	FRAME background;
 	FRAME turn;
 	FRAME thrust;
@@ -109,6 +111,10 @@ typedef struct
 	BYTE energy_level;
 	BYTE max_energy;
 
+	RESOURCE race_strings_rsc;
+	RESOURCE icons_rsc;
+	RESOURCE melee_icon_rsc;
+
 	STRING race_strings;
 	FRAME icons;
 	FRAME melee_icon;
@@ -124,11 +130,17 @@ typedef struct
 
 typedef struct
 {
+	RESOURCE ship_rsc[NUM_VIEWS];
+	RESOURCE weapon_rsc[NUM_VIEWS];
+	RESOURCE special_rsc[NUM_VIEWS];
+	CAPTAIN_STUFF captain_control;
+	RESOURCE victory_ditty_rsc;
+	RESOURCE ship_sounds_rsc;
+
 	FRAME ship[NUM_VIEWS];
 	FRAME weapon[NUM_VIEWS];
 	FRAME special[NUM_VIEWS];
-	CAPTAIN_STUFF captain_control;
+	MUSIC_REF victory_ditty;
-	DWORD victory_ditty;
 	SOUND ship_sounds;
 } DATA_STUFF;
 
@@ -348,12 +360,12 @@ enum
 	NUM_AVAILABLE_RACES
 };
 
-#define YEHAT_REBEL_CONVERSATION (~0L)
+#define YEHAT_REBEL_CONVERSATION ((RESOURCE)(~0L))
 
 #define RACE_COMMUNICATION \
 		ARILOU_CONVERSATION,       /* ARILOU_SHIP */ \
 		CHMMR_CONVERSATION,        /* CHMMR_SHIP */ \
-		0L,                        /* HUMAN_SHIP */ \
+		NULL_RESOURCE,             /* HUMAN_SHIP */	\
 		ORZ_CONVERSATION,          /* ORZ_SHIP */ \
 		PKUNK_CONVERSATION,        /* PKUNK_SHIP */ \
 		SHOFIXTI_CONVERSATION,     /* SHOFIXTI_SHIP */ \
@@ -371,10 +383,10 @@ enum
 		UMGAH_CONVERSATION,        /* UMGAH_SHIP */ \
 		URQUAN_CONVERSATION,       /* URQUAN_SHIP */ \
 		ZOQFOTPIK_CONVERSATION,    /* ZOQFOTPIK_SHIP */ \
-		0L,                        /* SYREEN_SHIP */ \
+		NULL_RESOURCE,             /* SYREEN_SHIP */ \
 		BLACKURQ_CONVERSATION,     /* BLACK_URQUAN_SHIP */ \
 		YEHAT_REBEL_CONVERSATION,  /* YEHAT_REBEL_SHIP */ \
-		0L,                        /* URQUAN_PROBE_SHIP */
+		NULL_RESOURCE,             /* URQUAN_PROBE_SHIP */
 
 #define RACE_SHIP_COST \
 		1600,  /* ARILOU_SHIP */ \
@@ -589,8 +601,8 @@ extern HSTARSHIP GetEncounterStarShip (STARSHIP *LastStarShipPtr,
 		COUNT which_player);
 extern void DrawArmadaPickShip (BOOLEAN draw_salvage_frame, RECT *pPickRect);
 
-extern BOOLEAN load_animation (FRAME *pixarray, DWORD big_res,
+extern BOOLEAN load_animation (FRAME *pixarray, RESOURCE big_res,
-		DWORD med_res, DWORD sml_res);
+		RESOURCE med_res, RESOURCE sml_res);
 extern BOOLEAN free_image (FRAME *pixarray);
 extern void NotifyOthers (COUNT which_race, BYTE target_loc);
 

sc2/src/sc2code/ships/androsyn/androsyn.c

@@ -44,9 +44,10 @@ static RACE_DESC androsynth_desc =
 		15, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)ANDROSYNTH_RACE_STRINGS,
+		ANDROSYNTH_RACE_STRINGS,
-		(FRAME)ANDROSYNTH_ICON_MASK_PMAP_ANIM,
+		ANDROSYNTH_ICON_MASK_PMAP_ANIM,
-		(FRAME)ANDROSYNTH_MICON_MASK_PMAP_ANIM,
+		ANDROSYNTH_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		INFINITE_RADIUS, /* Initial sphere of influence radius */
@@ -70,29 +71,30 @@ static RACE_DESC androsynth_desc =
 	},
 	{
 		{
-			(FRAME)ANDROSYNTH_BIG_MASK_PMAP_ANIM,
+			ANDROSYNTH_BIG_MASK_PMAP_ANIM,
-			(FRAME)ANDROSYNTH_MED_MASK_PMAP_ANIM,
+			ANDROSYNTH_MED_MASK_PMAP_ANIM,
-			(FRAME)ANDROSYNTH_SML_MASK_PMAP_ANIM,
+			ANDROSYNTH_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)BUBBLE_BIG_MASK_PMAP_ANIM,
+			BUBBLE_BIG_MASK_PMAP_ANIM,
-			(FRAME)BUBBLE_MED_MASK_PMAP_ANIM,
+			BUBBLE_MED_MASK_PMAP_ANIM,
-			(FRAME)BUBBLE_SML_MASK_PMAP_ANIM,
+			BUBBLE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)BLAZER_BIG_MASK_PMAP_ANIM,
+			BLAZER_BIG_MASK_PMAP_ANIM,
-			(FRAME)BLAZER_MED_MASK_PMAP_ANIM,
+			BLAZER_MED_MASK_PMAP_ANIM,
-			(FRAME)BLAZER_SML_MASK_PMAP_ANIM,
+			BLAZER_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)ANDROSYNTH_CAPT_MASK_PMAP_ANIM,
+			ANDROSYNTH_CAPT_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)ANDROSYNTH_VICTORY_SONG,
+		ANDROSYNTH_VICTORY_SONG,
-		(SOUND)ANDROSYNTH_SHIP_SOUNDS,
+		ANDROSYNTH_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/arilou/arilou.c

@@ -46,9 +46,10 @@ static RACE_DESC arilou_desc =
 		16, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)ARILOU_RACE_STRINGS,
+		ARILOU_RACE_STRINGS,
-		(FRAME)ARILOU_ICON_MASK_PMAP_ANIM,
+		ARILOU_ICON_MASK_PMAP_ANIM,
-		(FRAME)ARILOU_MICON_MASK_PMAP_ANIM,
+		ARILOU_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		250 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -71,29 +72,30 @@ static RACE_DESC arilou_desc =
 	},
 	{
 		{
-			(FRAME)ARILOU_BIG_MASK_PMAP_ANIM,
+			ARILOU_BIG_MASK_PMAP_ANIM,
-			(FRAME)ARILOU_MED_MASK_PMAP_ANIM,
+			ARILOU_MED_MASK_PMAP_ANIM,
-			(FRAME)ARILOU_SML_MASK_PMAP_ANIM,
+			ARILOU_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)WARP_BIG_MASK_PMAP_ANIM,
+			WARP_BIG_MASK_PMAP_ANIM,
-			(FRAME)WARP_MED_MASK_PMAP_ANIM,
+			WARP_MED_MASK_PMAP_ANIM,
-			(FRAME)WARP_SML_MASK_PMAP_ANIM,
+			WARP_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)ARILOU_CAPTAIN_MASK_PMAP_ANIM,
+			ARILOU_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)ARILOU_VICTORY_SONG,
+		ARILOU_VICTORY_SONG,
-		(SOUND)ARILOU_SHIP_SOUNDS,
+		ARILOU_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/blackurq/blackurq.c

@@ -48,9 +48,10 @@ static RACE_DESC black_urquan_desc =
 		30, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)KOHR_AH_RACE_STRINGS,
+		KOHR_AH_RACE_STRINGS,
-		(FRAME)KOHR_AH_ICON_MASK_PMAP_ANIM,
+		KOHR_AH_ICON_MASK_PMAP_ANIM,
-		(FRAME)KOHR_AH_MICON_MASK_PMAP_ANIM,
+		KOHR_AH_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		2666 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -73,29 +74,30 @@ static RACE_DESC black_urquan_desc =
 	},
 	{
 		{
-			(FRAME)KOHR_AH_BIG_MASK_PMAP_ANIM,
+			KOHR_AH_BIG_MASK_PMAP_ANIM,
-			(FRAME)KOHR_AH_MED_MASK_PMAP_ANIM,
+			KOHR_AH_MED_MASK_PMAP_ANIM,
-			(FRAME)KOHR_AH_SML_MASK_PMAP_ANIM,
+			KOHR_AH_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)BUZZSAW_BIG_MASK_PMAP_ANIM,
+			BUZZSAW_BIG_MASK_PMAP_ANIM,
-			(FRAME)BUZZSAW_MED_MASK_PMAP_ANIM,
+			BUZZSAW_MED_MASK_PMAP_ANIM,
-			(FRAME)BUZZSAW_SML_MASK_PMAP_ANIM,
+			BUZZSAW_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)GAS_BIG_MASK_PMAP_ANIM,
+			GAS_BIG_MASK_PMAP_ANIM,
-			(FRAME)GAS_MED_MASK_PMAP_ANIM,
+			GAS_MED_MASK_PMAP_ANIM,
-			(FRAME)GAS_SML_MASK_PMAP_ANIM,
+			GAS_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)KOHR_AH_CAPTAIN_MASK_PMAP_ANIM,
+			KOHR_AH_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)KOHR_AH_VICTORY_SONG,
+		KOHR_AH_VICTORY_SONG,
-		(SOUND)KOHR_AH_SHIP_SOUNDS,
+		KOHR_AH_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/chenjesu/chenjesu.c

@@ -51,9 +51,10 @@ static RACE_DESC chenjesu_desc =
 		28, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)CHENJESU_RACE_STRINGS,
+		CHENJESU_RACE_STRINGS,
-		(FRAME)CHENJESU_ICON_MASK_PMAP_ANIM,
+		CHENJESU_ICON_MASK_PMAP_ANIM,
-		(FRAME)CHENJESU_MICON_MASK_PMAP_ANIM,
+		CHENJESU_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -76,29 +77,30 @@ static RACE_DESC chenjesu_desc =
 	},
 	{
 		{
-			(FRAME)CHENJESU_BIG_MASK_PMAP_ANIM,
+			CHENJESU_BIG_MASK_PMAP_ANIM,
-			(FRAME)CHENJESU_MED_MASK_PMAP_ANIM,
+			CHENJESU_MED_MASK_PMAP_ANIM,
-			(FRAME)CHENJESU_SML_MASK_PMAP_ANIM,
+			CHENJESU_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SPARK_BIG_MASK_PMAP_ANIM,
+			SPARK_BIG_MASK_PMAP_ANIM,
-			(FRAME)SPARK_MED_MASK_PMAP_ANIM,
+			SPARK_MED_MASK_PMAP_ANIM,
-			(FRAME)SPARK_SML_MASK_PMAP_ANIM,
+			SPARK_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)DOGGY_BIG_MASK_PMAP_ANIM,
+			DOGGY_BIG_MASK_PMAP_ANIM,
-			(FRAME)DOGGY_MED_MASK_PMAP_ANIM,
+			DOGGY_MED_MASK_PMAP_ANIM,
-			(FRAME)DOGGY_SML_MASK_PMAP_ANIM,
+			DOGGY_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)CHENJESU_CAPTAIN_MASK_PMAP_ANIM,
+			CHENJESU_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)CHENJESU_VICTORY_SONG,
+		CHENJESU_VICTORY_SONG,
-		(SOUND)CHENJESU_SHIP_SOUNDS,
+		CHENJESU_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/chmmr/chmmr.c

@@ -48,9 +48,10 @@ static RACE_DESC chmmr_desc =
 		30, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)CHMMR_RACE_STRINGS,
+		CHMMR_RACE_STRINGS,
-		(FRAME)CHMMR_ICON_MASK_PMAP_ANIM,
+		CHMMR_ICON_MASK_PMAP_ANIM,
-		(FRAME)CHMMR_MICON_MASK_PMAP_ANIM,
+		CHMMR_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -73,29 +74,30 @@ static RACE_DESC chmmr_desc =
 	},
 	{
 		{
-			(FRAME)CHMMR_BIG_MASK_PMAP_ANIM,
+			CHMMR_BIG_MASK_PMAP_ANIM,
-			(FRAME)CHMMR_MED_MASK_PMAP_ANIM,
+			CHMMR_MED_MASK_PMAP_ANIM,
-			(FRAME)CHMMR_SML_MASK_PMAP_ANIM,
+			CHMMR_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)MUZZLE_BIG_MASK_PMAP_ANIM,
+			MUZZLE_BIG_MASK_PMAP_ANIM,
-			(FRAME)MUZZLE_MED_MASK_PMAP_ANIM,
+			MUZZLE_MED_MASK_PMAP_ANIM,
-			(FRAME)MUZZLE_SML_MASK_PMAP_ANIM,
+			MUZZLE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SATELLITE_BIG_MASK_PMAP_ANIM,
+			SATELLITE_BIG_MASK_PMAP_ANIM,
-			(FRAME)SATELLITE_MED_MASK_PMAP_ANIM,
+			SATELLITE_MED_MASK_PMAP_ANIM,
-			(FRAME)SATELLITE_SML_MASK_PMAP_ANIM,
+			SATELLITE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)CHMMR_CAPTAIN_MASK_PMAP_ANIM,
+			CHMMR_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)CHMMR_VICTORY_SONG,
+		CHMMR_VICTORY_SONG,
-		(SOUND)CHMMR_SHIP_SOUNDS,
+		CHMMR_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/druuge/druuge.c

@@ -44,9 +44,10 @@ static RACE_DESC druuge_desc =
 		17, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)DRUUGE_RACE_STRINGS,
+		DRUUGE_RACE_STRINGS,
-		(FRAME)DRUUGE_ICON_MASK_PMAP_ANIM,
+		DRUUGE_ICON_MASK_PMAP_ANIM,
-		(FRAME)DRUUGE_MICON_MASK_PMAP_ANIM,
+		DRUUGE_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		1400 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -69,29 +70,30 @@ static RACE_DESC druuge_desc =
 	},
 	{
 		{
-			(FRAME)DRUUGE_BIG_MASK_PMAP_ANIM,
+			DRUUGE_BIG_MASK_PMAP_ANIM,
-			(FRAME)DRUUGE_MED_MASK_PMAP_ANIM,
+			DRUUGE_MED_MASK_PMAP_ANIM,
-			(FRAME)DRUUGE_SML_MASK_PMAP_ANIM,
+			DRUUGE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)DRUUGE_CANNON_BIG_MASK_PMAP_ANIM,
+			DRUUGE_CANNON_BIG_MASK_PMAP_ANIM,
-			(FRAME)DRUUGE_CANNON_MED_MASK_PMAP_ANIM,
+			DRUUGE_CANNON_MED_MASK_PMAP_ANIM,
-			(FRAME)DRUUGE_CANNON_SML_MASK_PMAP_ANIM,
+			DRUUGE_CANNON_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)DRUUGE_CAPT_MASK_PMAP_ANIM,
+			DRUUGE_CAPT_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)DRUUGE_VICTORY_SONG,
+		DRUUGE_VICTORY_SONG,
-		(SOUND)DRUUGE_SHIP_SOUNDS,
+		DRUUGE_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/human/human.c

@@ -48,9 +48,10 @@ static RACE_DESC human_desc =
 		11, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)HUMAN_RACE_STRINGS,
+		HUMAN_RACE_STRINGS,
-		(FRAME)HUMAN_ICON_MASK_PMAP_ANIM,
+		HUMAN_ICON_MASK_PMAP_ANIM,
-		(FRAME)HUMAN_MICON_MASK_PMAP_ANIM,
+		HUMAN_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -73,29 +74,30 @@ static RACE_DESC human_desc =
 	},
 	{
 		{
-			(FRAME)HUMAN_BIG_MASK_PMAP_ANIM,
+			HUMAN_BIG_MASK_PMAP_ANIM,
-			(FRAME)HUMAN_MED_MASK_PMAP_ANIM,
+			HUMAN_MED_MASK_PMAP_ANIM,
-			(FRAME)HUMAN_SML_MASK_PMAP_ANIM,
+			HUMAN_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SATURN_BIG_MASK_PMAP_ANIM,
+			SATURN_BIG_MASK_PMAP_ANIM,
-			(FRAME)SATURN_MED_MASK_PMAP_ANIM,
+			SATURN_MED_MASK_PMAP_ANIM,
-			(FRAME)SATURN_SML_MASK_PMAP_ANIM,
+			SATURN_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)HUMAN_CAPTAIN_MASK_PMAP_ANIM,
+			HUMAN_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)HUMAN_VICTORY_SONG,
+		HUMAN_VICTORY_SONG,
-		(SOUND)HUMAN_SHIP_SOUNDS,
+		HUMAN_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/ilwrath/ilwrath.c

@@ -46,9 +46,10 @@ static RACE_DESC ilwrath_desc =
 		10, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)ILWRATH_RACE_STRINGS,
+		ILWRATH_RACE_STRINGS,
-		(FRAME)ILWRATH_ICON_MASK_PMAP_ANIM,
+		ILWRATH_ICON_MASK_PMAP_ANIM,
-		(FRAME)ILWRATH_MICON_MASK_PMAP_ANIM,
+		ILWRATH_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		1410 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -71,29 +72,30 @@ static RACE_DESC ilwrath_desc =
 	},
 	{
 		{
-			(FRAME)ILWRATH_BIG_MASK_PMAP_ANIM,
+			ILWRATH_BIG_MASK_PMAP_ANIM,
-			(FRAME)ILWRATH_MED_MASK_PMAP_ANIM,
+			ILWRATH_MED_MASK_PMAP_ANIM,
-			(FRAME)ILWRATH_SML_MASK_PMAP_ANIM,
+			ILWRATH_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)FIRE_BIG_MASK_PMAP_ANIM,
+			FIRE_BIG_MASK_PMAP_ANIM,
-			(FRAME)FIRE_MED_MASK_PMAP_ANIM,
+			FIRE_MED_MASK_PMAP_ANIM,
-			(FRAME)FIRE_SML_MASK_PMAP_ANIM,
+			FIRE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)ILWRATH_CAPTAIN_MASK_PMAP_ANIM,
+			ILWRATH_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)ILWRATH_VICTORY_SONG,
+		ILWRATH_VICTORY_SONG,
-		(SOUND)ILWRATH_SHIP_SOUNDS,
+		ILWRATH_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/lastbat/lastbat.c

@@ -51,9 +51,10 @@ static RACE_DESC samatra_desc =
 		16, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)0,
+		NULL_RESOURCE,
-		(FRAME)0,
+		NULL_RESOURCE,
-		(FRAME)0,
+		NULL_RESOURCE,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -76,29 +77,30 @@ static RACE_DESC samatra_desc =
 	},
 	{
 		{
-			(FRAME)SAMATRA_BIG_MASK_ANIM,
+			SAMATRA_BIG_MASK_ANIM,
-			(FRAME)SAMATRA_MED_MASK_PMAP_ANIM,
+			SAMATRA_MED_MASK_PMAP_ANIM,
-			(FRAME)SAMATRA_SML_MASK_PMAP_ANIM,
+			SAMATRA_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SENTINEL_BIG_MASK_ANIM,
+			SENTINEL_BIG_MASK_ANIM,
-			(FRAME)SENTINEL_MED_MASK_PMAP_ANIM,
+			SENTINEL_MED_MASK_PMAP_ANIM,
-			(FRAME)SENTINEL_SML_MASK_PMAP_ANIM,
+			SENTINEL_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)GENERATOR_BIG_MASK_ANIM,
+			GENERATOR_BIG_MASK_ANIM,
-			(FRAME)GENERATOR_MED_MASK_PMAP_ANIM,
+			GENERATOR_MED_MASK_PMAP_ANIM,
-			(FRAME)GENERATOR_SML_MASK_PMAP_ANIM,
+			GENERATOR_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SAMATRA_CAPTAIN_MASK_PMAP_ANIM,
+			SAMATRA_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		0,
+		NULL_RESOURCE,
-		(SOUND)SAMATRA_SHIP_SOUNDS,
+		SAMATRA_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/melnorme/melnorme.c

@@ -47,9 +47,10 @@ static RACE_DESC melnorme_desc =
 		18, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)MELNORME_RACE_STRINGS,
+		MELNORME_RACE_STRINGS,
-		(FRAME)MELNORME_ICON_MASK_PMAP_ANIM,
+		MELNORME_ICON_MASK_PMAP_ANIM,
-		(FRAME)MELNORME_MICON_MASK_PMAP_ANIM,
+		MELNORME_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		INFINITE_RADIUS, /* Initial sphere of influence radius */
@@ -72,29 +73,30 @@ static RACE_DESC melnorme_desc =
 	},
 	{
 		{
-			(FRAME)MELNORME_BIG_MASK_PMAP_ANIM,
+			MELNORME_BIG_MASK_PMAP_ANIM,
-			(FRAME)MELNORME_MED_MASK_PMAP_ANIM,
+			MELNORME_MED_MASK_PMAP_ANIM,
-			(FRAME)MELNORME_SML_MASK_PMAP_ANIM,
+			MELNORME_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)PUMPUP_BIG_MASK_PMAP_ANIM,
+			PUMPUP_BIG_MASK_PMAP_ANIM,
-			(FRAME)PUMPUP_MED_MASK_PMAP_ANIM,
+			PUMPUP_MED_MASK_PMAP_ANIM,
-			(FRAME)PUMPUP_SML_MASK_PMAP_ANIM,
+			PUMPUP_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)CONFUSE_BIG_MASK_PMAP_ANIM,
+			CONFUSE_BIG_MASK_PMAP_ANIM,
-			(FRAME)CONFUSE_MED_MASK_PMAP_ANIM,
+			CONFUSE_MED_MASK_PMAP_ANIM,
-			(FRAME)CONFUSE_SML_MASK_PMAP_ANIM,
+			CONFUSE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)MELNORME_CAPTAIN_MASK_PMAP_ANIM,
+			MELNORME_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)MELNORME_VICTORY_SONG,
+		MELNORME_VICTORY_SONG,
-		(SOUND)MELNORME_SHIP_SOUNDS,
+		MELNORME_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c

@@ -59,9 +59,10 @@ static RACE_DESC mmrnmhrm_desc =
 		19, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)MMRNMHRM_RACE_STRINGS,
+		MMRNMHRM_RACE_STRINGS,
-		(FRAME)MMRNMHRM_ICON_MASK_PMAP_ANIM,
+		MMRNMHRM_ICON_MASK_PMAP_ANIM,
-		(FRAME)MMRNMHRM_MICON_MASK_PMAP_ANIM,
+		MMRNMHRM_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -84,29 +85,30 @@ static RACE_DESC mmrnmhrm_desc =
 	},
 	{
 		{
-			(FRAME)MMRNMHRM_BIG_MASK_PMAP_ANIM,
+			MMRNMHRM_BIG_MASK_PMAP_ANIM,
-			(FRAME)MMRNMHRM_MED_MASK_PMAP_ANIM,
+			MMRNMHRM_MED_MASK_PMAP_ANIM,
-			(FRAME)MMRNMHRM_SML_MASK_PMAP_ANIM,
+			MMRNMHRM_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)TORP_BIG_MASK_PMAP_ANIM,
+			TORP_BIG_MASK_PMAP_ANIM,
-			(FRAME)TORP_MED_MASK_PMAP_ANIM,
+			TORP_MED_MASK_PMAP_ANIM,
-			(FRAME)TORP_SML_MASK_PMAP_ANIM,
+			TORP_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)YWING_BIG_MASK_PMAP_ANIM,
+			YWING_BIG_MASK_PMAP_ANIM,
-			(FRAME)YWING_MED_MASK_PMAP_ANIM,
+			YWING_MED_MASK_PMAP_ANIM,
-			(FRAME)YWING_SML_MASK_PMAP_ANIM,
+			YWING_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)MMRNMHRM_CAPTAIN_MASK_PMAP_ANIM,
+			MMRNMHRM_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)MMRNMHRM_VICTORY_SONG,
+		MMRNMHRM_VICTORY_SONG,
-		(SOUND)MMRNMHRM_SHIP_SOUNDS,
+		MMRNMHRM_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/mycon/mycon.c

@@ -47,9 +47,10 @@ static RACE_DESC mycon_desc =
 		21, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)MYCON_RACE_STRINGS,
+		MYCON_RACE_STRINGS,
-		(FRAME)MYCON_ICON_MASK_PMAP_ANIM,
+		MYCON_ICON_MASK_PMAP_ANIM,
-		(FRAME)MYCON_MICON_MASK_PMAP_ANIM,
+		MYCON_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		1070 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -72,29 +73,30 @@ static RACE_DESC mycon_desc =
 	},
 	{
 		{
-			(FRAME)MYCON_BIG_MASK_PMAP_ANIM,
+			MYCON_BIG_MASK_PMAP_ANIM,
-			(FRAME)MYCON_MED_MASK_PMAP_ANIM,
+			MYCON_MED_MASK_PMAP_ANIM,
-			(FRAME)MYCON_SML_MASK_PMAP_ANIM,
+			MYCON_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)PLASMA_BIG_MASK_PMAP_ANIM,
+			PLASMA_BIG_MASK_PMAP_ANIM,
-			(FRAME)PLASMA_MED_MASK_PMAP_ANIM,
+			PLASMA_MED_MASK_PMAP_ANIM,
-			(FRAME)PLASMA_SML_MASK_PMAP_ANIM,
+			PLASMA_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)MYCON_CAPTAIN_MASK_PMAP_ANIM,
+			MYCON_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)MYCON_VICTORY_SONG,
+		MYCON_VICTORY_SONG,
-		(SOUND)MYCON_SHIP_SOUNDS,
+		MYCON_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/orz/orz.c

@@ -49,9 +49,10 @@ static RACE_DESC orz_desc =
 		23, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)ORZ_RACE_STRINGS,
+		ORZ_RACE_STRINGS,
-		(FRAME)ORZ_ICON_MASK_PMAP_ANIM,
+		ORZ_ICON_MASK_PMAP_ANIM,
-		(FRAME)ORZ_MICON_MASK_PMAP_ANIM,
+		ORZ_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		333 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -74,29 +75,30 @@ static RACE_DESC orz_desc =
 	},
 	{
 		{
-			(FRAME)ORZ_BIG_MASK_PMAP_ANIM,
+			ORZ_BIG_MASK_PMAP_ANIM,
-			(FRAME)ORZ_MED_MASK_PMAP_ANIM,
+			ORZ_MED_MASK_PMAP_ANIM,
-			(FRAME)ORZ_SML_MASK_PMAP_ANIM,
+			ORZ_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)HOWITZER_BIG_MASK_PMAP_ANIM,
+			HOWITZER_BIG_MASK_PMAP_ANIM,
-			(FRAME)HOWITZER_MED_MASK_PMAP_ANIM,
+			HOWITZER_MED_MASK_PMAP_ANIM,
-			(FRAME)HOWITZER_SML_MASK_PMAP_ANIM,
+			HOWITZER_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)TURRET_BIG_MASK_PMAP_ANIM,
+			TURRET_BIG_MASK_PMAP_ANIM,
-			(FRAME)TURRET_MED_MASK_PMAP_ANIM,
+			TURRET_MED_MASK_PMAP_ANIM,
-			(FRAME)TURRET_SML_MASK_PMAP_ANIM,
+			TURRET_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)ORZ_CAPTAIN_MASK_PMAP_ANIM,
+			ORZ_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)ORZ_VICTORY_SONG,
+		ORZ_VICTORY_SONG,
-		(SOUND)ORZ_SHIP_SOUNDS,
+		ORZ_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/pkunk/pkunk.c

@@ -47,9 +47,10 @@ static RACE_DESC pkunk_desc =
 		20, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)PKUNK_RACE_STRINGS,
+		PKUNK_RACE_STRINGS,
-		(FRAME)PKUNK_ICON_MASK_PMAP_ANIM,
+		PKUNK_ICON_MASK_PMAP_ANIM,
-		(FRAME)PKUNK_MICON_MASK_PMAP_ANIM,
+		PKUNK_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		666 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -72,29 +73,30 @@ static RACE_DESC pkunk_desc =
 	},
 	{
 		{
-			(FRAME)PKUNK_BIG_MASK_PMAP_ANIM,
+			PKUNK_BIG_MASK_PMAP_ANIM,
-			(FRAME)PKUNK_MED_MASK_PMAP_ANIM,
+			PKUNK_MED_MASK_PMAP_ANIM,
-			(FRAME)PKUNK_SML_MASK_PMAP_ANIM,
+			PKUNK_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)BUG_BIG_MASK_PMAP_ANIM,
+			BUG_BIG_MASK_PMAP_ANIM,
-			(FRAME)BUG_MED_MASK_PMAP_ANIM,
+			BUG_MED_MASK_PMAP_ANIM,
-			(FRAME)BUG_SML_MASK_PMAP_ANIM,
+			BUG_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)PKUNK_CAPTAIN_MASK_PMAP_ANIM,
+			PKUNK_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)PKUNK_VICTORY_SONG,
+		PKUNK_VICTORY_SONG,
-		(SOUND)PKUNK_SHIP_SOUNDS,
+		PKUNK_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/probe/probe.c

@@ -43,7 +43,8 @@ static RACE_DESC probe_desc =
 		MAX_ENERGY, MAX_ENERGY,
 		0,
 		0,
-		(FRAME)PROBE_MICON_MASK_PMAP_ANIM,
+		PROBE_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -66,29 +67,30 @@ static RACE_DESC probe_desc =
 	},
 	{
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)0,
+		NULL_RESOURCE,
-		(SOUND)0,
+		NULL_RESOURCE,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/shofixti/shofixti.c

@@ -47,9 +47,10 @@ static RACE_DESC shofixti_desc =
 		5, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)SHOFIXTI_RACE_STRINGS,
+		SHOFIXTI_RACE_STRINGS,
-		(FRAME)SHOFIXTI_ICON_MASK_PMAP_ANIM,
+		SHOFIXTI_ICON_MASK_PMAP_ANIM,
-		(FRAME)SHOFIXTI_MICON_MASK_PMAP_ANIM,
+		SHOFIXTI_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -72,29 +73,30 @@ static RACE_DESC shofixti_desc =
 	},
 	{
 		{
-			(FRAME)SHOFIXTI_BIG_MASK_PMAP_ANIM,
+			SHOFIXTI_BIG_MASK_PMAP_ANIM,
-			(FRAME)SHOFIXTI_MED_MASK_PMAP_ANIM,
+			SHOFIXTI_MED_MASK_PMAP_ANIM,
-			(FRAME)SHOFIXTI_SML_MASK_PMAP_ANIM,
+			SHOFIXTI_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)DART_BIG_MASK_PMAP_ANIM,
+			DART_BIG_MASK_PMAP_ANIM,
-			(FRAME)DART_MED_MASK_PMAP_ANIM,
+			DART_MED_MASK_PMAP_ANIM,
-			(FRAME)DART_SML_MASK_PMAP_ANIM,
+			DART_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)DESTRUCT_BIG_MASK_ANIM,
+			DESTRUCT_BIG_MASK_ANIM,
-			(FRAME)DESTRUCT_MED_MASK_ANIM,
+			DESTRUCT_MED_MASK_ANIM,
-			(FRAME)DESTRUCT_SML_MASK_ANIM,
+			DESTRUCT_SML_MASK_ANIM,
 		},
 		{
-			(FRAME)SHOFIXTI_CAPTAIN_MASK_PMAP_ANIM,
+			SHOFIXTI_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)SHOFIXTI_VICTORY_SONG,
+	        SHOFIXTI_VICTORY_SONG,
-		(SOUND)SHOFIXTI_SHIP_SOUNDS,
+		SHOFIXTI_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,
@@ -391,14 +393,14 @@ init_shofixti (void)
 #define NUM_LIMPETS 3
 		COUNT i;
 
-		new_shofixti_desc.ship_data.ship[0] = (FRAME)OLDSHOF_BIG_MASK_PMAP_ANIM;
+		new_shofixti_desc.ship_data.ship_rsc[0] = OLDSHOF_BIG_MASK_PMAP_ANIM;
-		new_shofixti_desc.ship_data.ship[1] = (FRAME)OLDSHOF_MED_MASK_PMAP_ANIM;
+		new_shofixti_desc.ship_data.ship_rsc[1] = OLDSHOF_MED_MASK_PMAP_ANIM;
-		new_shofixti_desc.ship_data.ship[2] = (FRAME)OLDSHOF_SML_MASK_PMAP_ANIM;
+		new_shofixti_desc.ship_data.ship_rsc[2] = OLDSHOF_SML_MASK_PMAP_ANIM;
-		new_shofixti_desc.ship_data.special[0] = (FRAME)0;
+		new_shofixti_desc.ship_data.special_rsc[0] = NULL_RESOURCE;
-		new_shofixti_desc.ship_data.special[1] = (FRAME)0;
+		new_shofixti_desc.ship_data.special_rsc[1] = NULL_RESOURCE;
-		new_shofixti_desc.ship_data.special[2] = (FRAME)0;
+		new_shofixti_desc.ship_data.special_rsc[2] = NULL_RESOURCE;
-		new_shofixti_desc.ship_data.captain_control.background =
+		new_shofixti_desc.ship_data.captain_control.captain_rsc =
-				(FRAME)OLDSHOF_CAPTAIN_MASK_PMAP_ANIM;
+				OLDSHOF_CAPTAIN_MASK_PMAP_ANIM;
 
 		/* Weapon doesn't work as well */
 		new_shofixti_desc.characteristics.weapon_wait = 10;

sc2/src/sc2code/ships/sis_ship/sis_ship.c

@@ -53,9 +53,10 @@ static RACE_DESC sis_desc =
 		16, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		0,
+		NULL_RESOURCE,
-		(FRAME)SIS_ICON_MASK_PMAP_ANIM,
+		SIS_ICON_MASK_PMAP_ANIM,
-		0,
+		NULL_RESOURCE,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -78,29 +79,30 @@ static RACE_DESC sis_desc =
 	},
 	{
 		{
-			(FRAME)SIS_BIG_MASK_PMAP_ANIM,
+			SIS_BIG_MASK_PMAP_ANIM,
-			(FRAME)SIS_MED_MASK_PMAP_ANIM,
+			SIS_MED_MASK_PMAP_ANIM,
-			(FRAME)SIS_SML_MASK_PMAP_ANIM,
+			SIS_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)BLASTER_BIG_MASK_PMAP_ANIM,
+			BLASTER_BIG_MASK_PMAP_ANIM,
-			(FRAME)BLASTER_MED_MASK_PMAP_ANIM,
+			BLASTER_MED_MASK_PMAP_ANIM,
-			(FRAME)BLASTER_SML_MASK_PMAP_ANIM,
+			BLASTER_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)SIS_CAPTAIN_MASK_PMAP_ANIM,
+			SIS_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)SIS_VICTORY_SONG,
+		SIS_VICTORY_SONG,
-		(SOUND)SIS_SHIP_SOUNDS,
+		SIS_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,
@@ -832,16 +834,16 @@ init_sis (void)
 	{
 		for (i = 0; i < NUM_VIEWS; ++i)
 		{
-			new_sis_desc.ship_data.ship[i] = 0;
+			new_sis_desc.ship_data.ship_rsc[i] = NULL_RESOURCE;
-			new_sis_desc.ship_data.weapon[i] = 0;
+			new_sis_desc.ship_data.weapon_rsc[i] = NULL_RESOURCE;
-			new_sis_desc.ship_data.special[i] = 0;
+			new_sis_desc.ship_data.special_rsc[i] = NULL_RESOURCE;
 		}
-		new_sis_desc.ship_info.icons = 0;
+		new_sis_desc.ship_info.icons_rsc = NULL_RESOURCE;
-		new_sis_desc.ship_data.captain_control.background = 0;
+		new_sis_desc.ship_data.captain_control.captain_rsc = NULL_RESOURCE;
-		new_sis_desc.ship_data.victory_ditty = 0;
+		new_sis_desc.ship_data.victory_ditty_rsc = NULL_RESOURCE;
-		new_sis_desc.ship_data.ship_sounds = 0;
+		new_sis_desc.ship_data.ship_sounds_rsc = NULL_RESOURCE;
 
-		new_sis_desc.ship_data.ship[0] = (FRAME)SIS_HYPER_MASK_PMAP_ANIM;
+		new_sis_desc.ship_data.ship_rsc[0] = SIS_HYPER_MASK_PMAP_ANIM;
 
 		new_sis_desc.preprocess_func = sis_hyper_preprocess;
 		new_sis_desc.postprocess_func = sis_hyper_postprocess;

sc2/src/sc2code/ships/slylandr/slylandr.c

@@ -46,9 +46,10 @@ static RACE_DESC slylandro_desc =
 		17, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)SLYLANDRO_RACE_STRINGS,
+		SLYLANDRO_RACE_STRINGS,
-		(FRAME)SLYLANDRO_ICON_MASK_PMAP_ANIM,
+		SLYLANDRO_ICON_MASK_PMAP_ANIM,
-		(FRAME)SLYLANDRO_MICON_MASK_PMAP_ANIM,
+		SLYLANDRO_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		INFINITE_RADIUS, /* Initial sphere of influence radius */
@@ -71,29 +72,30 @@ static RACE_DESC slylandro_desc =
 	},
 	{
 		{
-			(FRAME)SLYLANDRO_BIG_MASK_PMAP_ANIM,
+			SLYLANDRO_BIG_MASK_PMAP_ANIM,
-			(FRAME)SLYLANDRO_MED_MASK_PMAP_ANIM,
+			SLYLANDRO_MED_MASK_PMAP_ANIM,
-			(FRAME)SLYLANDRO_SML_MASK_PMAP_ANIM,
+			SLYLANDRO_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)SLYLANDRO_CAPTAIN_MASK_PMAP_ANIM,
+			SLYLANDRO_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)SLYLANDRO_VICTORY_SONG,
+		SLYLANDRO_VICTORY_SONG,
-		(SOUND)SLYLANDRO_SHIP_SOUNDS,
+		SLYLANDRO_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/spathi/spathi.c

@@ -44,9 +44,10 @@ static RACE_DESC spathi_desc =
 		18, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)SPATHI_RACE_STRINGS,
+		SPATHI_RACE_STRINGS,
-		(FRAME)SPATHI_ICON_MASK_PMAP_ANIM,
+		SPATHI_ICON_MASK_PMAP_ANIM,
-		(FRAME)SPATHI_MICON_MASK_PMAP_ANIM,
+		SPATHI_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		1000 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -69,29 +70,30 @@ static RACE_DESC spathi_desc =
 	},
 	{
 		{
-			(FRAME)SPATHI_BIG_MASK_PMAP_ANIM,
+			SPATHI_BIG_MASK_PMAP_ANIM,
-			(FRAME)SPATHI_MED_MASK_PMAP_ANIM,
+			SPATHI_MED_MASK_PMAP_ANIM,
-			(FRAME)SPATHI_SML_MASK_PMAP_ANIM,
+			SPATHI_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)MISSILE_BIG_MASK_PMAP_ANIM,
+			MISSILE_BIG_MASK_PMAP_ANIM,
-			(FRAME)MISSILE_MED_MASK_PMAP_ANIM,
+			MISSILE_MED_MASK_PMAP_ANIM,
-			(FRAME)MISSILE_SML_MASK_PMAP_ANIM,
+			MISSILE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)DISCRIM_BIG_MASK_PMAP_ANIM,
+			DISCRIM_BIG_MASK_PMAP_ANIM,
-			(FRAME)DISCRIM_MED_MASK_PMAP_ANIM,
+			DISCRIM_MED_MASK_PMAP_ANIM,
-			(FRAME)DISCRIM_SML_MASK_PMAP_ANIM,
+			DISCRIM_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SPATHI_CAPTAIN_MASK_PMAP_ANIM,
+			SPATHI_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)SPATHI_VICTORY_SONG,
+		SPATHI_VICTORY_SONG,
-		(SOUND)SPATHI_SHIP_SOUNDS,
+		SPATHI_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/supox/supox.c

@@ -46,9 +46,10 @@ static RACE_DESC supox_desc =
 		16, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)SUPOX_RACE_STRINGS,
+		SUPOX_RACE_STRINGS,
-		(FRAME)SUPOX_ICON_MASK_PMAP_ANIM,
+		SUPOX_ICON_MASK_PMAP_ANIM,
-		(FRAME)SUPOX_MICON_MASK_PMAP_ANIM,
+		SUPOX_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		333 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -71,29 +72,30 @@ static RACE_DESC supox_desc =
 	},
 	{
 		{
-			(FRAME)SUPOX_BIG_MASK_PMAP_ANIM,
+			SUPOX_BIG_MASK_PMAP_ANIM,
-			(FRAME)SUPOX_MED_MASK_PMAP_ANIM,
+			SUPOX_MED_MASK_PMAP_ANIM,
-			(FRAME)SUPOX_SML_MASK_PMAP_ANIM,
+			SUPOX_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)GOB_BIG_MASK_PMAP_ANIM,
+			GOB_BIG_MASK_PMAP_ANIM,
-			(FRAME)GOB_MED_MASK_PMAP_ANIM,
+			GOB_MED_MASK_PMAP_ANIM,
-			(FRAME)GOB_SML_MASK_PMAP_ANIM,
+			GOB_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)SUPOX_CAPTAIN_MASK_PMAP_ANIM,
+			SUPOX_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)SUPOX_VICTORY_SONG,
+		SUPOX_VICTORY_SONG,
-		(SOUND)SUPOX_SHIP_SOUNDS,
+		SUPOX_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/syreen/syreen.c

@@ -47,9 +47,10 @@ static RACE_DESC syreen_desc =
 		13, /* Super Melee cost */
 		MAX_CREW, SYREEN_MAX_CREW_SIZE,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)SYREEN_RACE_STRINGS,
+		SYREEN_RACE_STRINGS,
-		(FRAME)SYREEN_ICON_MASK_PMAP_ANIM,
+		SYREEN_ICON_MASK_PMAP_ANIM,
-		(FRAME)SYREEN_MICON_MASK_PMAP_ANIM,
+		SYREEN_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		0, /* Initial sphere of influence radius */
@@ -72,29 +73,30 @@ static RACE_DESC syreen_desc =
 	},
 	{
 		{
-			(FRAME)SYREEN_BIG_MASK_PMAP_ANIM,
+			SYREEN_BIG_MASK_PMAP_ANIM,
-			(FRAME)SYREEN_MED_MASK_PMAP_ANIM,
+			SYREEN_MED_MASK_PMAP_ANIM,
-			(FRAME)SYREEN_SML_MASK_PMAP_ANIM,
+			SYREEN_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)DAGGER_BIG_MASK_PMAP_ANIM,
+			DAGGER_BIG_MASK_PMAP_ANIM,
-			(FRAME)DAGGER_MED_MASK_PMAP_ANIM,
+			DAGGER_MED_MASK_PMAP_ANIM,
-			(FRAME)DAGGER_SML_MASK_PMAP_ANIM,
+			DAGGER_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)SYREEN_CAPTAIN_MASK_PMAP_ANIM,
+			SYREEN_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)SYREEN_VICTORY_SONG,
+		SYREEN_VICTORY_SONG,
-		(SOUND)SYREEN_SHIP_SOUNDS,
+		SYREEN_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/thradd/thradd.c

@@ -47,9 +47,10 @@ static RACE_DESC thraddash_desc =
 		10, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)THRADDASH_RACE_STRINGS,
+		THRADDASH_RACE_STRINGS,
-		(FRAME)THRADDASH_ICON_MASK_PMAP_ANIM,
+		THRADDASH_ICON_MASK_PMAP_ANIM,
-		(FRAME)THRADDASH_MICON_MASK_PMAP_ANIM,
+		THRADDASH_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		833 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -72,29 +73,30 @@ static RACE_DESC thraddash_desc =
 	},
 	{
 		{
-			(FRAME)THRADDASH_BIG_MASK_PMAP_ANIM,
+			THRADDASH_BIG_MASK_PMAP_ANIM,
-			(FRAME)THRADDASH_MED_MASK_PMAP_ANIM,
+			THRADDASH_MED_MASK_PMAP_ANIM,
-			(FRAME)THRADDASH_SML_MASK_PMAP_ANIM,
+			THRADDASH_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)HORN_BIG_MASK_PMAP_ANIM,
+			HORN_BIG_MASK_PMAP_ANIM,
-			(FRAME)HORN_MED_MASK_PMAP_ANIM,
+			HORN_MED_MASK_PMAP_ANIM,
-			(FRAME)HORN_SML_MASK_PMAP_ANIM,
+			HORN_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)NAPALM_BIG_MASK_PMAP_ANIM,
+			NAPALM_BIG_MASK_PMAP_ANIM,
-			(FRAME)NAPALM_MED_MASK_PMAP_ANIM,
+			NAPALM_MED_MASK_PMAP_ANIM,
-			(FRAME)NAPALM_SML_MASK_PMAP_ANIM,
+			NAPALM_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)THRADDASH_CAPTAIN_MASK_PMAP_ANIM,
+			THRADDASH_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)THRADDASH_VICTORY_SONG,
+		THRADDASH_VICTORY_SONG,
-		(SOUND)THRADDASH_SHIP_SOUNDS,
+		THRADDASH_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/umgah/umgah.c

@@ -46,9 +46,10 @@ static RACE_DESC umgah_desc =
 		7, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)UMGAH_RACE_STRINGS,
+		UMGAH_RACE_STRINGS,
-		(FRAME)UMGAH_ICON_MASK_PMAP_ANIM,
+		UMGAH_ICON_MASK_PMAP_ANIM,
-		(FRAME)UMGAH_MICON_MASK_PMAP_ANIM,
+		UMGAH_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		833 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -71,29 +72,30 @@ static RACE_DESC umgah_desc =
 	},
 	{
 		{
-			(FRAME)UMGAH_BIG_MASK_PMAP_ANIM,
+			UMGAH_BIG_MASK_PMAP_ANIM,
-			(FRAME)UMGAH_MED_MASK_PMAP_ANIM,
+			UMGAH_MED_MASK_PMAP_ANIM,
-			(FRAME)UMGAH_SML_MASK_PMAP_ANIM,
+			UMGAH_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SPRITZ_MASK_PMAP_ANIM,
+			SPRITZ_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)CONE_BIG_MASK_ANIM,
+			CONE_BIG_MASK_ANIM,
-			(FRAME)CONE_MED_MASK_ANIM,
+			CONE_MED_MASK_ANIM,
-			(FRAME)CONE_SML_MASK_ANIM,
+			CONE_SML_MASK_ANIM,
 		},
 		{
-			(FRAME)UMGAH_CAPTAIN_MASK_PMAP_ANIM,
+			UMGAH_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)UMGAH_VICTORY_SONG,
+		UMGAH_VICTORY_SONG,
-		(SOUND)UMGAH_SHIP_SOUNDS,
+		UMGAH_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/urquan/urquan.c

@@ -48,9 +48,10 @@ static RACE_DESC urquan_desc =
 		30, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)URQUAN_RACE_STRINGS,
+		URQUAN_RACE_STRINGS,
-		(FRAME)URQUAN_ICON_MASK_PMAP_ANIM,
+		URQUAN_ICON_MASK_PMAP_ANIM,
-		(FRAME)URQUAN_MICON_MASK_PMAP_ANIM,
+		URQUAN_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		2666 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -73,29 +74,30 @@ static RACE_DESC urquan_desc =
 	},
 	{
 		{
-			(FRAME)URQUAN_BIG_MASK_PMAP_ANIM,
+			URQUAN_BIG_MASK_PMAP_ANIM,
-			(FRAME)URQUAN_MED_MASK_PMAP_ANIM,
+			URQUAN_MED_MASK_PMAP_ANIM,
-			(FRAME)URQUAN_SML_MASK_PMAP_ANIM,
+			URQUAN_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)FUSION_BIG_MASK_PMAP_ANIM,
+			FUSION_BIG_MASK_PMAP_ANIM,
-			(FRAME)FUSION_MED_MASK_PMAP_ANIM,
+			FUSION_MED_MASK_PMAP_ANIM,
-			(FRAME)FUSION_SML_MASK_PMAP_ANIM,
+			FUSION_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)FIGHTER_BIG_MASK_PMAP_ANIM,
+			FIGHTER_BIG_MASK_PMAP_ANIM,
-			(FRAME)FIGHTER_MED_MASK_PMAP_ANIM,
+			FIGHTER_MED_MASK_PMAP_ANIM,
-			(FRAME)FIGHTER_SML_MASK_PMAP_ANIM,
+			FIGHTER_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)URQUAN_CAPTAIN_MASK_PMAP_ANIM,
+			URQUAN_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)URQUAN_VICTORY_SONG,
+		URQUAN_VICTORY_SONG,
-		(SOUND)URQUAN_SHIP_SOUNDS,
+		URQUAN_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/utwig/utwig.c

@@ -48,9 +48,10 @@ static RACE_DESC utwig_desc =
 		22, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY >> 1, MAX_ENERGY,
-		(STRING)UTWIG_RACE_STRINGS,
+		UTWIG_RACE_STRINGS,
-		(FRAME)UTWIG_ICON_MASK_PMAP_ANIM,
+		UTWIG_ICON_MASK_PMAP_ANIM,
-		(FRAME)UTWIG_MICON_MASK_PMAP_ANIM,
+		UTWIG_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		666 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -73,29 +74,30 @@ static RACE_DESC utwig_desc =
 	},
 	{
 		{
-			(FRAME)UTWIG_BIG_MASK_PMAP_ANIM,
+			UTWIG_BIG_MASK_PMAP_ANIM,
-			(FRAME)UTWIG_MED_MASK_PMAP_ANIM,
+			UTWIG_MED_MASK_PMAP_ANIM,
-			(FRAME)UTWIG_SML_MASK_PMAP_ANIM,
+			UTWIG_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)LANCE_BIG_MASK_PMAP_ANIM,
+			LANCE_BIG_MASK_PMAP_ANIM,
-			(FRAME)LANCE_MED_MASK_PMAP_ANIM,
+			LANCE_MED_MASK_PMAP_ANIM,
-			(FRAME)LANCE_SML_MASK_PMAP_ANIM,
+			LANCE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)UTWIG_CAPTAIN_MASK_PMAP_ANIM,
+			UTWIG_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)UTWIG_VICTORY_SONG,
+		UTWIG_VICTORY_SONG,
-		(SOUND)UTWIG_SHIP_SOUNDS,
+		UTWIG_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/vux/vux.c

@@ -49,9 +49,10 @@ static RACE_DESC vux_desc =
 		12, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)VUX_RACE_STRINGS,
+		VUX_RACE_STRINGS,
-		(FRAME)VUX_ICON_MASK_PMAP_ANIM,
+		VUX_ICON_MASK_PMAP_ANIM,
-		(FRAME)VUX_MICON_MASK_PMAP_ANIM,
+		VUX_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		900 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -74,29 +75,30 @@ static RACE_DESC vux_desc =
 	},
 	{
 		{
-			(FRAME)VUX_BIG_MASK_PMAP_ANIM,
+			VUX_BIG_MASK_PMAP_ANIM,
-			(FRAME)VUX_MED_MASK_PMAP_ANIM,
+			VUX_MED_MASK_PMAP_ANIM,
-			(FRAME)VUX_SML_MASK_PMAP_ANIM,
+			VUX_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SLIME_MASK_PMAP_ANIM,
+			SLIME_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL_RESOURCE,
-			(FRAME)0,
+			NULL_RESOURCE,
 		},
 		{
-			(FRAME)LIMPETS_BIG_MASK_PMAP_ANIM,
+			LIMPETS_BIG_MASK_PMAP_ANIM,
-			(FRAME)LIMPETS_MED_MASK_PMAP_ANIM,
+			LIMPETS_MED_MASK_PMAP_ANIM,
-			(FRAME)LIMPETS_SML_MASK_PMAP_ANIM,
+			LIMPETS_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)VUX_CAPTAIN_MASK_PMAP_ANIM,
+			VUX_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)VUX_VICTORY_SONG,
+		VUX_VICTORY_SONG,
-		(SOUND)VUX_SHIP_SOUNDS,
+		VUX_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/yehat/yehat.c

@@ -46,9 +46,10 @@ static RACE_DESC yehat_desc =
 		23, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)YEHAT_RACE_STRINGS,
+		YEHAT_RACE_STRINGS,
-		(FRAME)YEHAT_ICON_MASK_PMAP_ANIM,
+		YEHAT_ICON_MASK_PMAP_ANIM,
-		(FRAME)YEHAT_MICON_MASK_PMAP_ANIM,
+		YEHAT_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		750 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -71,29 +72,30 @@ static RACE_DESC yehat_desc =
 	},
 	{
 		{
-			(FRAME)YEHAT_BIG_MASK_PMAP_ANIM,
+			YEHAT_BIG_MASK_PMAP_ANIM,
-			(FRAME)YEHAT_MED_MASK_PMAP_ANIM,
+			YEHAT_MED_MASK_PMAP_ANIM,
-			(FRAME)YEHAT_SML_MASK_PMAP_ANIM,
+			YEHAT_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)YEHAT_CANNON_BIG_MASK_PMAP_ANIM,
+			YEHAT_CANNON_BIG_MASK_PMAP_ANIM,
-			(FRAME)YEHAT_CANNON_MED_MASK_PMAP_ANIM,
+			YEHAT_CANNON_MED_MASK_PMAP_ANIM,
-			(FRAME)YEHAT_CANNON_SML_MASK_PMAP_ANIM,
+			YEHAT_CANNON_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SHIELD_BIG_MASK_ANIM,
+			SHIELD_BIG_MASK_ANIM,
-			(FRAME)SHIELD_MED_MASK_ANIM,
+			SHIELD_MED_MASK_ANIM,
-			(FRAME)SHIELD_SML_MASK_ANIM,
+			SHIELD_SML_MASK_ANIM,
 		},
 		{
-			(FRAME)YEHAT_CAPTAIN_MASK_PMAP_ANIM,
+			YEHAT_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)YEHAT_VICTORY_SONG,
+		YEHAT_VICTORY_SONG,
-		(SOUND)YEHAT_SHIP_SOUNDS,
+		YEHAT_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/ships/zoqfot/zoqfot.c

@@ -47,9 +47,10 @@ static RACE_DESC zoqfotpik_desc =
 		6, /* Super Melee cost */
 		MAX_CREW, MAX_CREW,
 		MAX_ENERGY, MAX_ENERGY,
-		(STRING)ZOQFOTPIK_RACE_STRINGS,
+		ZOQFOTPIK_RACE_STRINGS,
-		(FRAME)ZOQFOTPIK_ICON_MASK_PMAP_ANIM,
+		ZOQFOTPIK_ICON_MASK_PMAP_ANIM,
-		(FRAME)ZOQFOTPIK_MICON_MASK_PMAP_ANIM,
+		ZOQFOTPIK_MICON_MASK_PMAP_ANIM,
+		NULL, NULL, NULL
 	},
 	{ /* FLEET_STUFF */
 		320 / SPHERE_RADIUS_INCREMENT * 2, /* Initial SoI radius */
@@ -72,29 +73,30 @@ static RACE_DESC zoqfotpik_desc =
 	},
 	{
 		{
-			(FRAME)ZOQFOTPIK_BIG_MASK_PMAP_ANIM,
+			ZOQFOTPIK_BIG_MASK_PMAP_ANIM,
-			(FRAME)ZOQFOTPIK_MED_MASK_PMAP_ANIM,
+			ZOQFOTPIK_MED_MASK_PMAP_ANIM,
-			(FRAME)ZOQFOTPIK_SML_MASK_PMAP_ANIM,
+			ZOQFOTPIK_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)SPIT_BIG_MASK_PMAP_ANIM,
+			SPIT_BIG_MASK_PMAP_ANIM,
-			(FRAME)SPIT_MED_MASK_PMAP_ANIM,
+			SPIT_MED_MASK_PMAP_ANIM,
-			(FRAME)SPIT_SML_MASK_PMAP_ANIM,
+			SPIT_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)STINGER_BIG_MASK_PMAP_ANIM,
+			STINGER_BIG_MASK_PMAP_ANIM,
-			(FRAME)STINGER_MED_MASK_PMAP_ANIM,
+			STINGER_MED_MASK_PMAP_ANIM,
-			(FRAME)STINGER_SML_MASK_PMAP_ANIM,
+			STINGER_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)ZOQFOTPIK_CAPTAIN_MASK_PMAP_ANIM,
+			ZOQFOTPIK_CAPTAIN_MASK_PMAP_ANIM,
-			(FRAME)0,
+			NULL, NULL, NULL, NULL, NULL
-			(FRAME)0,
-			(FRAME)0,
-			(FRAME)0,
 		},
-		(SOUND)ZOQFOTPIK_VICTORY_SONG,
+		ZOQFOTPIK_VICTORY_SONG,
-		(SOUND)ZOQFOTPIK_SHIP_SOUNDS,
+		ZOQFOTPIK_SHIP_SOUNDS,
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		{ NULL, NULL, NULL },
+		NULL_HANDLE, NULL
 	},
 	{
 		0,

sc2/src/sc2code/tactrans.c

@@ -300,7 +300,7 @@ new_ship (ELEMENT *DeadShipPtr)
 			{
 				// StarShipPtr points to the remaining ship.
 				MusicStarted = TRUE;
-				PlayMusic ((MUSIC_REF)StarShipPtr->RaceDescPtr->
+				PlayMusic (StarShipPtr->RaceDescPtr->
 						ship_data.victory_ditty, FALSE, 3);
 				StarShipPtr->cur_status_flags &= ~PLAY_VICTORY_DITTY;
 			}