From 0a310b9832e17f3039c3bb8b8a59810e349809a9 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Tue, 26 May 2009 22:33:02 +0000
Subject: [PATCH] - Fixed compilation on MinGW.

SVN r1612 (trunk)
---
 docs/rh-log.txt       | 9 ++++++++-
 src/p_interaction.cpp | 2 +-
 src/win32/i_input.cpp | 6 ------
 src/win32/i_mouse.cpp | 5 +++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 78c0ea3d13..dee4983b28 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,11 @@
-May 25, 2009
+May 26, 2009
+- Fixed: The Heretic "take weapons" cheat did not remove all the weapons at
+  once. This is because destroying one weapon has a potential to destroy a
+  sister weapon as well. If the sister weapon is the next one in line (as it
+  typically is), it would process that one, not realizing it was no longer
+  part of the inventory, and stop because its Inventory link was NULL.
+
+May 25, 2009
 - Recoverable errors that are caught during the demo loop no longer shut off
   the menu.
 - Specifying non-existent directories with -savedir or the save_dir cvar now
diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index 16787cac65..539f055388 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -875,7 +875,7 @@ void P_AutoUseStrifeHealth (player_t *player)
 void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage, FName mod, int flags)
 {
 	unsigned ang;
-	player_t *player;
+	player_t *player = NULL;
 	fixed_t thrust;
 	int temp;
 
diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp
index 1cf31ff899..8a65966800 100644
--- a/src/win32/i_input.cpp
+++ b/src/win32/i_input.cpp
@@ -60,9 +60,6 @@
 #endif
 
 // Compensate for w32api's lack
-#ifndef GET_XBUTTON_WPARAM
-#define GET_XBUTTON_WPARAM(wParam) (HIWORD(wParam))
-#endif
 #ifndef WM_WTSSESSION_CHANGE
 #define WM_WTSSESSION_CHANGE 0x02B1
 #define WTS_CONSOLE_CONNECT 1
@@ -70,9 +67,6 @@
 #define WTS_SESSION_LOCK 7
 #define WTS_SESSION_UNLOCK 8
 #endif
-#ifndef SetClassLongPtr
-#define SetClassLongPtr SetClassLong
-#endif
 #ifndef PBT_APMSUSPEND
 // w32api does not #define the PBT_ macros in winuser.h like the PSDK does
 #include <pbt.h>
diff --git a/src/win32/i_mouse.cpp b/src/win32/i_mouse.cpp
index 1b233042be..10bc5711f7 100644
--- a/src/win32/i_mouse.cpp
+++ b/src/win32/i_mouse.cpp
@@ -27,6 +27,11 @@
 
 #define DINPUT_BUFFERSIZE	32
 
+// Compensate for w32api's lack
+#ifndef GET_XBUTTON_WPARAM
+#define GET_XBUTTON_WPARAM(wParam) (HIWORD(wParam))
+#endif
+
 // TYPES -------------------------------------------------------------------
 
 class FRawMouse : public FMouse