[openjk] 17/24: Shared: Fix range of r_subdivisions

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 82d82094e8c53657f9f57ba8740496c2cc5ba204
Author: Ensiform <ensiform at gmail.com>
Date:   Thu Jan 12 12:23:41 2017 -0600

    Shared: Fix range of r_subdivisions
    
    Now allows 0...80 instead of 4...80.
    
    Also made gfxinfo not display lightmap texture bits unless explicitly set to a non-zero value since when 0, the regular texture bits are used.
---
 code/rd-vanilla/tr_init.cpp   | 5 +++--
 codemp/rd-vanilla/tr_init.cpp | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/rd-vanilla/tr_init.cpp b/code/rd-vanilla/tr_init.cpp
index 7d24ef5..896e74a 100644
--- a/code/rd-vanilla/tr_init.cpp
+++ b/code/rd-vanilla/tr_init.cpp
@@ -1307,7 +1307,8 @@ void GfxInfo_f( void )
 	ri.Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
 	ri.Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
 	ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
-	ri.Printf( PRINT_ALL, "lightmap texture bits: %d\n", r_texturebitslm->integer );
+	if ( r_texturebitslm->integer > 0 )
+		ri.Printf( PRINT_ALL, "lightmap texture bits: %d\n", r_texturebitslm->integer );
 	ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
 	ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
 	ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
@@ -1537,7 +1538,7 @@ void R_Register( void )
 	r_simpleMipMaps = ri.Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_subdivisions = ri.Cvar_Get ("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
-	ri.Cvar_CheckRange( r_subdivisions, 4, 80, qfalse );
+	ri.Cvar_CheckRange( r_subdivisions, 0, 80, qfalse );
 	r_intensity = ri.Cvar_Get ("r_intensity", "1", CVAR_LATCH|CVAR_ARCHIVE );
 
 	//
diff --git a/codemp/rd-vanilla/tr_init.cpp b/codemp/rd-vanilla/tr_init.cpp
index f529141..d2f8c43 100644
--- a/codemp/rd-vanilla/tr_init.cpp
+++ b/codemp/rd-vanilla/tr_init.cpp
@@ -1471,7 +1471,8 @@ void GfxInfo_f( void )
 	ri->Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
 	ri->Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
 	ri->Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
-	ri->Printf( PRINT_ALL, "lightmap texture bits: %d\n", r_texturebitslm->integer );
+	if ( r_texturebitslm->integer > 0 )
+		ri->Printf( PRINT_ALL, "lightmap texture bits: %d\n", r_texturebitslm->integer );
 	ri->Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
 	ri->Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
 	ri->Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
@@ -1585,7 +1586,7 @@ void R_Register( void )
 	r_vertexLight						= ri->Cvar_Get( "r_vertexLight",					"0",						CVAR_ARCHIVE|CVAR_LATCH, "" );
 	r_uiFullScreen						= ri->Cvar_Get( "r_uifullscreen",					"0",						CVAR_NONE, "" );
 	r_subdivisions						= ri->Cvar_Get( "r_subdivisions",					"4",						CVAR_ARCHIVE|CVAR_LATCH, "" );
-	ri->Cvar_CheckRange( r_subdivisions, 4, 80, qfalse );
+	ri->Cvar_CheckRange( r_subdivisions, 0, 80, qfalse );
 
 	r_fullbright						= ri->Cvar_Get( "r_fullbright",						"0",						CVAR_CHEAT, "" );
 	r_intensity							= ri->Cvar_Get( "r_intensity",						"1",						CVAR_LATCH, "" );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git