add proper null check here too
This commit is contained in:
1 parent
6162d285c9
commit
078f198d81
2 files changed
+5
-4
No files matched your search
+3
-3
@@ -3338,9 +3338,9 @@ void K_RollMobjBySlopes(mobj_t* mo, boolean usedistance)
|
||||
I_Assert(mo->subsector->sector != NULL);
|
||||
|
||||
angle_t an;
|
||||
boolean flip = mo->eflags & MFE_VERTICALFLIP;
|
||||
fixed_t m_dist = usedistance ? R_PointToDist(mo->x, mo->y) : 0;
|
||||
fixed_t rolldist = cv_sloperolldist.value * mapobjectscale;
|
||||
const boolean flip = mo->eflags & MFE_VERTICALFLIP;
|
||||
const fixed_t m_dist = usedistance ? R_PointToDist(mo->x, mo->y) : 0;
|
||||
const fixed_t rolldist = cv_sloperolldist.value * mapobjectscale;
|
||||
|
||||
// lifted from hw_md2
|
||||
if (mo->standingslope)
|
||||
|
||||
+2
-1
@@ -6003,7 +6003,7 @@ static void P_KoopaThinker(mobj_t *koopa)
|
||||
//
|
||||
void P_RollPitchMobj(mobj_t* mobj)
|
||||
{
|
||||
if (P_MobjWasRemoved(mobj))
|
||||
if (!mobj || P_MobjWasRemoved(mobj))
|
||||
return;
|
||||
|
||||
if (cv_spriteroll.value && cv_sloperoll.value == 2)
|
||||
@@ -6254,6 +6254,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||
P_RemoveMobj(mobj);
|
||||
return;
|
||||
}
|
||||
|
||||
P_RollPitchMobj(mobj);
|
||||
break;
|
||||
case MT_SMOLDERING:
|
||||
|
||||
Reference in new issue
Block a user