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

Reload palette even if rewinding a replay or reloading the gamestate

Browse source
This commit is contained in:
SteelT 2023-03-29 14:29:00 -04:00
parent 4588a20a95
commit 4e8bc36521
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_setup.c
View file

@ -7753,6 +7753,10 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
S_StopSounds(); S_StopSounds();
S_ClearSfx(); S_ClearSfx();
// Reset the palette now all fades have been done
if (rendermode != render_none)
V_ReloadPalette(); // Set the level palette
// 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 && !reloadinggamestate) if (!demo.rewinding && !reloadinggamestate)
@ -7765,10 +7769,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
S_FadeMusic(0, FixedMul( S_FadeMusic(0, FixedMul(
FixedDiv((F_GetWipeLength(wipedefs[wipe_level_toblack])-2)*NEWTICRATERATIO, NEWTICRATE), MUSICRATE)); FixedDiv((F_GetWipeLength(wipedefs[wipe_level_toblack])-2)*NEWTICRATERATIO, NEWTICRATE), MUSICRATE));
// Reset the palette now all fades have been done
if (rendermode != render_none)
V_ReloadPalette(); // Set the level palette
if (!(reloadinggamestate || gamestate != GS_LEVEL)) if (!(reloadinggamestate || gamestate != GS_LEVEL))
{ {
if (ranspecialwipe == 2) if (ranspecialwipe == 2)