From fcdd128a978ff9625e9329ec471d2afdad830640 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 30 Dec 2010 21:48:41 +0100 Subject: [PATCH] fix a crash --- qcsrc/server/mutators/gamemode_freezetag.qc | 3 ++- qcsrc/server/scores_rules.qc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index ca2c20e01..c57be73ed 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -23,6 +23,7 @@ void freezetag_CheckWinner() entity e, winner; string teamname; + winner = world; FOR_EACH_PLAYER(e) { @@ -35,7 +36,6 @@ void freezetag_CheckWinner() if(winner != world) // just in case a winner wasn't found { - TeamScore_AddToTeam(winner.team, ST_SCORE, +1); if(winner.team == COLOR_TEAM1) teamname = "^1Red Team"; else if(winner.team == COLOR_TEAM2) @@ -48,6 +48,7 @@ void freezetag_CheckWinner() centerprint(e, strcat(teamname, "^5 wins the round, all other teams were frozen.\n")); } bprint(teamname, "^5 wins the round since all the other teams were frozen.\n"); + TeamScore_AddToTeam(winner.team, ST_SCORE, +1); } next_round = time + 5; diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index 92ea0366b..61fc9f4c9 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -34,7 +34,6 @@ void ScoreRules_basics_end() } void ScoreRules_generic() { - CheckAllowedTeams(world); if(teams_matter) { CheckAllowedTeams(world); @@ -207,7 +206,8 @@ void ScoreRules_keepaway() #define SP_FREEZETAG_REVIVALS 4 void ScoreRules_freezetag() { - ScoreRules_basics(0, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, TRUE); // SFL_SORT_PRIO_PRIMARY + CheckAllowedTeams(world); + ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), 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