- Separate the player weapon state flags from the other player "cheat" flags.

SVN r4041 (trunk)

src/p_user.cpp

@@ -247,6 +247,7 @@ player_t::player_t()
   ReadyWeapon(0),
   PendingWeapon(0),
   cheats(0),
+  WeaponState(0),
   timefreezer(0),
   refire(0),
   inconsistant(0),
@@ -2670,6 +2671,16 @@ void player_t::Serialize (FArchive &arc)
 			mo->stamina = oldstamina;
 		}
 	}
+	if (SaveVersion < 4041)
+	{
+		// Move weapon state flags from cheats and into WeaponState.
+		WeaponState = ((cheats >> 14) & 1) | ((cheats & (0x37 << 24)) >> (24 - 1));
+		cheats &= ~((1 << 14) | (0x37 << 24));
+	}
+	else
+	{
+		arc << WeaponState;
+	}
 	arc << LogText
 		<< ConversationNPC
 		<< ConversationPC