From: Samual Lenks <samual@xonotic.org>
Date: Sat, 1 Jun 2013 19:47:42 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/zykure/teamscores'
X-Git-Tag: xonotic-v0.7.0~23
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=ef7fb74ce9ad83994863a75b8ffd338cad29d68d;hp=3806086769ac43e01ce52e422d76fe47e4f3c380;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/zykure/teamscores'
---

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index ca8ed3f68..354b521e8 100644
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -159,14 +159,18 @@ float PlayerStats_Event(entity e, string event_id, float value)
 	return val;
 }
 
-void PlayerStats_TeamScore(float t, string event_id, float value)
+float PlayerStats_TeamScore(float t, string event_id, float value)
 {
+	if(playerstats_db < 0)
+		return 0;
+
 	string key;
 	float val;
 	key = sprintf("team#%d:%s", t, event_id);
 	val = stof(db_get(playerstats_db, key));
 	val += value;
 	db_put(playerstats_db, key, ftos(val));
+	return val;
 }
 
 /*
diff --git a/qcsrc/server/playerstats.qh b/qcsrc/server/playerstats.qh
index 445d6f31c..ab28b3a55 100644
--- a/qcsrc/server/playerstats.qh
+++ b/qcsrc/server/playerstats.qh
@@ -41,7 +41,7 @@ void PlayerStats_AddEvent(string event_id);
 float PlayerStats_Event(entity e, string event_id, float value);
 
 // add a team score
-void PlayerStats_TeamScore(float t, string event_id, float value);
+float PlayerStats_TeamScore(float t, string event_id, float value);
 
 // call at game over
 void PlayerStats_Shutdown(); // send stats to the server