diff --git a/src/p_acs.cpp b/src/p_acs.cpp index df3ff8173c..fc1c5f0fc7 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 390bbbb47b..16c70ef186 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 5245611808..957b381bfc 100644 --- a/wadsrc/static/althudcf.txt +++ b/wadsrc/static/althudcf.txt @@ -1,4 +1,5 @@ Fist PUNGC0 PunchDagger PNCHD0 +FWeapFist FPCHC0 Beak "" Snout ""