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

P_LoadLevel is a mess, but attempt to fix a few things that shouldn't be happening with resyncs, including #209. Untested.

Browse source
This commit is contained in:
toaster 2022-02-14 15:43:56 +00:00
parent 4b1cef0f20
commit 6d851f2bc8
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_saveg.c
View file

@ -4496,6 +4496,7 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading)
// tell the sound code to reset the music since we're skipping what // tell the sound code to reset the music since we're skipping what
// normally sets this flag // normally sets this flag
if (!reloading)
mapmusflags |= MUSIC_RELOADRESET; mapmusflags |= MUSIC_RELOADRESET;
G_SetGamestate(READINT16(save_p)); G_SetGamestate(READINT16(save_p));

22
src/p_setup.c
View file

@ -3943,9 +3943,12 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
// will be set by player think. // will be set by player think.
players[consoleplayer].viewz = 1; players[consoleplayer].viewz = 1;
// Cancel all d_main.c fadeouts (keep fade in though).
if (reloadinggamestate)
wipegamestate = gamestate; // Don't fade if reloading the gamestate
// Encore mode fade to pink to white // Encore mode fade to pink to white
// This is handled BEFORE sounds are stopped. // This is handled BEFORE sounds are stopped.
if (encoremode && !prevencoremode && !demo.rewinding) else if (encoremode && !prevencoremode && !demo.rewinding)
{ {
if (rendermode != render_none) if (rendermode != render_none)
{ {
@ -4007,10 +4010,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
} }
} }
// Cancel all d_main.c fadeouts (keep fade in though).
if (reloadinggamestate)
wipegamestate = gamestate; // Don't fade if reloading the gamestate
// Special stage & record attack retry fade to white // Special stage & record attack retry fade to white
// This is handled BEFORE sounds are stopped. // This is handled BEFORE sounds are stopped.
if (G_GetModeAttackRetryFlag()) if (G_GetModeAttackRetryFlag())
@ -4032,7 +4031,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
// Let's fade to white here // Let's fade to white here
// But only if we didn't do the encore startup wipe // But only if we didn't do the encore startup wipe
if (!demo.rewinding) if (!demo.rewinding && !reloadinggamestate)
{ {
// Make sure all sounds are stopped before Z_FreeTags. // Make sure all sounds are stopped before Z_FreeTags.
S_StopSounds(); S_StopSounds();
@ -4204,9 +4203,8 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
{ {
P_InitCamera(); P_InitCamera();
memset(localaiming, 0, sizeof(localaiming)); memset(localaiming, 0, sizeof(localaiming));
}
K_InitDirector(); K_InitDirector();
}
wantedcalcdelay = wantedfrequency*2; wantedcalcdelay = wantedfrequency*2;
indirectitemcooldown = 0; indirectitemcooldown = 0;
@ -4237,7 +4235,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
if (!(netgame || multiplayer || demo.playback) && !majormods) if (!(netgame || multiplayer || demo.playback) && !majormods)
mapvisited[gamemap-1] |= MV_VISITED; mapvisited[gamemap-1] |= MV_VISITED;
else if (netgame || multiplayer) else if (!demo.playback)
mapvisited[gamemap-1] |= MV_MP; // you want to record that you've been there this session, but not permanently mapvisited[gamemap-1] |= MV_MP; // you want to record that you've been there this session, but not permanently
G_AddMapToBuffer(gamemap-1); G_AddMapToBuffer(gamemap-1);
@ -4260,7 +4258,11 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
lastmaploaded = gamemap; // HAS to be set after saving!! lastmaploaded = gamemap; // HAS to be set after saving!!
} }
if (grandprixinfo.gp == true) if (reloadinggamestate)
{
CONS_Printf("Gamestate reloaded; bot infomation may be corrupted, requires further testing...\n");
}
else if (grandprixinfo.gp == true)
{ {
if (grandprixinfo.initalize == true) if (grandprixinfo.initalize == true)
{ {