stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 17:22:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'acz-hardcode' into new-acz-minecarts

Browse source
This commit is contained in:
MascaraSnake 2019-06-12 21:28:39 +02:00
commit 1ff64baf8b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_enemy.c
View file

@ -2354,7 +2354,7 @@ void A_VultureHover(mobj_t *actor)
return;
#endif
if (!actor->target)
if (!actor->target || P_MobjWasRemoved(actor->target))
{
P_SetMobjState(actor, actor->info->spawnstate);
return;
@ -12898,7 +12898,7 @@ void A_DustDevilThink(mobj_t *actor)
#endif
//Chained thinker for the spiralling dust column.
while (layer) {
while (layer && !P_MobjWasRemoved(layer)) {
angle_t fa = layer->angle >> ANGLETOFINESHIFT;
P_TeleportMove(layer, layer->x + 5 * FixedMul(scale, FINECOSINE(fa)), layer->y + 5 * FixedMul(scale, FINESINE(fa)), layer->z);
layer->scale = scale;