From aa4fa1e42e6d4cc4cbf23cd19825a3dbc60bd490 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 22 Dec 2024 01:31:00 +0100 Subject: [PATCH] use P_MobjWasRemoved and null check for thing subsector in projectsprite --- src/hardware/hw_main.c | 2 +- src/r_things.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 593b91f4b..345d89480 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4427,7 +4427,7 @@ static void HWR_ProjectSprite(mobj_t *thing) angle_t sliptiderollangle = 0; #endif - if (!thing) + if (P_MobjWasRemoved(thing) || thing->subsector == NULL) return; // uncapped/interpolation diff --git a/src/r_things.c b/src/r_things.c index 60d5bfe97..f1d8d7f04 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1155,6 +1155,7 @@ static void R_ProjectSprite(mobj_t *thing) //SoM: 3/17/2000 fixed_t gz, gzt; INT32 heightsec, phs; + INT32 dist = -1; INT32 light = 0; fixed_t this_scale; fixed_t spritexscale, spriteyscale; @@ -1170,7 +1171,8 @@ static void R_ProjectSprite(mobj_t *thing) angle_t sliptiderollangle = 0; #endif - INT32 dist = -1; + if (P_MobjWasRemoved(thing) || thing->subsector == NULL) + return; if (cv_maxinterpdist.value) dist = R_QuickCamDist(thing->x, thing->y);