X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=2c6e941a6a4dfd7585986ea74c969702e8609b81;hb=e0ac5f9f14e169a1e19d0e36b85cab061a74ed93;hp=f370ed6bb5bb3e3ae64891dea434ef6b5de4b216;hpb=42f8a3a2519801f07f140f4d477ba18cb0aac004;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index f370ed6bb..2c6e941a6 100644
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -17,7 +17,7 @@ void PlayerStats_Init() // initiated before InitGameplayMode so that scores are
 	if(playerstats_db >= 0)
 		playerstats_waitforme = FALSE; // must wait for it at match end
 
-	serverflags |= SERVERFLAG_PLAYERSTATS;	
+	serverflags |= SERVERFLAG_PLAYERSTATS;
 
 	PlayerStats_AddEvent(PLAYERSTATS_ALIVETIME);
 	PlayerStats_AddEvent(PLAYERSTATS_AVGLATENCY);
@@ -68,12 +68,12 @@ void PlayerStats_AddPlayer(entity e)
 	s = string_null;
 	if(e.crypto_idfp != "" && e.cvar_cl_allow_uidtracking == 1)
 		s = e.crypto_idfp;
-	else if(clienttype(e) == CLIENTTYPE_BOT)
+	else if(IS_BOT_CLIENT(e))
 		s = sprintf("bot#%g#%s", skill, e.cleanname);
 
 	if((s == "") || find(world, playerstats_id, s)) // already have one of the ID - next one can't be tracked then!
 	{
-		if(clienttype(e) == CLIENTTYPE_BOT)
+		if(IS_BOT_CLIENT(e))
 			s = sprintf("bot#%d", e.playerid);
 		else
 			s = sprintf("player#%d", e.playerid);
@@ -83,7 +83,7 @@ void PlayerStats_AddPlayer(entity e)
 
 	string key;
 	key = sprintf("%s:*", e.playerstats_id);
-	
+
 	string p;
 	p = db_get(playerstats_db, key);
 	if(p == "")
@@ -106,7 +106,7 @@ void PlayerStats_AddTeam(float t)
 
 	string key;
 	key = sprintf("%d", t);
-	
+
 	string p;
 	p = db_get(playerstats_db, key);
 	if(p == "")
@@ -126,10 +126,10 @@ void PlayerStats_AddEvent(string event_id)
 {
 	if(playerstats_db < 0)
 		return;
-	
+
 	string key;
 	key = sprintf("*:%s", event_id);
-	
+
 	string p;
 	p = db_get(playerstats_db, key);
 	if(p == "")
@@ -149,7 +149,7 @@ float PlayerStats_Event(entity e, string event_id, float value)
 {
 	if((e.playerstats_id == "") || playerstats_db < 0)
 		return 0;
-	
+
 	string key;
 	float val;
 	key = sprintf("%s:%s", e.playerstats_id, event_id);
@@ -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;
 }
 
 /*
@@ -190,6 +194,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value)
 	U: UDP port number of the server
 	D: duration of the match
 	P: player ID of an existing player; this also sets the owner for all following "n", "e" and "t" lines (lower case!)
+	Q: team number of an existing team (format: team#NN); this also sets the owner for all following "e" lines (lower case!)
 	n: nickname of the player (optional)
 	t: team ID
 	i: player index
@@ -220,13 +225,13 @@ void PlayerStats_ready(entity fh, entity pass, float status)
 	string t, tn;
 	string p, pn;
 	string e, en;
-	string nn, tt, ts;
+	string nn, tt;
 	string s;
 
 	switch(status)
 	{
 		case URL_READY_CANWRITE:
-			url_fputs(fh, "V 6\n");
+			url_fputs(fh, "V 7\n");
 #ifdef WATERMARK
 			url_fputs(fh, sprintf("R %s\n", WATERMARK));
 #endif
@@ -244,9 +249,13 @@ void PlayerStats_ready(entity fh, entity pass, float status)
 				for(t = teamstats_last; (tn = db_get(playerstats_db, sprintf("%d", stof(t)))) != ""; t = tn)
 				{
 					url_fputs(fh, sprintf("Q team#%s\n", t));
-					ts = db_get(playerstats_db, sprintf("team#%d:%s", stof(t), strcat(PLAYERSTATS_SCOREBOARD, "score")));
-					if(ts != "")
-						url_fputs(fh, sprintf("e %s %s\n", strcat(PLAYERSTATS_SCOREBOARD, "teamscore"), (ts != "" ? ts : "0")));
+					for(e = events_last; (en = db_get(playerstats_db, sprintf("*:%s", e))) != ""; e = en)
+					{
+						float v;
+						v = stof(db_get(playerstats_db, sprintf("team#%d:%s", stof(t), e)));
+						if(v != 0)
+							url_fputs(fh, sprintf("e %s %g\n", e, v));
+					}
 				}
 			}
 			for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
@@ -364,7 +373,7 @@ void PlayerStats_AddGlobalInfo(entity p)
 
 	db_put(playerstats_db, sprintf("%s:_playerid", p.playerstats_id), ftos(p.playerid));
 
-	if(p.cvar_cl_allow_uid2name == 1 || clienttype(p) == CLIENTTYPE_BOT)
+	if(p.cvar_cl_allow_uid2name == 1 || IS_BOT_CLIENT(p))
 		db_put(playerstats_db, sprintf("%s:_netname", p.playerstats_id), p.netname);
 
 	if(teamplay)
@@ -375,7 +384,7 @@ void PlayerStats_AddGlobalInfo(entity p)
 
 	PlayerStats_Accuracy(p);
 
-	if(clienttype(p) == CLIENTTYPE_REAL)
+	if(IS_REAL_CLIENT(p))
 	{
 		if(p.latency_cnt)
 		{