zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-07 17:11:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- allow notification of actor goal is reached inside of a SECF_NOATTACK sector

Browse source
This commit is contained in:
Rachael Alexanderson 2022-09-03 17:37:48 -04:00 committed by GitHub
parent ba83879e99
commit 06ee21c51d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -269,9 +269,6 @@ int P_CheckMeleeRange (AActor* actor, double range)
double dist; double dist;
if (!pl || (actor->Sector->Flags & SECF_NOATTACK))
return false;
dist = actor->Distance2D (pl); dist = actor->Distance2D (pl);
if (range < 0) range = actor->meleerange; if (range < 0) range = actor->meleerange;
@ -282,6 +279,9 @@ int P_CheckMeleeRange (AActor* actor, double range)
if (pl == actor->goal) if (pl == actor->goal)
return true; return true;
if (!pl || (actor->Sector->Flags & SECF_NOATTACK))
return false;
// [RH] Don't melee things too far above or below actor. // [RH] Don't melee things too far above or below actor.
if (!(actor->flags5 & MF5_NOVERTICALMELEERANGE)) if (!(actor->flags5 & MF5_NOVERTICALMELEERANGE))
{ {