From 4e8bc36521840dea3bb85cefd500d79777c5a8aa Mon Sep 17 00:00:00 2001 From: SteelT Date: Wed, 29 Mar 2023 14:29:00 -0400 Subject: [PATCH] Reload palette even if rewinding a replay or reloading the gamestate --- src/p_setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index d0e5b52ed..97f9680df 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -7753,6 +7753,10 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) S_StopSounds(); 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 // But only if we didn't do the encore startup wipe if (!demo.rewinding && !reloadinggamestate) @@ -7765,10 +7769,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) S_FadeMusic(0, FixedMul( 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 (ranspecialwipe == 2)