- moved the software renderer's dynamic light option into the dynamic light menu to avoid confusion.

Todo: Review the other options and make sure they apply to both renderers.
This commit is contained in:
Christoph Oelckers 2017-05-01 22:04:54 +02:00
parent 050acc9271
commit 79ef7989fc
2 changed files with 4 additions and 4 deletions

View file

@ -2671,7 +2671,7 @@ GLTEXMNU_SORTDRAWLIST = "Sort draw lists by texture";
// Dynamic Light Options // Dynamic Light Options
GLLIGHTMNU_TITLE = "DYNAMIC LIGHTS"; GLLIGHTMNU_TITLE = "DYNAMIC LIGHTS";
GLLIGHTMNU_LIGHTSENABLED = "Dynamic Lights enabled"; GLLIGHTMNU_LIGHTSENABLED = "Dynamic Lights (OpenGL)";
GLLIGHTMNU_LIGHTDEFS = "Enable light definitions"; GLLIGHTMNU_LIGHTDEFS = "Enable light definitions";
GLLIGHTMNU_CLIPLIGHTS = "Clip lights"; GLLIGHTMNU_CLIPLIGHTS = "Clip lights";
GLLIGHTMNU_LIGHTSPRITES = "Lights affect sprites"; GLLIGHTMNU_LIGHTSPRITES = "Lights affect sprites";
@ -2805,7 +2805,7 @@ TCMNU_TRUECOLOR = "True color output";
TCMNU_MINFILTER = "Linear filter when downscaling"; TCMNU_MINFILTER = "Linear filter when downscaling";
TCMNU_MAGFILTER = "Linear filter when upscaling"; TCMNU_MAGFILTER = "Linear filter when upscaling";
TCMNU_MIPMAP = "Use mipmapped textures"; TCMNU_MIPMAP = "Use mipmapped textures";
TCMNU_DYNLIGHTS = "Dynamic lights"; TCMNU_DYNLIGHTS = "Dynamic lights (Software)";
// SVE strings: // SVE strings:

View file

@ -706,7 +706,6 @@ OptionMenu "TrueColorOptions"
Option "$TCMNU_MINFILTER", "r_minfilter", "OnOff" Option "$TCMNU_MINFILTER", "r_minfilter", "OnOff"
Option "$TCMNU_MAGFILTER", "r_magfilter", "OnOff" Option "$TCMNU_MAGFILTER", "r_magfilter", "OnOff"
Option "$TCMNU_MIPMAP", "r_mipmap", "OnOff" Option "$TCMNU_MIPMAP", "r_mipmap", "OnOff"
Option "$TCMNU_DYNLIGHTS", "r_dynlights", "OnOff"
} }
OptionMenu "SWROptions" OptionMenu "SWROptions"
@ -2094,7 +2093,8 @@ OptionMenu "GLTextureGLOptions"
OptionMenu "GLLightOptions" OptionMenu "GLLightOptions"
{ {
Title "$GLLIGHTMNU_TITLE" Title "$GLLIGHTMNU_TITLE"
Option "$GLLIGHTMNU_LIGHTSENABLED", gl_lights, "YesNo" Option "$TCMNU_DYNLIGHTS", "r_dynlights", "OnOff"
Option "$GLLIGHTMNU_LIGHTSENABLED", gl_lights, "OnOff"
Option "$GLLIGHTMNU_LIGHTDEFS", gl_attachedlights, "YesNo" Option "$GLLIGHTMNU_LIGHTDEFS", gl_attachedlights, "YesNo"
Option "$GLLIGHTMNU_CLIPLIGHTS", gl_lights_checkside, "YesNo" Option "$GLLIGHTMNU_CLIPLIGHTS", gl_lights_checkside, "YesNo"
Option "$GLLIGHTMNU_LIGHTSPRITES", gl_light_sprites, "YesNo" Option "$GLLIGHTMNU_LIGHTSPRITES", gl_light_sprites, "YesNo"