From edca1c788f1959742f4e6872186d695c159391d6 Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 6 Jun 2013 00:55:01 +0200 Subject: [PATCH] ScoreRules_freezetag should know the number of available teams this way (like CA and KH) --- qcsrc/server/mutators/gamemode_freezetag.qc | 11 ++++++----- qcsrc/server/scores_rules.qc | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 82147826e..cdaeb1512 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -575,10 +575,6 @@ MUTATOR_HOOKFUNCTION(freezetag_SpectateCopy) MUTATOR_HOOKFUNCTION(freezetag_GetTeamCount) { - freezetag_teams = autocvar_g_freezetag_teams_override; - if(freezetag_teams < 2) - freezetag_teams = autocvar_g_freezetag_teams; - freezetag_teams = bound(2, freezetag_teams, 4); ret_float = freezetag_teams; return 0; } @@ -594,7 +590,12 @@ MUTATOR_HOOKFUNCTION(freezetag_VehicleTouch) void freezetag_Initialize() { precache_model("models/ice/ice.md3"); - ScoreRules_freezetag(); + + freezetag_teams = autocvar_g_freezetag_teams_override; + if(freezetag_teams < 2) + freezetag_teams = autocvar_g_freezetag_teams; + freezetag_teams = bound(2, freezetag_teams, 4); + ScoreRules_freezetag(freezetag_teams); round_handler_Spawn(freezetag_CheckTeams, freezetag_CheckWinner, func_null); round_handler_Init(5, autocvar_g_freezetag_warmup, autocvar_g_freezetag_round_timelimit); diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index 133178a20..d75cf0443 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -108,10 +108,10 @@ void ScoreRules_nexball(float teams) // FreezeTag stuff #define SP_FREEZETAG_REVIVALS 4 -void ScoreRules_freezetag() +void ScoreRules_freezetag(float teams) { CheckAllowedTeams(world); - ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, TRUE); // SFL_SORT_PRIO_PRIMARY + ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, TRUE); // SFL_SORT_PRIO_PRIMARY ScoreInfo_SetLabel_PlayerScore(SP_FREEZETAG_REVIVALS, "revivals", 0); ScoreRules_basics_end(); } -- 2.39.2