- Fixed: P_UndoPlayerMorph didn't properly transfer the inventory. It just

copied the pointer instead of using ObtainInventory.


SVN r230 (trunk)

docs/rh-log.txt

@@ -1,3 +1,7 @@
+June 27, 2006 (Changes by Graf Zahl)
+- Fixed: P_UndoPlayerMorph didn't properly transfer the inventory. It just 
+  copied the pointer instead of using ObtainInventory.
+
 June 24, 2006
 - Moved the version resource into the "compile-time directives" section of
   the resource script so that Developer Studio won't replace the version macros
@@ -8,6 +12,8 @@ June 24, 2006 (Changes by Graf Zahl)
 - Fixed: PIT_CheckThing checked AActor::tid instead of TidToHate to determine
   whether a monster of the same species can be hurt.
 - Added new ice chunk sprites submitted by Enjay.
+- Replaced all occurences of 'ZDoom' in i_crash.cpp with a define from version.h 
+  so that this file doesn't need to be changed for altering the texts.
 - Deleted the programmer death script from strifehelp.acs because it is no 
   longer used.
 - Fixed: strfhelp.acs and the PUMPUPS cheat need to give 10 UpgradeStaminas

src/g_raven/a_artiegg.cpp

@@ -128,6 +128,7 @@ bool P_UndoPlayerMorph (player_t *player, bool force)
 	}
 	pmo->player = NULL;
 
+	mo->ObtainInventory (pmo);
 	DObject::PointerSubstitution (pmo, mo);
 	mo->angle = pmo->angle;
 	mo->player = player;
@@ -161,8 +162,6 @@ bool P_UndoPlayerMorph (player_t *player, bool force)
 	angle = mo->angle >> ANGLETOFINESHIFT;
 	Spawn<ATeleportFog> (pmo->x + 20*finecosine[angle],
 		pmo->y + 20*finesine[angle], pmo->z + TELEFOGHEIGHT);
-	mo->Inventory = pmo->Inventory;
-	pmo->Inventory = NULL;
 	beastweap = player->ReadyWeapon;
 	if (player->PremorphWeapon != NULL)
 	{

src/win32/i_crash.cpp

@@ -1200,7 +1200,7 @@ static HANDLE MakeZip ()
 		central.LocalHeaderOffset = LittleLong(TarFiles[i].ZipOffset);
 		WriteFile (file, &central, sizeof(central), &len, NULL);
 		WriteFile (file, TarFiles[i].Filename, (DWORD)namelen, &len, NULL);
-		dirsize += sizeof(central) + namelen;
+		dirsize += DWORD(sizeof(central) + namelen);
 	}
 
 	// Write the directory terminator