From 078f198d817c195c6739dd3fbf2d41dccfa7a8f4 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 21 Oct 2024 21:28:01 +0200 Subject: [PATCH] add proper null check here too --- src/k_kart.c | 6 +++--- src/p_mobj.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index e29973957..9ad30464c 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -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) diff --git a/src/p_mobj.c b/src/p_mobj.c index 97db62733..f7ae70b32 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -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: