[openjk] 15/32: MP Server Game: Correct gametype range checker

Simon McVittie smcv at debian.org
Sun Mar 12 18:03:03 UTC 2017


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

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

commit ff647b37dcd1cbbc2e61d7fd6787681b601382f5
Author: Ensiform <ensiform at gmail.com>
Date:   Sat Mar 11 11:38:08 2017 -0600

    MP Server Game: Correct gametype range checker
    
    Was checking the upper bound value of variable set after validator is finished instead of the input cvar value.
---
 codemp/game/g_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codemp/game/g_main.c b/codemp/game/g_main.c
index f70f6e1..545cb62 100644
--- a/codemp/game/g_main.c
+++ b/codemp/game/g_main.c
@@ -141,9 +141,9 @@ void G_CacheGametype( void )
 		else
 			level.gametype = gt;
 	}
-	else if ( g_gametype.integer < 0 || level.gametype >= GT_MAX_GAME_TYPE )
+	else if ( g_gametype.integer < 0 || g_gametype.integer >= GT_MAX_GAME_TYPE )
 	{
-		trap->Print( "g_gametype %i is out of range, defaulting to 0\n", level.gametype );
+		trap->Print( "g_gametype %i is out of range, defaulting to 0 (FFA/Deathmatch)\n", g_gametype.integer );
 		level.gametype = GT_FFA;
 	}
 	else

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



More information about the Pkg-games-commits mailing list