- 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.
ZDoom · May 1, 2017 · 5342ff5 · 5342ff5
1 parent 9636ba3
commit 5342ff5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
@@ -2669,7 +2669,7 @@ GLTEXMNU_SORTDRAWLIST 	= "Sort draw lists by texture";
 
 // Dynamic Light Options
 GLLIGHTMNU_TITLE 			= "DYNAMIC LIGHTS";
-GLLIGHTMNU_LIGHTSENABLED 	= "Dynamic Lights enabled";
+GLLIGHTMNU_LIGHTSENABLED 	= "Dynamic Lights (OpenGL)";
 GLLIGHTMNU_LIGHTDEFS		= "Enable light definitions";
 GLLIGHTMNU_CLIPLIGHTS 		= "Clip lights";
 GLLIGHTMNU_LIGHTSPRITES 	= "Lights affect sprites";
@@ -2803,5 +2803,5 @@ TCMNU_TRUECOLOR				= "True color output";
 TCMNU_MINFILTER				= "Linear filter when downscaling";
 TCMNU_MAGFILTER				= "Linear filter when upscaling";
 TCMNU_MIPMAP					= "Use mipmapped textures";
-TCMNU_DYNLIGHTS				= "Dynamic lights";
+TCMNU_DYNLIGHTS				= "Dynamic lights (Software)";
 
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
@@ -699,7 +699,6 @@ OptionMenu "TrueColorOptions"
 	Option "$TCMNU_MINFILTER",				"r_minfilter", "OnOff"
 	Option "$TCMNU_MAGFILTER",				"r_magfilter", "OnOff"
 	Option "$TCMNU_MIPMAP",					"r_mipmap", "OnOff"
-	Option "$TCMNU_DYNLIGHTS",				"r_dynlights", "OnOff"
 }
 
 OptionMenu "SWROptions"
@@ -2086,7 +2085,8 @@ OptionMenu "GLTextureGLOptions"
 OptionMenu "GLLightOptions"
 {
 	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_CLIPLIGHTS",		gl_lights_checkside,			"YesNo"
 	Option "$GLLIGHTMNU_LIGHTSPRITES",		gl_light_sprites,				"YesNo"