diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index bf019adfd..7dbe895d3 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -165,6 +165,11 @@ boolean HWR_ShouldUsePaletteRendering(void) return (cv_grpaletteshader.value && cv_grshaders.value); } +boolean HWR_PalRenderFlashpal(void) +{ + return (cv_grpaletteshader.value && cv_grshaders.value && cv_grflashpal.value); +} + static void CV_filtermode_ONChange(void) { if (rendermode == render_opengl) @@ -6675,7 +6680,7 @@ void HWR_DoPostProcessor(player_t *player) // Armageddon Blast Flash! // Could this even be considered postprocessor? - if ((player->flashcount) && !(HWR_ShouldUsePaletteRendering() && cv_grflashpal.value)) + if ((player->flashcount) && (!HWR_PalRenderFlashpal())) { FOutVector v[4]; FSurfaceInfo Surf; diff --git a/src/st_stuff.c b/src/st_stuff.c index e444d2184..17788d6a6 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -245,7 +245,7 @@ void ST_doPaletteStuff(void) palette = 0; #ifdef HWRENDER - if ((rendermode == render_opengl && !HWR_ShouldUsePaletteRendering()) || (rendermode == render_opengl && HWR_ShouldUsePaletteRendering() && !cv_grflashpal.value)) + if ((rendermode == render_opengl) && (!HWR_PalRenderFlashpal())) palette = 0; // No flashpals here in OpenGL #endif @@ -254,7 +254,7 @@ void ST_doPaletteStuff(void) st_palette = palette; #ifdef HWRENDER - if (rendermode == render_soft || (rendermode == render_opengl && HWR_ShouldUsePaletteRendering() && cv_grflashpal.value)) + if (rendermode == render_soft || (rendermode == render_opengl && HWR_PalRenderFlashpal())) #else if (rendermode != render_none) #endif @@ -2207,7 +2207,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 || (rendermode == render_opengl && HWR_ShouldUsePaletteRendering() && cv_grflashpal.value)) + if (rendermode == render_soft || (rendermode == render_opengl && HWR_PalRenderFlashpal())) #endif if (rendermode != render_none) ST_doPaletteStuff();