- Gave the PlayerPawn base class a default damage fade color instead of

hacking it into the actor when actually used.
- Fixed: The DamageFade color was not saved in savegames.


SVN r1190 (trunk)

docs/rh-log.txt

@@ -1,3 +1,8 @@
+September 1, 2008  (Changes by Graf Zahl)
+- Gave the PlayerPawn base class a default damage fade color instead of
+  hacking it into the actor when actually used.
+- Fixed: The DamageFade color was not saved in savegames.
+
 August 30, 2008  (Changes by Graf Zahl)
 - Added Blzut3's patch for a real Chex Quest game mode.
 

src/d_player.h

@@ -120,7 +120,6 @@ public:
 	fixed_t		AttackZOffset;			// attack height, relative to player center
 
 	// [CW] Fades for when you are being damaged.
-	bool		HasDamageFade;
 	float		RedDamageFade;
 	float		GreenDamageFade;
 	float		BlueDamageFade;

src/g_shared/shared_sbar.cpp

@@ -1474,16 +1474,6 @@ void DBaseStatusBar::BlendView (float blend[4])
 			cnt = 228;
 
 		APlayerPawn *mo = players[consoleplayer].mo;
-
-		// [CW] If no damage fade is specified, assume defaults.
-		if (!mo->HasDamageFade)
-		{
-			mo->HasDamageFade = true;
-			mo->RedDamageFade = 255;
-			mo->GreenDamageFade = 0;
-			mo->BlueDamageFade = 0;
-		}
-
 		AddBlend (mo->RedDamageFade / 255, mo->GreenDamageFade / 255, mo->BlueDamageFade / 255, cnt / 255.f, blend);
 	}
 

src/m_menu.cpp

@@ -1999,7 +1999,7 @@ void M_QuitGame (int choice)
 	//  or one at random, between 1 and maximum number.
 	if (gameinfo.gametype & (GAME_DoomStrifeChex))
 	{
-		int quitmsg = 0;gametic % (gameinfo.gametype == GAME_Doom ? (gameinfo.gametype != GAME_Chex ? NUM_QUITDOOMMESSAGES : NUM_QUITCHEXMESSAGES - 1) : NUM_QUITSTRIFEMESSAGES - 1);
+		int quitmsg = 0;
 		if (gameinfo.gametype == GAME_Doom)
 			quitmsg = gametic % NUM_QUITDOOMMESSAGES;
 		else if (gameinfo.gametype == GAME_Strife)

src/p_user.cpp

@@ -422,7 +422,10 @@ void APlayerPawn::Serialize (FArchive &arc)
 		<< ScoreIcon
 		<< InvFirst
 		<< InvSel
-		<< MorphWeapon;
+		<< MorphWeapon
+		<< RedDamageFade
+		<< GreenDamageFade
+		<< BlueDamageFade;
 }
 
 //===========================================================================

src/thingdef/thingdef_properties.cpp

@@ -2490,8 +2490,6 @@ static void PlayerCrouchSprite (FScanner &sc, APlayerPawn *defaults, Baggage &ba
 //==========================================================================
 static void PlayerDmgScreenColor (FScanner &sc, APlayerPawn *defaults, Baggage &bag)
 {
-	defaults->HasDamageFade = true;
-
 	if (sc.CheckNumber ())
 	{
 		sc.MustGetNumber ();

src/version.h

@@ -75,7 +75,7 @@
 // SAVESIG should match SAVEVER.
 
 // MINSAVEVER is the minimum level snapshot version that can be loaded.
-#define MINSAVEVER 1181
+#define MINSAVEVER 1190
 
 #if SVN_REVISION_NUMBER < MINSAVEVER
 // Never write a savegame with a version lower than what we need

wadsrc/static/actors/shared/player.txt

@@ -26,6 +26,7 @@ Actor PlayerPawn : Actor native
 	Player.SideMove 1,1
 	Player.ColorRange 0,0
 	Player.SoundClass "player"
+	Player.DamageScreenColor "ff 00 00"
 }
 
 Actor PlayerChunk : PlayerPawn native