From dd7a720d0642c281dcb4e5f02448e62b5f1f55ab Mon Sep 17 00:00:00 2001 From: esteel Date: Tue, 25 Oct 2005 22:15:56 +0000 Subject: [PATCH] time/fraglimit overrides have now default of -1 so 0 can disable the limits git-svn-id: svn://svn.icculus.org/nexuiz/trunk@539 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- qcsrc/default.cfg | 11 +++++------ qcsrc/gamec/teamplay.c | 6 ++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/qcsrc/default.cfg b/qcsrc/default.cfg index cdfe9dc1c..8034850e5 100755 --- a/qcsrc/default.cfg +++ b/qcsrc/default.cfg @@ -117,9 +117,11 @@ seta g_balance_grapplehook_speed_fly 1200 seta g_balance_grapplehook_speed_pull 1000 // "This means that timelimit can be overwritten globally and fraglimit can be overwritten for each game mode: DM/TDM, Domination, CTF, and Runematch." -set g_ctf_capture_limit 0 -set fraglimit_override 0 -set timelimit_override 0 +set timelimit_override -1 +set fraglimit_override -1 +set g_ctf_capture_limit -1 +set g_domination_point_limit -1 +set g_runematch_point_limit -1 // common team values set g_tdm 0 @@ -134,7 +136,6 @@ set g_changeteam_fragtransfer 80 // % of frags you get to keep when you change // ctf set g_ctf 0 -//set g_ctf_capture_limit 5 set g_ctf_flag_returntime 30 set g_ctf_flagscore_capture 5 set g_ctf_flagscore_capture_team 20 @@ -144,7 +145,6 @@ set g_ctf_flagscore_return_rogue 10 // runematch set g_runematch 0 -set g_runematch_point_limit 0 set g_runematch_pointrate 5 set g_runematch_pointamt 1 set g_runematch_shuffletime 30 // how often runes change position @@ -195,7 +195,6 @@ set g_balance_rune_speed_combo_jumpheight 1.0 // domination set g_domination 0 -set g_domination_point_limit 0 set g_domination_default_teams 2 // default number of teams for maps that aren't domination-specific set g_domination_disable_frags 0 // players can't get frags normally; only get points from kills set g_domination_point_amt 0 // override: how many points to get per ping diff --git a/qcsrc/gamec/teamplay.c b/qcsrc/gamec/teamplay.c index 08b9f3115..36af96e89 100644 --- a/qcsrc/gamec/teamplay.c +++ b/qcsrc/gamec/teamplay.c @@ -104,7 +104,9 @@ void InitGameplayMode() // FIXME: also set a message or game mode name to print to players when the join + // set both here, gamemode can override it later timelimit_override = cvar("timelimit_override"); + fraglimit_override = cvar("fraglimit_override"); if(game == GAME_DOMINATION || cvar("g_domination")) { @@ -187,9 +189,9 @@ void InitGameplayMode() }*/ // enforce the server's universal frag/time limits - if(fraglimit_override) + if(fraglimit_override >= 0) cvar_set("fraglimit", ftos(fraglimit_override)); - if(timelimit_override) + if(timelimit_override >= 0) cvar_set("timelimit", ftos(timelimit_override)); if (game == GAME_DOMINATION)//cvar("g_domination")) -- 2.39.2