stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bashfix' into 'master'

Browse source 
Fixed crash when BASH's target disappears during chasing

Closes #341

See merge request STJr/SRB2Internal!525
This commit is contained in:
LJ Sonic 2019-11-25 13:06:16 -05:00
commit 69c41c5013
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/p_enemy.c
View file

@ -2476,12 +2476,8 @@ void A_VultureBlast(mobj_t *actor)
void A_VultureFly(mobj_t *actor) void A_VultureFly(mobj_t *actor)
{ {
fixed_t speedmax = 18*FRACUNIT; fixed_t speedmax = 18*FRACUNIT;
angle_t angledif = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) - actor->angle; angle_t angledif;
fixed_t dx = actor->target->x - actor->x; fixed_t dx, dy, dz, dxy, dm;
fixed_t dy = actor->target->y - actor->y;
fixed_t dz = actor->target->z - actor->z;
fixed_t dxy = FixedHypot(dx, dy);
fixed_t dm;
mobj_t *dust; mobj_t *dust;
fixed_t momm; fixed_t momm;
@ -2490,6 +2486,18 @@ void A_VultureFly(mobj_t *actor)
return; return;
#endif #endif
if (!actor->target || P_MobjWasRemoved(actor->target))
{
P_SetMobjState(actor, actor->info->spawnstate);
return;
}
angledif = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y) - actor->angle;
dx = actor->target->x - actor->x;
dy = actor->target->y - actor->y;
dz = actor->target->z - actor->z;
dxy = FixedHypot(dx, dy);
if (leveltime % 4 == 0) if (leveltime % 4 == 0)
S_StartSound(actor, actor->info->activesound); S_StartSound(actor, actor->info->activesound);