From e7e79e27fff3dde785a919e2edcc6658c73798c8 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 12 Jul 2009 07:33:24 +0000
Subject: [PATCH] - Fixed: The 'idclev' cheat set the player's health to 0
 which caused the   level to end when in a sector of type 'end level when
 health below 10'. - Fixed: The 'kill' cheat set the player to nonshootable
 even if it did not   succeed.

SVN r1714 (trunk)
---
 docs/rh-log.txt | 10 +++++++++-
 src/c_cmds.cpp  |  2 +-
 src/m_cheat.cpp |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 00a92bfdd4..f1f40f4a71 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,12 @@
-July 10, 2009
+July 12, 2009  (Changes by Graf Zahl)
+- Fixed: The 'idclev' cheat set the player's health to 0 which caused the
+  level to end when in a sector of type 'end level when health below 10'.
+
+July 11, 2009  (Changes by Graf Zahl)
+- Fixed: The 'kill' cheat set the player to nonshootable even if it did not
+  succeed.
+
+July 10, 2009
 - Added joystick config loading and saving support; moved generic joystick
   interfaces to m_joy.h.
 
diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp
index e95624ef57..a80a27a8da 100644
--- a/src/c_cmds.cpp
+++ b/src/c_cmds.cpp
@@ -276,7 +276,7 @@ CCMD (idclev)
 		// So be it.
 		Printf ("%s\n", GStrings("STSTR_CLEV"));
       	G_DeferedInitNew (mapname);
-		players[0].health = 0;		// Force reset
+		//players[0].health = 0;		// Force reset
 	}
 }
 
diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp
index 04f73b70f3..644941eb53 100644
--- a/src/m_cheat.cpp
+++ b/src/m_cheat.cpp
@@ -1043,7 +1043,7 @@ void cht_Suicide (player_t *plyr)
 		plyr->mo->flags |= MF_SHOOTABLE;
 		plyr->mo->flags2 &= ~MF2_INVULNERABLE;
 		P_DamageMobj (plyr->mo, plyr->mo, plyr->mo, 1000000, NAME_Suicide);
-		plyr->mo->flags &= ~MF_SHOOTABLE;
+		if (plyr->mo->health <= 0) plyr->mo->flags &= ~MF_SHOOTABLE;
 	}
 }