From 9cdd0b98cece5f36037a0447844731a721a62e8c Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Mon, 7 Jan 2008 08:58:18 +0000
Subject: [PATCH] - Added fix for Heretic IDKFA cheat by Karate Chris. - Added
 fix for Strife's AlienSpectre obituary by Karate Chris.

SVN r674 (trunk)
---
 docs/rh-log.txt                  | 4 ++++
 src/g_strife/a_alienspectres.cpp | 1 +
 src/m_cheat.cpp                  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index d09649bca7..14d5bb6961 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+January 7, 2008 (Changes by Graf Zahl)
+- Added fix for Heretic IDKFA cheat by Karate Chris.
+- Added fix for Strife's AlienSpectre obituary by Karate Chris.
+
 January 6, 2008 (Changes by Graf Zahl)
 - Re-converted icebreak.flac because the old version apparently didn't work.
 - Added SBARINFO update #5 by blzut3:
diff --git a/src/g_strife/a_alienspectres.cpp b/src/g_strife/a_alienspectres.cpp
index dc6249bfcc..d8bf2a5708 100644
--- a/src/g_strife/a_alienspectres.cpp
+++ b/src/g_strife/a_alienspectres.cpp
@@ -126,6 +126,7 @@ IMPLEMENT_ACTOR (AAlienSpectre1, Strife, 129, 0)
 	PROP_PainSound ("alienspectre/pain")
 	PROP_DeathSound ("alienspectre/death")
 	PROP_ActiveSound ("alienspectre/active")
+	PROP_Obituary ("$OB_ALIENSPECTE")
 END_DEFAULTS
 
 void AAlienSpectre1::Touch (AActor *toucher)
diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp
index 25c0130691..d800cce27e 100644
--- a/src/m_cheat.cpp
+++ b/src/m_cheat.cpp
@@ -299,7 +299,7 @@ void cht_DoCheat (player_t *player, int cheat)
 		break;
 
 	case CHT_TAKEWEAPS:
-		if (player->morphTics || player->mo != NULL)
+		if (player->morphTics || player->mo == NULL || player->mo->health <= 0)
 		{
 			return;
 		}