From 226debfdc7226c84ac605ac5d7b574b1fe74588d Mon Sep 17 00:00:00 2001 From: mrbougo Date: Tue, 4 Aug 2009 15:45:30 +0000 Subject: [PATCH] fix nexball team counts git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7331 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/nexball.qc | 2 +- data/qcsrc/server/scores_rules.qc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/nexball.qc b/data/qcsrc/server/nexball.qc index 179e9e327..04e4278a2 100644 --- a/data/qcsrc/server/nexball.qc +++ b/data/qcsrc/server/nexball.qc @@ -439,7 +439,7 @@ void nb_delayedinit (void) { if (find(world, classname, "nexball_team") == world) nb_spawnteams(); - ScoreRules_nexball(); + ScoreRules_nexball(nb_teams); } diff --git a/data/qcsrc/server/scores_rules.qc b/data/qcsrc/server/scores_rules.qc index cf45db7aa..7854427a9 100644 --- a/data/qcsrc/server/scores_rules.qc +++ b/data/qcsrc/server/scores_rules.qc @@ -177,9 +177,9 @@ void ScoreRules_assault() #define ST_NEXBALL_GOALS 1 #define SP_NEXBALL_GOALS 4 #define SP_NEXBALL_FAULTS 5 -void ScoreRules_nexball() +void ScoreRules_nexball(float teams) { - ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), 0, 0, TRUE); + ScoreRules_basics(teams, 0, 0, TRUE); ScoreInfo_SetLabel_TeamScore( ST_NEXBALL_GOALS, "goals", SFL_SORT_PRIO_PRIMARY); ScoreInfo_SetLabel_PlayerScore( SP_NEXBALL_GOALS, "goals", SFL_SORT_PRIO_PRIMARY); ScoreInfo_SetLabel_PlayerScore(SP_NEXBALL_FAULTS, "faults", SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER); -- 2.39.2