Merge branch 'master' of c:\programming\doom-dev\zdoom into Branch_97ff4cc02574e3773ff231b1d74c0fdb25e9440d

src/farchive.cpp

@@ -1194,6 +1194,7 @@ FArchive &FArchive::ReadObject (DObject* &obj, PClass *wanttype)
 	const PClass *type;
 	BYTE playerNum;
 	DWORD index;
+	DObject *newobj;
 
 	operator<< (objHead);
 
@@ -1255,11 +1256,11 @@ FArchive &FArchive::ReadObject (DObject* &obj, PClass *wanttype)
 	case NEW_CLS_OBJ:
 		type = ReadClass (wanttype);
 //		Printf ("New class: %s (%u)\n", type->Name, m_File->Tell());
-		obj = type->CreateNew ();
+		newobj = obj = type->CreateNew ();
 		MapObject (obj);
-		obj->SerializeUserVars (*this);
-		obj->Serialize (*this);
-		obj->CheckIfSerialized ();
+		newobj->SerializeUserVars (*this);
+		newobj->Serialize (*this);
+		newobj->CheckIfSerialized ();
 		break;
 
 	case NEW_PLYR_OBJ:

src/g_level.cpp

@@ -1280,7 +1280,7 @@ void G_FinishTravel ()
 
 		for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)
 		{
-			inv->ChangeStatNum (STAT_DEFAULT);
+			inv->ChangeStatNum (STAT_INVENTORY);
 			inv->LinkToWorld ();
 			inv->Travelled ();
 		}

src/g_shared/a_pickups.cpp

@@ -821,6 +821,7 @@ void AInventory::BecomeItem ()
 	}
 	RemoveFromHash ();
 	flags &= ~MF_SPECIAL;
+	ChangeStatNum(STAT_INVENTORY);
 	SetState (FindState("Held"));
 }
 
@@ -847,6 +848,7 @@ void AInventory::BecomePickup ()
 	}
 	flags = (GetDefault()->flags | MF_DROPPED) & ~MF_COUNTITEM;
 	renderflags &= ~RF_INVISIBLE;
+	ChangeStatNum(STAT_DEFAULT);
 	SetState (SpawnState);
 }
 

src/statnums.h

@@ -53,7 +53,7 @@ enum
 	STAT_BOSSTARGET,						// A boss brain target
 	STAT_LIGHTNING,							// The lightning thinker
 	STAT_DECALTHINKER,						// An object that thinks for a decal
-	UNUSED_STAT_INVENTORY,							// An inventory item (value kept for savegame compatibility.)
+	STAT_INVENTORY,							// An inventory item
 	STAT_LIGHT,								// A sector light effect
 	STAT_LIGHTTRANSFER,						// A sector light transfer. These must be ticked after the light effects!!!
 	STAT_EARTHQUAKE,						// Earthquake actors