[iortcw] 29/95: All: Don't change resolution or fullscreen in the Quality presets
Simon McVittie
smcv at debian.org
Fri Sep 8 10:41:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to tag 1.51
in repository iortcw.
commit 52ba055aa2bc9f194a7c73c4d9e40f110abf0099
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date: Sun Feb 5 10:20:27 2017 -0500
All: Don't change resolution or fullscreen in the Quality presets
Also, only set bloom cvars if enabled
---
MP/code/ui/ui_main.c | 17 +++++++++--------
SP/code/ui/ui_main.c | 17 +++++++++--------
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c
index 5278626..558eb02 100644
--- a/MP/code/ui/ui_main.c
+++ b/MP/code/ui/ui_main.c
@@ -4414,14 +4414,12 @@ static void UI_Update( const char *name ) {
} else if ( Q_stricmp( name, "ui_glCustom" ) == 0 ) {
switch ( val ) {
case 0: // high quality
- trap_Cvar_SetValue( "r_fullScreen", 1 );
trap_Cvar_SetValue( "r_subdivisions", 4 );
trap_Cvar_SetValue( "r_vertexlight", 0 );
trap_Cvar_SetValue( "r_lodbias", 0 );
trap_Cvar_SetValue( "r_colorbits", 32 );
trap_Cvar_SetValue( "r_depthbits", 24 );
trap_Cvar_SetValue( "r_picmip", 0 );
- trap_Cvar_SetValue( "r_mode", -2 );
trap_Cvar_SetValue( "r_texturebits", 32 );
trap_Cvar_SetValue( "r_fastSky", 0 );
trap_Cvar_SetValue( "r_dynamiclight", 1 );
@@ -4443,16 +4441,17 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_drawSunRays", 1 );
trap_Cvar_SetValue( "r_sunShadows", 1 );
trap_Cvar_SetValue( "r_shadowFilter", 1 );
+#ifdef USE_BLOOM
+ trap_Cvar_SetValue( "r_bloom", 1 );
+#endif
break;
case 1: // normal
- trap_Cvar_SetValue( "r_fullScreen", 1 );
trap_Cvar_SetValue( "r_subdivisions", 4 );
trap_Cvar_SetValue( "r_vertexlight", 0 );
trap_Cvar_SetValue( "r_lodbias", 0 );
trap_Cvar_SetValue( "r_colorbits", 0 );
trap_Cvar_SetValue( "r_depthbits", 0 );
trap_Cvar_SetValue( "r_picmip", 0 );
- trap_Cvar_SetValue( "r_mode", -2 );
trap_Cvar_SetValue( "r_texturebits", 0 );
trap_Cvar_SetValue( "r_fastSky", 0 );
trap_Cvar_SetValue( "r_dynamiclight", 1 );
@@ -4463,17 +4462,17 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_ext_compressed_textures", 0 );
trap_Cvar_SetValue( "r_overBrightBits", 0 );
trap_Cvar_Set( "cl_renderer", "opengl1" );
+#ifdef USE_BLOOM
trap_Cvar_SetValue( "r_bloom", 1 );
+#endif
break;
case 2: // fast
- trap_Cvar_SetValue( "r_fullScreen", 1 );
trap_Cvar_SetValue( "r_subdivisions", 12 );
trap_Cvar_SetValue( "r_vertexlight", 0 );
trap_Cvar_SetValue( "r_lodbias", 1 );
trap_Cvar_SetValue( "r_colorbits", 0 );
trap_Cvar_SetValue( "r_depthbits", 0 );
trap_Cvar_SetValue( "r_picmip", 1 );
- trap_Cvar_SetValue( "r_mode", -2 );
trap_Cvar_SetValue( "r_texturebits", 0 );
trap_Cvar_SetValue( "cg_shadows", 0 );
trap_Cvar_SetValue( "r_fastSky", 1 );
@@ -4484,16 +4483,16 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_ext_compressed_textures", 1 );
trap_Cvar_SetValue( "r_overBrightBits", 0 );
trap_Cvar_Set( "cl_renderer", "opengl1" );
+#ifdef USE_BLOOM
trap_Cvar_SetValue( "r_bloom", 0 );
+#endif
break;
case 3: // fastest
- trap_Cvar_SetValue( "r_fullScreen", 1 );
trap_Cvar_SetValue( "r_subdivisions", 20 );
trap_Cvar_SetValue( "r_vertexlight", 1 );
trap_Cvar_SetValue( "r_lodbias", 2 );
trap_Cvar_SetValue( "r_colorbits", 0 );
trap_Cvar_SetValue( "r_depthbits", 0 );
- trap_Cvar_SetValue( "r_mode", -2 );
trap_Cvar_SetValue( "r_picmip", 2 );
trap_Cvar_SetValue( "r_texturebits", 0 );
trap_Cvar_SetValue( "cg_shadows", 0 );
@@ -4505,7 +4504,9 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_ext_compressed_textures", 1 );
trap_Cvar_SetValue( "r_overBrightBits", 0 );
trap_Cvar_Set( "cl_renderer", "opengl1" );
+#ifdef USE_BLOOM
trap_Cvar_SetValue( "r_bloom", 0 );
+#endif
break;
}
} else if ( Q_stricmp( name, "ui_mousePitch" ) == 0 ) {
diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c
index 91767cb..61e6dbb 100644
--- a/SP/code/ui/ui_main.c
+++ b/SP/code/ui/ui_main.c
@@ -4456,7 +4456,6 @@ static void UI_Update( const char *name ) {
} else if ( Q_stricmp( name, "ui_glCustom" ) == 0 ) {
switch ( val ) {
case 0: // high quality
- trap_Cvar_SetValue( "r_fullScreen", 1 );
trap_Cvar_SetValue( "r_subdivisions", 4 );
trap_Cvar_SetValue( "r_vertexlight", 0 );
trap_Cvar_SetValue( "r_lodbias", 0 );
@@ -4464,7 +4463,6 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_depthbits", 24 );
trap_Cvar_SetValue( "r_picmip", 0 );
trap_Cvar_SetValue( "r_picmip2", 0 );
- trap_Cvar_SetValue( "r_mode", -2 );
trap_Cvar_SetValue( "r_texturebits", 32 );
trap_Cvar_SetValue( "r_fastSky", 0 );
trap_Cvar_SetValue( "r_dynamiclight", 1 );
@@ -4486,9 +4484,11 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_drawSunRays", 1 );
trap_Cvar_SetValue( "r_sunShadows", 1 );
trap_Cvar_SetValue( "r_shadowFilter", 1 );
+#ifdef USE_BLOOM
+ trap_Cvar_SetValue( "r_bloom", 1 );
+#endif
break;
case 1: // normal
- trap_Cvar_SetValue( "r_fullScreen", 1 );
trap_Cvar_SetValue( "r_subdivisions", 4 );
trap_Cvar_SetValue( "r_vertexlight", 0 );
trap_Cvar_SetValue( "r_lodbias", 0 );
@@ -4496,7 +4496,6 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_depthbits", 0 );
trap_Cvar_SetValue( "r_picmip", 0 );
trap_Cvar_SetValue( "r_picmip2", 1 );
- trap_Cvar_SetValue( "r_mode", -2 );
trap_Cvar_SetValue( "r_texturebits", 0 );
trap_Cvar_SetValue( "r_fastSky", 0 );
trap_Cvar_SetValue( "r_dynamiclight", 1 );
@@ -4507,10 +4506,11 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_ext_compressed_textures", 0 );
trap_Cvar_SetValue( "r_overBrightBits", 0 );
trap_Cvar_Set( "cl_renderer", "opengl1" );
+#ifdef USE_BLOOM
trap_Cvar_SetValue( "r_bloom", 1 );
+#endif
break;
case 2: // fast
- trap_Cvar_SetValue( "r_fullScreen", 1 );
trap_Cvar_SetValue( "r_subdivisions", 12 );
trap_Cvar_SetValue( "r_vertexlight", 0 );
trap_Cvar_SetValue( "r_lodbias", 1 );
@@ -4518,7 +4518,6 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_depthbits", 0 );
trap_Cvar_SetValue( "r_picmip", 1 );
trap_Cvar_SetValue( "r_picmip2", 2 );
- trap_Cvar_SetValue( "r_mode", -2 );
trap_Cvar_SetValue( "r_texturebits", 0 );
trap_Cvar_SetValue( "cg_shadows", 0 );
trap_Cvar_SetValue( "r_fastSky", 1 );
@@ -4529,16 +4528,16 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_ext_compressed_textures", 1 );
trap_Cvar_SetValue( "r_overBrightBits", 0 );
trap_Cvar_Set( "cl_renderer", "opengl1" );
+#ifdef USE_BLOOM
trap_Cvar_SetValue( "r_bloom", 0 );
+#endif
break;
case 3: // fastest
- trap_Cvar_SetValue( "r_fullScreen", 1 );
trap_Cvar_SetValue( "r_subdivisions", 20 );
trap_Cvar_SetValue( "r_vertexlight", 1 );
trap_Cvar_SetValue( "r_lodbias", 2 );
trap_Cvar_SetValue( "r_colorbits", 0 );
trap_Cvar_SetValue( "r_depthbits", 0 );
- trap_Cvar_SetValue( "r_mode", -2 );
trap_Cvar_SetValue( "r_picmip", 2 );
trap_Cvar_SetValue( "r_picmip2", 3 );
trap_Cvar_SetValue( "r_texturebits", 0 );
@@ -4551,7 +4550,9 @@ static void UI_Update( const char *name ) {
trap_Cvar_SetValue( "r_ext_compressed_textures", 1 );
trap_Cvar_SetValue( "r_overBrightBits", 0 );
trap_Cvar_Set( "cl_renderer", "opengl1" );
+#ifdef USE_BLOOM
trap_Cvar_SetValue( "r_bloom", 0 );
+#endif
break;
case 999: // 999 is reserved for having set default values ("recommended")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list