From dc641766d30668c2feaf8db5eb46beeba9953a24 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Fri, 6 Jul 2012 03:04:06 +0000
Subject: [PATCH] - Fixed: Editing the player (thing #1) with DeHacked would
 remove its MF2_PUSHWALL flag.

SVN r3740 (trunk)
---
 src/d_dehacked.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp
index 0cfe20f1cb..49e8211785 100644
--- a/src/d_dehacked.cpp
+++ b/src/d_dehacked.cpp
@@ -1232,15 +1232,18 @@ static int PatchThing (int thingy)
 
 		// If MF_COUNTKILL is set, make sure the other standard monster flags are
 		// set, too. And vice versa.
-		if (info->flags & MF_COUNTKILL)
+		if (thingy != 1) // don't mess with the player's flags
 		{
-			info->flags2 |= MF2_PUSHWALL | MF2_MCROSS | MF2_PASSMOBJ;
-			info->flags3 |= MF3_ISMONSTER;
-		}
-		else
-		{
-			info->flags2 &= ~(MF2_PUSHWALL | MF2_MCROSS);
-			info->flags3 &= ~MF3_ISMONSTER;
+			if (info->flags & MF_COUNTKILL)
+			{
+				info->flags2 |= MF2_PUSHWALL | MF2_MCROSS | MF2_PASSMOBJ;
+				info->flags3 |= MF3_ISMONSTER;
+			}
+			else
+			{
+				info->flags2 &= ~(MF2_PUSHWALL | MF2_MCROSS);
+				info->flags3 &= ~MF3_ISMONSTER;
+			}
 		}
 		// Everything that's altered here gets the CANUSEWALLS flag, just in case
 		// it calls P_Move().