[FIXME] corpse palette crash

ja2-stracciatella · Apr 1, 2023 · 234bf23 · 234bf23
1 parent 46b3661
commit 234bf23
Showing 1 changed file with 29 additions and 28 deletions.
diff --git a/src/game/Tactical/Rotting_Corpses.cc b/src/game/Tactical/Rotting_Corpses.cc
@@ -582,34 +582,35 @@ static void RemoveCorpse(ROTTING_CORPSE* const c)
 
 static void CreateCorpsePalette(ROTTING_CORPSE* const c)
 {
-	char const* const substitution =
-		c->def.ubType == ROTTING_STAGE2                  ? ""                   :
-		c->def.usFlags & ROTTING_CORPSE_USE_CAMO_PALETTE ? ANIMSDIR "/camo.COL" :
-		GetBodyTypePaletteSubstitution(0, c->def.ubBodyType);
-
-	const SGPPaletteEntry* pal;
-	SGPPaletteEntry        tmp_pal[256];
-	if (!substitution)
-	{
-		// Use palette from HVOBJECT, then use substitution for pants, etc
-		memcpy(tmp_pal, gpTileCache[c->pAniTile->sCachedTileID].pImagery->vo->Palette(), sizeof(tmp_pal));
-		SetPaletteReplacement(tmp_pal, c->def.HeadPal);
-		SetPaletteReplacement(tmp_pal, c->def.VestPal);
-		SetPaletteReplacement(tmp_pal, c->def.PantsPal);
-		SetPaletteReplacement(tmp_pal, c->def.SkinPal);
-		pal = tmp_pal;
-	}
-	else if (substitution[0] != '\0' && CreateSGPPaletteFromCOLFile(tmp_pal, substitution))
-	{
-		pal = tmp_pal;
-	}
-	else
-	{
-		// Use palette from hvobject
-		pal = gpTileCache[c->pAniTile->sCachedTileID].pImagery->vo->Palette();
-	}
-
-	CreateBiasedShadedPalettes(c->pShades, pal);
+	// FIXME: maxrd2 no more palette - superdead - enter tactical D15
+//	char const* const substitution =
+//		c->def.ubType == ROTTING_STAGE2                  ? ""                   :
+//		c->def.usFlags & ROTTING_CORPSE_USE_CAMO_PALETTE ? ANIMSDIR "/camo.COL" :
+//		GetBodyTypePaletteSubstitution(0, c->def.ubBodyType);
+
+//	const SGPPaletteEntry* pal;
+//	SGPPaletteEntry        tmp_pal[256];
+//	if (!substitution)
+//	{
+//		// Use palette from HVOBJECT, then use substitution for pants, etc
+//		memcpy(tmp_pal, gpTileCache[c->pAniTile->sCachedTileID].pImagery->vo->Palette(), sizeof(tmp_pal));
+//		SetPaletteReplacement(tmp_pal, c->def.HeadPal);
+//		SetPaletteReplacement(tmp_pal, c->def.VestPal);
+//		SetPaletteReplacement(tmp_pal, c->def.PantsPal);
+//		SetPaletteReplacement(tmp_pal, c->def.SkinPal);
+//		pal = tmp_pal;
+//	}
+//	else if (substitution[0] != '\0' && CreateSGPPaletteFromCOLFile(tmp_pal, substitution))
+//	{
+//		pal = tmp_pal;
+//	}
+//	else
+//	{
+//		// Use palette from hvobject
+//		pal = gpTileCache[c->pAniTile->sCachedTileID].pImagery->vo->Palette();
+//	}
+
+//	CreateBiasedShadedPalettes(c->pShades, pal);
 }