Fix duplicated matchgenericflags (was causing crash)

# Conflicts:
#	src/p_mobj.c
This commit is contained in:
JugadorXEI 2021-08-07 16:41:22 +02:00 committed by toaster
parent aa505823f5
commit 904f1703c5

View file

@ -7284,10 +7284,9 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
break; break;
case MT_INSTASHIELDB: case MT_INSTASHIELDB:
mobj->renderflags ^= RF_DONTDRAW; mobj->renderflags ^= RF_DONTDRAW;
K_MatchGenericExtraFlags(mobj, mobj->target);
/* FALLTHRU */ /* FALLTHRU */
case MT_INSTASHIELDA: case MT_INSTASHIELDA:
if (!mobj->target || !mobj->target->health || (mobj->target->player && !mobj->target->player->instashield)) if (!mobj->target || P_MobjWasRemoved(mobj->target) || !mobj->target->health || (mobj->target->player && !mobj->target->player->instashield))
{ {
P_RemoveMobj(mobj); P_RemoveMobj(mobj);
return false; return false;