zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-24 21:11:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "- use correct isHostile checks for target considerations"

Browse source 
This reverts commit f9a88f10ed.
This commit is contained in:
Rachael Alexanderson 2024-01-21 11:54:40 -05:00
parent af08413e10
commit 5925a6a8c5
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/playsim/p_enemy.cpp
View file

@ -1823,7 +1823,7 @@ int P_LookForPlayers (AActor *actor, INTBOOL allaround, FLookExParams *params)
if (!(player->mo->flags & MF_SHOOTABLE)) if (!(player->mo->flags & MF_SHOOTABLE))
continue; // not shootable (observer or dead) continue; // not shootable (observer or dead)
if (!actor->IsHostile(player->mo)) if (actor->IsFriend(player->mo))
continue; // same +MF_FRIENDLY, ignore continue; // same +MF_FRIENDLY, ignore
if (player->cheats & CF_NOTARGET) if (player->cheats & CF_NOTARGET)
@ -1917,7 +1917,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_Look)
targ = NULL; targ = NULL;
} }
if (targ && targ->player && ((targ->player->cheats & CF_NOTARGET) || !self->IsHostile(targ))) if (targ && targ->player && ((targ->player->cheats & CF_NOTARGET) || !(targ->flags & MF_FRIENDLY)))
{ {
return 0; return 0;
} }
@ -1931,7 +1931,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_Look)
if (targ && (targ->flags & MF_SHOOTABLE)) if (targ && (targ->flags & MF_SHOOTABLE))
{ {
if (!self->IsHostile (targ)) // be a little more precise! if (self->IsFriend (targ)) // be a little more precise!
{ {
// If we find a valid target here, the wandering logic should *not* // If we find a valid target here, the wandering logic should *not*
// be activated! It would cause the seestate to be set twice. // be activated! It would cause the seestate to be set twice.