Fix Flashpal toggle
This commit is contained in:
1 parent
f3e23ad621
commit
3635d4adb1
3 files changed
+9
-9
No files matched your search
@@ -147,7 +147,7 @@ consvar_t cv_grusecustomshaders = {"gr_usecustomshaders", "Yes", CV_CALL|CV_SAVE
|
||||
|
||||
consvar_t cv_grpaletterendering = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_grpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
//consvar_t cv_grflashpal = {"gr_flashpal", "On", CV_CALL|CV_SAVE, CV_OnOff, CV_grshaders_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_grflashpal = {"gr_flashpal", "On", CV_CALL|CV_SAVE, CV_OnOff, CV_grshaders_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
consvar_t cv_grmdls = {"gr_mdls", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_grfallbackplayermodel = {"gr_fallbackplayermodel", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
@@ -437,10 +437,10 @@ boolean HWR_ShouldUsePaletteRendering(void)
|
||||
return (cv_grpaletterendering.value && HWR_UseShader());
|
||||
}
|
||||
|
||||
/*boolean HWR_PalRenderFlashpal(void)
|
||||
boolean HWR_PalRenderFlashpal(void)
|
||||
{
|
||||
return (cv_grpaletterendering.value && HWR_UseShader() && cv_grflashpal.value);
|
||||
}*/
|
||||
}
|
||||
|
||||
void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *colormap)
|
||||
{
|
||||
@@ -6400,7 +6400,7 @@ void HWR_AddCommands(void)
|
||||
CV_RegisterVar(&cv_secbright);
|
||||
|
||||
CV_RegisterVar(&cv_grpaletterendering);
|
||||
//CV_RegisterVar(&cv_grflashpal);
|
||||
CV_RegisterVar(&cv_grflashpal);
|
||||
|
||||
CV_RegisterVar(&cv_grvhseffect);
|
||||
}
|
||||
@@ -6514,7 +6514,7 @@ void HWR_DoPostProcessor(player_t *player)
|
||||
|
||||
// Armageddon Blast Flash!
|
||||
// Could this even be considered postprocessor?
|
||||
if (player->flashcount)
|
||||
if ((player->flashcount) && (!HWR_PalRenderFlashpal()))
|
||||
{
|
||||
FOutVector v[4];
|
||||
FSurfaceInfo Surf;
|
||||
|
||||
+1
-1
@@ -1495,7 +1495,7 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
|
||||
{IT_STRING | IT_CVAR, NULL, "Shaders", &cv_grshaders, 25},
|
||||
//{IT_STRING|IT_CVAR, NULL, "Use custom Shaders", &cv_grusecustomshaders, 35},
|
||||
{IT_STRING | IT_CVAR, NULL, "Palette Rendering", &cv_grpaletterendering, 30},
|
||||
//{IT_STRING | IT_CVAR, NULL, "Flashpals in Palette Renderer", &cv_grflashpal, 35},
|
||||
{IT_STRING | IT_CVAR, NULL, "Flashpals in Palette Renderer", &cv_grflashpal, 35},
|
||||
{IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 40},
|
||||
|
||||
{IT_STRING|IT_CVAR, NULL, "Texture Quality", &cv_scr_depth, 50},
|
||||
|
||||
+3
-3
@@ -245,7 +245,7 @@ void ST_doPaletteStuff(void)
|
||||
palette = 0;
|
||||
|
||||
#ifdef HWRENDER
|
||||
if (rendermode == render_opengl && !HWR_ShouldUsePaletteRendering())
|
||||
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()))
|
||||
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 || HWR_ShouldUsePaletteRendering())
|
||||
if (rendermode == render_soft || HWR_PalRenderFlashpal())
|
||||
#endif
|
||||
if (rendermode != render_none) ST_doPaletteStuff();
|
||||
|
||||
|
||||
Reference in new issue
Block a user