From 1bb6ff27c83b985bc998447c335bbbb261657b8d 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 01839014..206fd065 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 18fea4f3b19c1068ff6a9722a18f3af1df0623f3 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 1bb6ff27c83b985bc998447c335bbbb261657b8d. --- 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 206fd065..01839014 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 749bc65caa04f5fce32322c3c3fdbd7ede9256e6 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 01839014..7161fda8 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 6ad2c145d773ecc1f4564316dcff50cfefce8dc9 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 7161fda8..c2b18727 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 d6178a3a408f2dfacf5aef7332c03697182a4532 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 c2b18727..1cf0620f 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 3273924743419a8fa75d46d933c08d16b4eedc2a 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 1cf0620f..5d7f3c89 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);