From 5d5f25fdabb3c60776acd135d5d2e55a0efdd20b Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 10 Aug 2010 16:22:57 +0000
Subject: [PATCH] - fixed: Changing APROP_Friendly in ACS did not adjust the
 monster count. - fixed: AActor::CanSeek had the check for the visibility of
 the target actor's alpha reversed. - added an Alt HUD icon for Hexen's
 fighter's fist.

SVN r2501 (trunk)
---
 src/p_acs.cpp              | 6 ++++++
 src/p_mobj.cpp             | 4 ++--
 wadsrc/static/althudcf.txt | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index df3ff8173..fc1c5f0fc 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -2662,9 +2662,15 @@ void DLevelScript::DoSetActorProperty (AActor *actor, int property, int value)
 
 	case APROP_Friendly:
 		if (value)
+		{
+			if (actor->CountsAsKill()) level.total_monsters--;
 			actor->flags |= MF_FRIENDLY;
+		}
 		else
+		{
 			actor->flags &= ~MF_FRIENDLY;
+			if (actor->CountsAsKill()) level.total_monsters++;
+		}
 		break;
 
 
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 390bbbb47..16c70ef18 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -1491,8 +1491,8 @@ bool AActor::CanSeek(AActor *target) const
 	if (target->flags5 & MF5_CANTSEEK) return false;
 	if ((flags2 & MF2_DONTSEEKINVISIBLE) && 
 		((target->flags & MF_SHADOW) || 
-		 target->renderflags & RF_INVISIBLE || 
-		 target->RenderStyle.IsVisible(target->alpha)
+		 (target->renderflags & RF_INVISIBLE) || 
+		 !target->RenderStyle.IsVisible(target->alpha)
 		)
 	   ) return false;
 	return true;
diff --git a/wadsrc/static/althudcf.txt b/wadsrc/static/althudcf.txt
index 524561180..957b381bf 100644
--- a/wadsrc/static/althudcf.txt
+++ b/wadsrc/static/althudcf.txt
@@ -1,4 +1,5 @@
 Fist PUNGC0
 PunchDagger PNCHD0
+FWeapFist FPCHC0
 Beak ""
 Snout ""