Delay skin setting on save load until player class is known.

- Fixed: Loading players from savegames set the skin before their current
  class was retrieved, so they could not validate their skins with the
  correct class.

src/d_netinfo.cpp

@@ -941,14 +941,21 @@ void WriteUserInfo(FArchive &arc, userinfo_t &info)
 	arc << name;
 }
 
-void ReadUserInfo(FArchive &arc, userinfo_t &info)
+void ReadUserInfo(FArchive &arc, userinfo_t &info, FString &skin)
 {
 	FName name;
 	FBaseCVar **cvar;
 	char *str = NULL;
 	UCVarValue val;
 
+	if (SaveVersion < 4253)
+	{
+		ReadCompatibleUserInfo(arc, info);
+		return;
+	}
+
 	info.Reset();
+	skin = NULL;
 	for (arc << name; name != NAME_None; arc << name)
 	{
 		cvar = info.CheckKey(name);
@@ -958,7 +965,7 @@ void ReadUserInfo(FArchive &arc, userinfo_t &info)
 			switch (name)
 			{
 			case NAME_Team:			info.TeamChanged(atoi(str)); break;
-			case NAME_Skin:			info.SkinChanged(str, 0); break;
+			case NAME_Skin:			skin = str; break;	// Caller must call SkinChanged() once current calss is known
 			case NAME_PlayerClass:	info.PlayerClassChanged(str); break;
 			default:
 				val.String = str;
@@ -973,23 +980,6 @@ void ReadUserInfo(FArchive &arc, userinfo_t &info)
 	}
 }
 
-FArchive &operator<< (FArchive &arc, userinfo_t &info)
-{
-	if (SaveVersion < 4253)
-	{
-		ReadCompatibleUserInfo(arc, info);
-	}
-	else if (arc.IsStoring())
-	{
-		WriteUserInfo(arc, info);
-	}
-	else
-	{
-		ReadUserInfo(arc, info);
-	}
-	return arc;
-}
-
 CCMD (playerinfo)
 {
 	if (argv.argc() < 2)

src/d_player.h

@@ -342,8 +342,8 @@ struct userinfo_t : TMap<FName,FBaseCVar *>
 	int ColorSetChanged(int setnum);
 };
 
-FArchive &operator<< (FArchive &arc, userinfo_t &info);
+void ReadUserInfo(FArchive &arc, userinfo_t &info, FString &skin);
-
+void WriteUserInfo(FArchive &arc, userinfo_t &info);
 
 //
 // Extended player object info: player_t

src/p_user.cpp

@@ -2742,14 +2742,22 @@ void P_UnPredictPlayer ()
 void player_t::Serialize (FArchive &arc)
 {
 	int i;
+	FString skinname;
 
 	arc << cls
 		<< mo
 		<< camera
 		<< playerstate
-		<< cmd
+		<< cmd;
-		<< userinfo
+	if (arc.IsLoading())
-		<< DesiredFOV << FOV
+	{
+		ReadUserInfo(arc, userinfo, skinname);
+	}
+	else
+	{
+		WriteUserInfo(arc, userinfo);
+	}
+	arc << DesiredFOV << FOV
 		<< viewz
 		<< viewheight
 		<< deltaviewheight
@@ -2900,6 +2908,10 @@ void player_t::Serialize (FArchive &arc)
 		oldbuttons = ~0;
 		original_oldbuttons = ~0;
 	}
+	if (skinname.IsNotEmpty())
+	{
+		userinfo.SkinChanged(skinname, CurrentPlayerClass);
+	}
 }