From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 22 Dec 2011 16:10:27 +0000 (+0100)
Subject: don't count to total scores when in warmup
X-Git-Tag: xonotic-v0.6.0~74^2~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2421325930a9c1fa610f6233430745fd352e202a;p=xonotic%2Fxonotic-data.pk3dir.git

don't count to total scores when in warmup
---

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 782c567ce..d8e095db0 100644
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -337,8 +337,8 @@ float PlayerScore_Add(entity player, float scorefield, float score)
 	if(score)
 		if(scores_label[scorefield] != "")
 			s.SendFlags |= pow(2, scorefield);
-	PlayerStats_Event(s.owner, strcat(PLAYERSTATS_TOTAL, scores_label[scorefield]), score);
-	s.(scores_accumulated[scorefield]) += score;
+	if(!inWarmupStage)
+		PlayerStats_Event(s.owner, strcat(PLAYERSTATS_TOTAL, scores_label[scorefield]), score);
 	return (s.(scores[scorefield]) += score);
 }
 
diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index f94b68332..3ac0b03b5 100644
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -2,8 +2,6 @@ entity scores_initialized; // non-world when scores labels/rules have been set
 .float scores[MAX_SCORE];
 .float teamscores[MAX_TEAMSCORE];
 
-.float scores_accumulated[MAX_SCORE]; // for player stats only
-
 /**
  * Attaches a PlayerScore entity to a player. Use that in ClientConnect.
  * Remember to detach it in ClientDisconnect!