- Fixed: Morphed players did not regain their innate armor when unmorphing.

(Only Hexen has players with innate armor, under normal conditions.)


SVN r504 (trunk)

src/p_mobj.cpp

@@ -883,6 +883,8 @@ void AActor::CopyFriendliness (const AActor *other, bool changeTarget)
 
 void AActor::ObtainInventory (AActor *other)
 {
+	assert (Inventory == NULL);
+
 	Inventory = other->Inventory;
 	InventoryID = other->InventoryID;
 	other->Inventory = NULL;