mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Fix duplicated matchgenericflags (was causing crash)
# Conflicts: # src/p_mobj.c
This commit is contained in:
parent
aa505823f5
commit
904f1703c5
1 changed files with 1 additions and 2 deletions
|
|
@ -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;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue