From 088dfb665585cf5a7b264b19c65b21b3c4a3d7f6 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@noreply.github.com>
Date: Sat, 28 Nov 2009 07:49:53 +0000
Subject: [PATCH] Update to ZDoom r2005:

- fixed: Morph weapons weren't destroyed because the code checked for
  them in the unmorphed player class.
- fixed: With padding the largest texture to fit into a page is 254x254.


git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@638 b0f79afe-0144-0410-b225-9a4edf0717df
---
 docs/rh-log.txt          | 12 ++++++++++++
 src/g_shared/a_morph.cpp |  4 ++--
 src/p_xlat.cpp           |  2 +-
 src/svnrevision.h        |  4 ++--
 src/win32/fb_d3d9.cpp    |  3 ++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index a5f7b6e5..64a48042 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,15 @@
+November 28, 2009  (Changes by Graf Zahl)
+- fixed: Morph weapons weren't destroyed because the code checked for 
+  them in the unmorphed player class.
+- fixed: With padding the largest texture to fit into a page is 254x254.
+
+November 27, 2009  (Changes by Graf Zahl)
+- fixed an uninitialized variable in p_xlat.cpp (Thanks, MSVC for not
+  warning about such an obvious problem! :( )
+- fixed: The charge attack of Heretic's imp is not precisely the same
+  as A_SkullAttack with a different speed so A_ImpMsAttack has been
+  reinstated.
+
 November 25, 2009
 - Make the palette indexes used by FRemapTable subject to the global remap
   table, just as the images they translate are.
diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp
index 917ae5a9..4a730eb2 100644
--- a/src/g_shared/a_morph.cpp
+++ b/src/g_shared/a_morph.cpp
@@ -177,7 +177,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, int unmorphflag,
 {
 	AWeapon *beastweap;
 	APlayerPawn *mo;
-	AActor *pmo;
+	APlayerPawn *pmo;
 	angle_t angle;
 
 	pmo = player->mo;
@@ -330,7 +330,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, int unmorphflag,
 	}
 	if (correctweapon)
 	{ // Better "lose morphed weapon" semantics
-		const PClass *morphweapon = PClass::FindClass (mo->MorphWeapon);
+		const PClass *morphweapon = PClass::FindClass (pmo->MorphWeapon);
 		if (morphweapon != NULL && morphweapon->IsDescendantOf (RUNTIME_CLASS(AWeapon)))
 		{
 			AWeapon *OriginalMorphWeapon = static_cast<AWeapon *>(mo->FindInventory (morphweapon));
diff --git a/src/p_xlat.cpp b/src/p_xlat.cpp
index 7ec97f3e..9e87d13b 100644
--- a/src/p_xlat.cpp
+++ b/src/p_xlat.cpp
@@ -66,7 +66,7 @@ void P_TranslateLineDef (line_t *ld, maplinedef_t *mld)
 	unsigned short special = (unsigned short) LittleShort(mld->special);
 	short tag = LittleShort(mld->tag);
 	DWORD flags = LittleShort(mld->flags);
-	INTBOOL passthrough;
+	INTBOOL passthrough = 0;
 
 	DWORD flags1 = flags;
 	DWORD newflags = 0;
diff --git a/src/svnrevision.h b/src/svnrevision.h
index 764b880b..bd52e4d1 100644
--- a/src/svnrevision.h
+++ b/src/svnrevision.h
@@ -3,5 +3,5 @@
 // This file was automatically generated by the
 // updaterevision tool. Do not edit by hand.
 
-#define ZD_SVN_REVISION_STRING "2001"
-#define ZD_SVN_REVISION_NUMBER 2001
+#define ZD_SVN_REVISION_STRING "2005"
+#define ZD_SVN_REVISION_NUMBER 2005
diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp
index 8e82b5e4..ac6cda92 100644
--- a/src/win32/fb_d3d9.cpp
+++ b/src/win32/fb_d3d9.cpp
@@ -1828,7 +1828,8 @@ D3DFB::PackedTexture *D3DFB::AllocPackedTexture(int w, int h, bool wrapping, D3D
 	PackedTexture *bestbox;
 	int area;
 
-	if (w > 256 || h > 256 || wrapping)
+	// check for 254 to account for padding
+	if (w > 254 || h > 254 || wrapping)
 	{ // Create a new packing texture.
 		bestpack = new PackingTexture(this, w, h, format);
 		bestpack->OneUse = true;