From b63e6ab32573be6329533cf60382056d451e6ef3 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Sun, 30 Dec 2018 23:38:38 -0500 Subject: [PATCH 1/6] Fix per-map palette not being reset properly on title --- src/d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 018390144..206fd0653 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -821,9 +821,9 @@ void D_StartTitle(void) F_StartTitleScreen(); CON_ToggleOff(); - // Reset the palette -- SRB2Kart: actually never mind let's do this in the middle of every fade - /*if (rendermode != render_none) - V_SetPaletteLump("PLAYPAL");*/ + // Reset the palette + if (rendermode != render_none) + V_SetPaletteLump("PLAYPAL"); } // From fddd6fb0d527df90a7f4988714d3837dd9f23ffb Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 31 Dec 2018 13:35:38 -0500 Subject: [PATCH 2/6] Revert "Fix per-map palette not being reset properly on title" This reverts commit b63e6ab32573be6329533cf60382056d451e6ef3. --- src/d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 206fd0653..018390144 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -821,9 +821,9 @@ void D_StartTitle(void) F_StartTitleScreen(); CON_ToggleOff(); - // Reset the palette - if (rendermode != render_none) - V_SetPaletteLump("PLAYPAL"); + // Reset the palette -- SRB2Kart: actually never mind let's do this in the middle of every fade + /*if (rendermode != render_none) + V_SetPaletteLump("PLAYPAL");*/ } // From de6c2a84f3ebc0ac77a00714ac75cc8375943e3d Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 31 Dec 2018 14:18:00 -0500 Subject: [PATCH 3/6] Attempt 1 to properly fix --- src/d_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 018390144..7161fda85 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -321,7 +321,7 @@ static void D_Display(void) F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); } - if (wipegamestate == GS_LEVEL && rendermode != render_none) + if (wipegamestate == gamestate && rendermode != render_none) { V_SetPaletteLump("PLAYPAL"); // Reset the palette R_ReInitColormaps(0, LUMPERROR); @@ -821,9 +821,9 @@ void D_StartTitle(void) F_StartTitleScreen(); CON_ToggleOff(); - // Reset the palette -- SRB2Kart: actually never mind let's do this in the middle of every fade - /*if (rendermode != render_none) - V_SetPaletteLump("PLAYPAL");*/ + // Reset the palette + if (rendermode != render_none) + V_SetPaletteLump("PLAYPAL"); } // From 26a257eda7c063d17402be536c4b851527a91afb Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 31 Dec 2018 18:19:18 -0500 Subject: [PATCH 4/6] Better attempt at fixing this --- src/d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index 7161fda85..c2b18727f 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -321,7 +321,7 @@ static void D_Display(void) F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); } - if (wipegamestate == gamestate && rendermode != render_none) + if ((gamestate != GS_LEVEL && rendermode != render_none)) { V_SetPaletteLump("PLAYPAL"); // Reset the palette R_ReInitColormaps(0, LUMPERROR); From b63f4a66e8532129493091446a99b0442a76abd5 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 31 Dec 2018 18:34:04 -0500 Subject: [PATCH 5/6] Comment this out again. How did this even get reverted... --- src/d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index c2b18727f..1cf0620f6 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -821,9 +821,9 @@ void D_StartTitle(void) F_StartTitleScreen(); CON_ToggleOff(); - // Reset the palette - if (rendermode != render_none) - V_SetPaletteLump("PLAYPAL"); + // Reset the palette -- SRB2Kart: actually never mind let's do this in the middle of every fade + /*if (rendermode != render_none) + V_SetPaletteLump("PLAYPAL");*/ } // From 4e0f4ed7094ed78edde46fa07fe4a75357990cd9 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Wed, 2 Jan 2019 13:04:56 -0500 Subject: [PATCH 6/6] Remove double brackets --- src/d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index 1cf0620f6..5d7f3c89c 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -321,7 +321,7 @@ static void D_Display(void) F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); } - if ((gamestate != GS_LEVEL && rendermode != render_none)) + if (gamestate != GS_LEVEL && rendermode != render_none) { V_SetPaletteLump("PLAYPAL"); // Reset the palette R_ReInitColormaps(0, LUMPERROR);