thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust PlayerPointerRemove macros + associated to check validity before removal

Browse source
This commit is contained in:
toaster 2023-11-06 01:11:29 +00:00
parent 120b567ba2
commit ccbcd203dd
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -2540,7 +2540,7 @@ void CL_ClearPlayer(INT32 playernum)
} }
#define PlayerPointerRemove(field) \ #define PlayerPointerRemove(field) \
if (field) \ if (P_MobjWasRemoved(field) == false) \
{ \ { \
P_RemoveMobj(field); \ P_RemoveMobj(field); \
P_SetTarget(&field, NULL); \ P_SetTarget(&field, NULL); \

2
src/g_game.c
View file

@ -2234,7 +2234,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
K_RemoveFollower(&players[player]); K_RemoveFollower(&players[player]);
#define PlayerPointerRemove(field) \ #define PlayerPointerRemove(field) \
if (field) \ if (P_MobjWasRemoved(field) == false) \
{ \ { \
P_RemoveMobj(field); \ P_RemoveMobj(field); \
P_SetTarget(&field, NULL); \ P_SetTarget(&field, NULL); \

4
src/k_kart.c
View file

@ -4063,7 +4063,7 @@ void K_InitStumbleIndicator(player_t *player)
return; return;
} }
if (player->stumbleIndicator != NULL && P_MobjWasRemoved(player->stumbleIndicator) == false) if (P_MobjWasRemoved(player->stumbleIndicator) == false)
{ {
P_RemoveMobj(player->stumbleIndicator); P_RemoveMobj(player->stumbleIndicator);
} }
@ -4088,7 +4088,7 @@ void K_InitSliptideZipIndicator(player_t *player)
return; return;
} }
if (player->stumbleIndicator != NULL && P_MobjWasRemoved(player->sliptideZipIndicator) == false) if (P_MobjWasRemoved(player->sliptideZipIndicator) == false)
{ {
P_RemoveMobj(player->sliptideZipIndicator); P_RemoveMobj(player->sliptideZipIndicator);
} }

15
src/p_inter.c
View file

@ -2550,10 +2550,17 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
P_SetPlayerMobjState(player->mo, player->mo->info->deathstate); P_SetPlayerMobjState(player->mo, player->mo->info->deathstate);
if (player->sliptideZipIndicator && !P_MobjWasRemoved(player->sliptideZipIndicator)) #define PlayerPointerRemove(field) \
P_RemoveMobj(player->sliptideZipIndicator); if (P_MobjWasRemoved(field) == false) \
if (player->stumbleIndicator && !P_MobjWasRemoved(player->stumbleIndicator)) { \
P_RemoveMobj(player->stumbleIndicator); P_RemoveMobj(field); \
P_SetTarget(&field, NULL); \
}
PlayerPointerRemove(player->stumbleIndicator);
PlayerPointerRemove(player->sliptideZipIndicator);
#undef PlayerPointerRemove
if (type == DMG_TIMEOVER) if (type == DMG_TIMEOVER)
{ {