- 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)
This commit is contained in:
Christoph Oelckers 2010-08-10 16:22:57 +00:00
parent 79ff9ae3ae
commit 5d5f25fdab
3 changed files with 9 additions and 2 deletions

View file

@ -2662,9 +2662,15 @@ void DLevelScript::DoSetActorProperty (AActor *actor, int property, int value)
case APROP_Friendly: case APROP_Friendly:
if (value) if (value)
{
if (actor->CountsAsKill()) level.total_monsters--;
actor->flags |= MF_FRIENDLY; actor->flags |= MF_FRIENDLY;
}
else else
{
actor->flags &= ~MF_FRIENDLY; actor->flags &= ~MF_FRIENDLY;
if (actor->CountsAsKill()) level.total_monsters++;
}
break; break;

View file

@ -1491,8 +1491,8 @@ bool AActor::CanSeek(AActor *target) const
if (target->flags5 & MF5_CANTSEEK) return false; if (target->flags5 & MF5_CANTSEEK) return false;
if ((flags2 & MF2_DONTSEEKINVISIBLE) && if ((flags2 & MF2_DONTSEEKINVISIBLE) &&
((target->flags & MF_SHADOW) || ((target->flags & MF_SHADOW) ||
target->renderflags & RF_INVISIBLE || (target->renderflags & RF_INVISIBLE) ||
target->RenderStyle.IsVisible(target->alpha) !target->RenderStyle.IsVisible(target->alpha)
) )
) return false; ) return false;
return true; return true;

View file

@ -1,4 +1,5 @@
Fist PUNGC0 Fist PUNGC0
PunchDagger PNCHD0 PunchDagger PNCHD0
FWeapFist FPCHC0
Beak "" Beak ""
Snout "" Snout ""