- Update to ZDoom r1859 including adjustments for all the changes that were only made for the software renderer.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@467 b0f79afe-0144-0410-b225-9a4edf0717df

src/p_user.cpp

@@ -2508,9 +2508,27 @@ void player_t::Serialize (FArchive &arc)
 		<< poisoncount
 		<< poisoner
 		<< attacker
-		<< extralight
-		<< fixedcolormap
-		<< morphTics
+		<< extralight;
+	if (SaveVersion < 1858)
+	{
+		int fixedmap;
+		arc << fixedmap;
+		fixedcolormap = NOFIXEDCOLORMAP;
+		fixedlightlev = -1;
+		if (fixedmap >= NUMCOLORMAPS)
+		{
+			fixedcolormap = fixedmap - NUMCOLORMAPS;
+		}
+		else if (fixedmap > 0)
+		{
+			fixedlightlev = fixedmap;
+		}
+	}
+	else
+	{
+		arc	<< fixedcolormap << fixedlightlev;
+	}
+	arc << morphTics
 		<< MorphedPlayerClass
 		<< MorphStyle
 		<< MorphExitFlash
@@ -2532,7 +2550,7 @@ void player_t::Serialize (FArchive &arc)
 		<< ConversationPC
 		<< ConversationNPCAngle
 		<< ConversationFaceTalker;
-		
+
 	for (i = 0; i < MAXPLAYERS; i++)
 		arc << frags[i];
 	for (i = 0; i < NUMPSPRITES; i++)