From fae4dc3f21295f4609df3d6021b6d80e4c12acb8 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Wed, 12 Jun 2019 21:28:09 +0200 Subject: [PATCH] Forgot to hardcode the mobj.valid checks --- src/p_enemy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 149a6a3aa..d943f9e78 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -2353,7 +2353,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; @@ -12897,7 +12897,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;