From 7c70dc90c14dc40ad8cf9bcfb6340d8cfa65c43f Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 23 Aug 2008 08:10:55 +0000 Subject: [PATCH] race: hide kills/suicides columns in qualifying git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4150 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/scores_rules.qc | 17 +++++++++++++++-- data/qcsrc/server/teamplay.qc | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/scores_rules.qc b/data/qcsrc/server/scores_rules.qc index 34f6323ff..5a92594ff 100644 --- a/data/qcsrc/server/scores_rules.qc +++ b/data/qcsrc/server/scores_rules.qc @@ -6,12 +6,25 @@ void CheckAllowedTeams (entity for_whom); float ScoreRules_teams; void ScoreRules_basics(float teams, float sprio) { + float i; + for(i = 0; i < MAX_SCORE; ++i) + ScoreInfo_SetLabel_PlayerScore(i, "", 0); + for(i = 0; i < MAX_TEAMSCORE; ++i) + ScoreInfo_SetLabel_TeamScore(i, "", 0); + ScoreRules_teams = teams; + if(sprio) ScoreInfo_SetLabel_TeamScore (ST_SCORE, "score", sprio); - ScoreInfo_SetLabel_PlayerScore(SP_KILLS, "kills", 0); + + if(independent_players) + ScoreInfo_SetLabel_PlayerScore(SP_KILLS, "kills", 0); + ScoreInfo_SetLabel_PlayerScore(SP_DEATHS, "deaths", SFL_LOWER_IS_BETTER); - ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES, "suicides", SFL_LOWER_IS_BETTER); + + if(independent_players) + ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES, "suicides", SFL_LOWER_IS_BETTER); + if(sprio) ScoreInfo_SetLabel_PlayerScore(SP_SCORE, "score", sprio); } diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index 857e582eb..dd64c4b9c 100644 --- a/data/qcsrc/server/teamplay.qc +++ b/data/qcsrc/server/teamplay.qc @@ -274,6 +274,7 @@ void InitGameplayMode() if(cvar("g_race_teams")) { + g_race_qualifying = 0; // not supported! ActivateTeamplay(); teams_matter = 1; race_teams = bound(2, cvar("g_race_teams"), 4); -- 2.39.2