From f2f324c48736c48aa76533f593cd0d2b81d161c8 Mon Sep 17 00:00:00 2001 From: Indev Date: Fri, 13 Oct 2023 01:30:46 +0300 Subject: [PATCH] Add null check into P_SpawnMapThing so game doesn't crash if it fails to spawn mapthing for some reason --- src/p_mobj.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/p_mobj.c b/src/p_mobj.c index d5f281edd..12653d39d 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -11374,6 +11374,12 @@ void P_SpawnMapThing(mapthing_t *mthing) } mobj = P_SpawnMobj(x, y, z, i); + + if (!mobj || P_MobjWasRemoved(mobj)) { + CONS_Alert(CONS_WARNING, "Failed to spawn map thing #%d at %d, %d\n", mthing->type, x>>FRACBITS, y>>FRACBITS); + return; + } + mobj->spawnpoint = mthing; switch(mobj->type) -- 2.54.0