zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-31 04:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Thing_SetGoal could put an actor's target and goal out of sync.

Browse source 
If an actor is already targeting a goal, and Thing_SetGoal is used on
  it, it would still be left targeting the old goal instead of the new
  one. This messed up checks in A_Chase for walking towards a goal vs a
  real target.
This commit is contained in:
Randy Heit 2013-09-18 22:03:59 -05:00
parent ad7aefff20
commit 5850279090
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/p_lnspec.cpp
View file

@ -1562,9 +1562,21 @@ FUNC(LS_Thing_SetGoal)
ok = true; ok = true;
if (self->flags & MF_SHOOTABLE) if (self->flags & MF_SHOOTABLE)
{ {
if (self->target == self->goal)
{ // Targeting a goal already? -> don't target it anymore.
// A_Look will set it to the goal, presuming no real targets
// come into view by then.
self->target = NULL;
}
self->goal = goal; self->goal = goal;
if (arg3 == 0) self->flags5 &=~ MF5_CHASEGOAL; if (arg3 == 0)
else self->flags5 |= MF5_CHASEGOAL; {
self->flags5 &= ~MF5_CHASEGOAL;
}
else
{
self->flags5 |= MF5_CHASEGOAL;
}
if (self->target == NULL) if (self->target == NULL)
{ {
self->reactiontime = arg2 * TICRATE; self->reactiontime = arg2 * TICRATE;