incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't tie restoring mobj/waypoint pointers on player struct to existence of player object

Browse source 
b573b6efbc
This commit is contained in:
NepDisk 2024-09-02 05:45:06 -04:00
parent ddc3ee5595
commit be5d651d1e
1 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/p_saveg.c
View file

@ -3894,7 +3894,6 @@ static void P_NetUnArchiveThinkers(void)
// remove all the current thinkers // remove all the current thinkers
for (i = 0; i < NUM_THINKERLISTS; i++) for (i = 0; i < NUM_THINKERLISTS; i++)
{ {
currentthinker = thlist[i].next;
for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = next) for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = next)
{ {
next = currentthinker->next; next = currentthinker->next;
@ -4238,7 +4237,7 @@ static void P_RelinkPointers(void)
{ {
thinker_t *currentthinker; thinker_t *currentthinker;
mobj_t *mobj; mobj_t *mobj;
UINT32 temp; UINT32 temp, i;
// use info field (value = oldposition) to relink mobjs // use info field (value = oldposition) to relink mobjs
for (currentthinker = thlist[THINK_MOBJ].next; currentthinker != &thlist[THINK_MOBJ]; for (currentthinker = thlist[THINK_MOBJ].next; currentthinker != &thlist[THINK_MOBJ];
@ -4305,59 +4304,62 @@ static void P_RelinkPointers(void)
if (!P_SetTarget(&mobj->terrainOverlay, P_FindNewPosition(temp))) 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->player) for (i = 0; i < MAXPLAYERS; i++)
{ {
if ( mobj->player->skybox.viewpoint) if (!playeringame[i])
continue;
if ( players[i].skybox.viewpoint)
{ {
temp = (UINT32)(size_t)mobj->player->skybox.viewpoint; temp = (UINT32)(size_t)players[i].skybox.viewpoint;
mobj->player->skybox.viewpoint = NULL; players[i].skybox.viewpoint = NULL;
if (!P_SetTarget(&mobj->player->skybox.viewpoint, P_FindNewPosition(temp))) if (!P_SetTarget(&players[i].skybox.viewpoint, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "skybox.viewpoint not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "skybox.viewpoint not found on player %d\n", i);
} }
if ( mobj->player->skybox.centerpoint) if ( players[i].skybox.centerpoint)
{ {
temp = (UINT32)(size_t)mobj->player->skybox.centerpoint; temp = (UINT32)(size_t)players[i].skybox.centerpoint;
mobj->player->skybox.centerpoint = NULL; players[i].skybox.centerpoint = NULL;
if (!P_SetTarget(&mobj->player->skybox.centerpoint, P_FindNewPosition(temp))) if (!P_SetTarget(&players[i].skybox.centerpoint, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "skybox.centerpoint not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "skybox.centerpoint not found on plyer %d\n", i);
} }
if ( mobj->player->awayviewmobj) if ( players[i].awayviewmobj)
{ {
temp = (UINT32)(size_t)mobj->player->awayviewmobj; temp = (UINT32)(size_t)players[i].awayviewmobj;
mobj->player->awayviewmobj = NULL; players[i].awayviewmobj = NULL;
if (!P_SetTarget(&mobj->player->awayviewmobj, P_FindNewPosition(temp))) if (!P_SetTarget(&players[i].awayviewmobj, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "awayviewmobj not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "awayviewmobj not found on player %d\n", i);
} }
if (mobj->player->followmobj) if (players[i].followmobj)
{ {
temp = (UINT32)(size_t)mobj->player->followmobj; temp = (UINT32)(size_t)players[i].followmobj;
mobj->player->followmobj = NULL; players[i].followmobj = NULL;
if (!P_SetTarget(&mobj->player->followmobj, P_FindNewPosition(temp))) if (!P_SetTarget(&players[i].followmobj, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "followmobj not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "followmobj not found on player %d\n", i);
} }
if (mobj->player->follower) if (players[i].follower)
{ {
temp = (UINT32)(size_t)mobj->player->follower; temp = (UINT32)(size_t)players[i].follower;
mobj->player->follower = NULL; players[i].follower = NULL;
if (!P_SetTarget(&mobj->player->follower, P_FindNewPosition(temp))) if (!P_SetTarget(&players[i].follower, P_FindNewPosition(temp)))
CONS_Debug(DBG_GAMELOGIC, "follower not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "follower not found on player %d\n", i);
} }
if (mobj->player->currentwaypoint) if (players[i].currentwaypoint)
{ {
temp = (UINT32)(size_t)mobj->player->currentwaypoint; temp = (UINT32)(size_t)players[i].currentwaypoint;
mobj->player->currentwaypoint = K_GetWaypointFromIndex(temp); players[i].currentwaypoint = K_GetWaypointFromIndex(temp);
if (mobj->player->currentwaypoint == NULL) if (players[i].currentwaypoint == NULL)
{ {
CONS_Debug(DBG_GAMELOGIC, "currentwaypoint not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "currentwaypoint not found on player %d\n", i);
} }
} }
if (mobj->player->nextwaypoint) if (players[i].nextwaypoint)
{ {
temp = (UINT32)(size_t)mobj->player->nextwaypoint; temp = (UINT32)(size_t)players[i].nextwaypoint;
mobj->player->nextwaypoint = K_GetWaypointFromIndex(temp); players[i].nextwaypoint = K_GetWaypointFromIndex(temp);
if (mobj->player->nextwaypoint == NULL) if (players[i].nextwaypoint == NULL)
{ {
CONS_Debug(DBG_GAMELOGIC, "nextwaypoint not found on %d\n", mobj->type); CONS_Debug(DBG_GAMELOGIC, "nextwaypoint not found on player %d\n", i);
} }
} }
} }