diff --git a/src/p_mobj.c b/src/p_mobj.c index fe226b054..9d8d85aff 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10365,6 +10365,12 @@ void P_RemoveMobj(mobj_t *mobj) P_SetTarget(&mobj->hprev, NULL); } } + + // clear the reference from the mapthing + if (mobj->spawnpoint) + mobj->spawnpoint->mobj = NULL; + + R_RemoveMobjInterpolator(mobj); // free block // DBG: set everything in mobj_t to 0xFF instead of leaving it. debug memory error. @@ -10397,8 +10403,6 @@ void P_RemoveMobj(mobj_t *mobj) #endif P_RemoveThinker((thinker_t *)mobj); } - - R_RemoveMobjInterpolator(mobj); } // This does not need to be added to Lua.