From d0719ef5ba86a1da32fed171d74eb76c7254f4f6 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 20 Mar 2023 19:42:07 -0700 Subject: [PATCH 1/2] Fix mobj reference management of player->mo Thanks to toaster --- src/g_game.c | 2 ++ src/p_mobj.c | 4 +++- src/p_user.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index b2d7b933c..9e72cbaa1 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3139,8 +3139,10 @@ void G_DoReborn(INT32 playernum) if (player->mo) { oldmo = player->mo; + // Don't leave your carcass stuck 10-billion feet in the ground! P_RemoveMobj(player->mo); + P_SetTarget(&player->mo, NULL); } G_SpawnPlayer(playernum); diff --git a/src/p_mobj.c b/src/p_mobj.c index b910f4a3d..e6ad9ae71 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -11769,7 +11769,9 @@ void P_SpawnPlayer(INT32 playernum) p->flashing = K_GetKartFlashing(p); // Babysitting deterrent mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER); - (mobj->player = p)->mo = mobj; + + mobj->player = p; + P_SetTarget(&p->mo, mobj); mobj->angle = mobj->old_angle = 0; diff --git a/src/p_user.c b/src/p_user.c index 7e7e3ef85..98e5b92c2 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3643,7 +3643,7 @@ boolean P_SpectatorJoinGame(player_t *player) if (player->mo) { P_RemoveMobj(player->mo); - player->mo = NULL; + P_SetTarget(&player->mo, NULL); } player->spectator = false; player->pflags &= ~PF_WANTSTOJOIN; From a396ffe676d4ece62215f09b5dcac9dff97d02de Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 20 Mar 2023 19:42:41 -0700 Subject: [PATCH 2/2] Init mobj references before mobj specific spawning in P_SpawnMobj Fixes MT_MONITOR leaking references due to Obj_MonitorSpawnParts called before P_AddThinker. Thanks to toaster --- src/p_mobj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index e6ad9ae71..6b0f46507 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10464,6 +10464,9 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) // Set shadowscale here, before spawn hook so that Lua can change it P_DefaultMobjShadowScale(mobj); + if (!(mobj->flags & MF_NOTHINK)) + P_AddThinker(THINK_MOBJ, &mobj->thinker); + // DANGER! This can cause P_SpawnMobj to return NULL! // Avoid using P_RemoveMobj on the newly created mobj in "MobjSpawn" Lua hooks! if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjSpawn))) @@ -10926,9 +10929,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) } } - if (!(mobj->flags & MF_NOTHINK)) - P_AddThinker(THINK_MOBJ, &mobj->thinker); - if (mobj->skin) // correct inadequecies above. { mobj->sprite2 = P_GetSkinSprite2(mobj->skin, (mobj->frame & FF_FRAMEMASK), NULL);