- fixed: Savegames stored the global fixed light levels when saving a player.

SVN r1893 (trunk)

docs/rh-log.txt

@@ -1,3 +1,6 @@
+October 2, 2009  (Changes by Graf Zahl)
+- fixed: Savegames stored the global fixed light levels when saving a player.
+
 October 1, 2009  (Changes by Graf Zahl)
 - Fixed some GCC warnings.
 - fixed: The BossCube could be blocked by floors and ceiling resulting

src/p_user.cpp

@@ -2514,19 +2514,25 @@ void player_t::Serialize (FArchive &arc)
 		int fixedmap;
 		arc << fixedmap;
 		fixedcolormap = NOFIXEDCOLORMAP;
-		fixedlightlev = -1;
+		fixedlightlevel = -1;
 		if (fixedmap >= NUMCOLORMAPS)
 		{
 			fixedcolormap = fixedmap - NUMCOLORMAPS;
 		}
 		else if (fixedmap > 0)
 		{
-			fixedlightlev = fixedmap;
+			fixedlightlevel = fixedmap;
 		}
 	}
+	else if (SaveVersion < 1893)
+	{
+		int ll;
+		arc	<< fixedcolormap << ll;
+		fixedlightlevel = ll;
+	}
 	else
 	{
-		arc	<< fixedcolormap << fixedlightlev;
+		arc	<< fixedcolormap << fixedlightlevel;
 	}
 	arc << morphTics
 		<< MorphedPlayerClass

src/r_things.cpp

@@ -1857,7 +1857,7 @@ void R_DrawRemainingPlayerSprites()
 				DTA_RenderStyle, vis->RenderStyle,
 				DTA_FillColor, vis->FillColor,
 				DTA_SpecialColormap, special,
-				DTA_ColorOverlay, overlay,
+				DTA_ColorOverlay, overlay.d,
 				DTA_ColormapStyle, usecolormapstyle ? &colormapstyle : NULL,
 				TAG_DONE);
 		}