From e4a575cc5ee900ddf9729e297cfda9c895cce3e8 Mon Sep 17 00:00:00 2001 From: lug420 Date: Fri, 15 Sep 2023 20:54:57 +0200 Subject: [PATCH] (hopefully) make flashpals work with palette rendering --- src/st_stuff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 966a0c9c6..cc3b2cb3b 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -233,8 +233,8 @@ void ST_doPaletteStuff(void) palette = 0; #ifdef HWRENDER - if (rendermode == render_opengl) - palette = 0; // No flashpals here in OpenGL + if (rendermode == render_opengl && (cv_grpaletteshader.value == 0)) + palette = 0; // Don't set the palette to a flashpal in OpenGL's truecolor mode #endif palette = min(max(palette, 0), 13); @@ -2167,7 +2167,7 @@ void ST_Drawer(void) //25/08/99: Hurdler: palette changes is done for all players, // not only player1! That's why this part // of code is moved somewhere else. - if (rendermode == render_soft) + if (rendermode == render_soft || (cv_grpaletteshader.value == 1)) #endif if (rendermode != render_none) ST_doPaletteStuff();