thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p_saveg.c: consolidate P_RelinkPointers copy-pasted code

Browse source
This commit is contained in:
James R 2023-12-03 09:58:15 -08:00
parent 39486a56d6
commit 43d090f699
1 changed files with 30 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
src/p_saveg.c
View file

@ -5576,6 +5576,13 @@ static inline void P_UnArchivePolyObjects(savebuffer_t *save)
P_UnArchivePolyObj(save, &PolyObjects[i]); P_UnArchivePolyObj(save, &PolyObjects[i]);
} }
static mobj_t *RelinkMobj(mobj_t **ptr)
{
UINT32 temp = (UINT32)(size_t)*ptr;
*ptr = NULL;
return P_SetTarget(ptr, P_FindNewPosition(temp));
}
static void P_RelinkPointers(void) static void P_RelinkPointers(void)
{ {
thinker_t *currentthinker; thinker_t *currentthinker;
@ -5596,37 +5603,27 @@ static void P_RelinkPointers(void)
if (mobj->tracer) if (mobj->tracer)
{ {
temp = (UINT32)(size_t)mobj->tracer; if (!RelinkMobj(&mobj->tracer))
mobj->tracer = NULL;
if (!P_SetTarget(&mobj->tracer, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "tracer not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "tracer not found on %d\n", mobj->type);
} }
if (mobj->target) if (mobj->target)
{ {
temp = (UINT32)(size_t)mobj->target; if (!RelinkMobj(&mobj->target))
mobj->target = NULL;
if (!P_SetTarget(&mobj->target, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "target not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "target not found on %d\n", mobj->type);
} }
if (mobj->hnext) if (mobj->hnext)
{ {
temp = (UINT32)(size_t)mobj->hnext; if (!RelinkMobj(&mobj->hnext))
mobj->hnext = NULL;
if (!P_SetTarget(&mobj->hnext, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "hnext not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "hnext not found on %d\n", mobj->type);
} }
if (mobj->hprev) if (mobj->hprev)
{ {
temp = (UINT32)(size_t)mobj->hprev; if (!RelinkMobj(&mobj->hprev))
mobj->hprev = NULL;
if (!P_SetTarget(&mobj->hprev, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "hprev not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "hprev not found on %d\n", mobj->type);
} }
if (mobj->itnext) if (mobj->itnext)
{ {
temp = (UINT32)(size_t)mobj->itnext; if (!RelinkMobj(&mobj->itnext))
mobj->itnext = NULL;
if (!P_SetTarget(&mobj->itnext, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "itnext not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "itnext not found on %d\n", mobj->type);
} }
if (mobj->terrain) if (mobj->terrain)
@ -5640,23 +5637,17 @@ static void P_RelinkPointers(void)
} }
if (mobj->terrainOverlay) if (mobj->terrainOverlay)
{ {
temp = (UINT32)(size_t)mobj->terrainOverlay; if (!RelinkMobj(&mobj->terrainOverlay))
mobj->terrainOverlay = NULL;
if (!P_SetTarget(&mobj->terrainOverlay, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "terrainOverlay not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "terrainOverlay not found on %d\n", mobj->type);
} }
if (mobj->punt_ref) if (mobj->punt_ref)
{ {
temp = (UINT32)(size_t)mobj->punt_ref; if (!RelinkMobj(&mobj->punt_ref))
mobj->punt_ref = NULL;
if (!P_SetTarget(&mobj->punt_ref, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "punt_ref not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "punt_ref not found on %d\n", mobj->type);
} }
if (mobj->owner) if (mobj->owner)
{ {
temp = (UINT32)(size_t)mobj->owner; if (!RelinkMobj(&mobj->owner))
mobj->owner = NULL;
if (!P_SetTarget(&mobj->owner, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "owner not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "owner not found on %d\n", mobj->type);
} }
} }
@ -5668,37 +5659,27 @@ static void P_RelinkPointers(void)
if (players[i].skybox.viewpoint) if (players[i].skybox.viewpoint)
{ {
temp = (UINT32)(size_t)players[i].skybox.viewpoint; if (!RelinkMobj(&players[i].skybox.viewpoint))
players[i].skybox.viewpoint = NULL;
if (!P_SetTarget(&players[i].skybox.viewpoint, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "skybox.viewpoint not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "skybox.viewpoint not found on player %d\n", i);
} }
if (players[i].skybox.centerpoint) if (players[i].skybox.centerpoint)
{ {
temp = (UINT32)(size_t)players[i].skybox.centerpoint; if (!RelinkMobj(&players[i].skybox.centerpoint))
players[i].skybox.centerpoint = NULL;
if (!P_SetTarget(&players[i].skybox.centerpoint, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "skybox.centerpoint not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "skybox.centerpoint not found on player %d\n", i);
} }
if (players[i].awayview.mobj) if (players[i].awayview.mobj)
{ {
temp = (UINT32)(size_t)players[i].awayview.mobj; if (!RelinkMobj(&players[i].awayview.mobj))
players[i].awayview.mobj = NULL;
if (!P_SetTarget(&players[i].awayview.mobj, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "awayview.mobj not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "awayview.mobj not found on player %d\n", i);
} }
if (players[i].followmobj) if (players[i].followmobj)
{ {
temp = (UINT32)(size_t)players[i].followmobj; if (!RelinkMobj(&players[i].followmobj))
players[i].followmobj = NULL;
if (!P_SetTarget(&players[i].followmobj, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "followmobj not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "followmobj not found on player %d\n", i);
} }
if (players[i].follower) if (players[i].follower)
{ {
temp = (UINT32)(size_t)players[i].follower; if (!RelinkMobj(&players[i].follower))
players[i].follower = NULL;
if (!P_SetTarget(&players[i].follower, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "follower not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "follower not found on player %d\n", i);
} }
if (players[i].currentwaypoint) if (players[i].currentwaypoint)
@ -5730,72 +5711,52 @@ static void P_RelinkPointers(void)
} }
if (players[i].hoverhyudoro) if (players[i].hoverhyudoro)
{ {
temp = (UINT32)(size_t)players[i].hoverhyudoro; if (!RelinkMobj(&players[i].hoverhyudoro))
players[i].hoverhyudoro = NULL;
if (!P_SetTarget(&players[i].hoverhyudoro, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "hoverhyudoro not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "hoverhyudoro not found on player %d\n", i);
} }
if (players[i].stumbleIndicator) if (players[i].stumbleIndicator)
{ {
temp = (UINT32)(size_t)players[i].stumbleIndicator; if (!RelinkMobj(&players[i].stumbleIndicator))
players[i].stumbleIndicator = NULL;
if (!P_SetTarget(&players[i].stumbleIndicator, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "stumbleIndicator not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "stumbleIndicator not found on player %d\n", i);
} }
if (players[i].wavedashIndicator) if (players[i].wavedashIndicator)
{ {
temp = (UINT32)(size_t)players[i].wavedashIndicator; if (!RelinkMobj(&players[i].wavedashIndicator))
players[i].wavedashIndicator = NULL;
if (!P_SetTarget(&players[i].wavedashIndicator, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "wavedashIndicator not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "wavedashIndicator not found on player %d\n", i);
} }
if (players[i].trickIndicator) if (players[i].trickIndicator)
{ {
temp = (UINT32)(size_t)players[i].trickIndicator; if (!RelinkMobj(&players[i].trickIndicator))
players[i].trickIndicator = NULL;
if (!P_SetTarget(&players[i].trickIndicator, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "trickIndicator not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "trickIndicator not found on player %d\n", i);
} }
if (players[i].whip) if (players[i].whip)
{ {
temp = (UINT32)(size_t)players[i].whip; if (!RelinkMobj(&players[i].whip))
players[i].whip = NULL;
if (!P_SetTarget(&players[i].whip, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "whip not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "whip not found on player %d\n", i);
} }
if (players[i].hand) if (players[i].hand)
{ {
temp = (UINT32)(size_t)players[i].hand; if (!RelinkMobj(&players[i].hand))
players[i].hand = NULL;
if (!P_SetTarget(&players[i].hand, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "hand not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "hand not found on player %d\n", i);
} }
if (players[i].ringShooter) if (players[i].ringShooter)
{ {
temp = (UINT32)(size_t)players[i].ringShooter; if (!RelinkMobj(&players[i].ringShooter))
players[i].ringShooter = NULL;
if (!P_SetTarget(&players[i].ringShooter, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "ringShooter not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "ringShooter not found on player %d\n", i);
} }
if (players[i].flickyAttacker) if (players[i].flickyAttacker)
{ {
temp = (UINT32)(size_t)players[i].flickyAttacker; if (!RelinkMobj(&players[i].flickyAttacker))
players[i].flickyAttacker = NULL;
if (!P_SetTarget(&players[i].flickyAttacker, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "flickyAttacker not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "flickyAttacker not found on player %d\n", i);
} }
if (players[i].powerup.flickyController) if (players[i].powerup.flickyController)
{ {
temp = (UINT32)(size_t)players[i].powerup.flickyController; if (!RelinkMobj(&players[i].powerup.flickyController))
players[i].powerup.flickyController = NULL;
if (!P_SetTarget(&players[i].powerup.flickyController, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "powerup.flickyController not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "powerup.flickyController not found on player %d\n", i);
} }
if (players[i].powerup.barrier) if (players[i].powerup.barrier)
{ {
temp = (UINT32)(size_t)players[i].powerup.barrier; if (!RelinkMobj(&players[i].powerup.barrier))
players[i].powerup.barrier = NULL;
if (!P_SetTarget(&players[i].powerup.barrier, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "powerup.barrier not found on player %d\n", i); CONS_Debug(DBG_GAMELOGIC, "powerup.barrier not found on player %d\n", i);
} }
} }