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

- Fixed a couple issues with calling P_NewChaseDir from wrongful P_Move priority.

Browse source
This commit is contained in:
MajorCooke 2016-01-27 13:11:22 -06:00
parent f6b3b269a7
commit 9a422245f3
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_enemy.cpp
View file

@ -2507,16 +2507,11 @@ void A_DoChase (AActor *actor, bool fastchase, FState *meleestate, FState *missi
fixed_t oldY = actor->Y(); fixed_t oldY = actor->Y();
FTextureID oldFloor = actor->floorpic; FTextureID oldFloor = actor->floorpic;
bool movecheck = P_Move(actor);
// chase towards player // chase towards player
if (actor->movecount >= 0 || !movecheck) if ((--actor->movecount < 0 && !(flags & CHF_NORANDOMTURN)) || (!P_Move(actor) && !(flags & CHF_STOPIFBLOCKED)))
actor->movecount--;
if (!(flags & CHF_STOPIFBLOCKED))
{ {
if ((!(flags & CHF_NORANDOMTURN) && (actor->movecount < 0)) || !movecheck)
P_NewChaseDir(actor); P_NewChaseDir(actor);
} }
// if the move was illegal, reset it // if the move was illegal, reset it
// (copied from A_SerpentChase - it applies to everything with CANTLEAVEFLOORPIC!) // (copied from A_SerpentChase - it applies to everything with CANTLEAVEFLOORPIC!)
if (actor->flags2&MF2_CANTLEAVEFLOORPIC && actor->floorpic != oldFloor ) if (actor->flags2&MF2_CANTLEAVEFLOORPIC && actor->floorpic != oldFloor )