X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=4bcc869ba1f44fa048412ca8dc93461aae79d717;hb=dfdc73cb9a4c2991d76aa5e987cc4e3636f49c5a;hp=c94a5f22ac4262c8dc751b850ffa8cbcb9433100;hpb=2f2fd66d1b78236228005a04f5bc193e7ff37251;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index c94a5f22a..4bcc869ba 100644
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -20,6 +20,7 @@ void PlayerStats_Init() // initiated before InitGameplayMode so that scores are
 	serverflags |= SERVERFLAG_PLAYERSTATS;	
 
 	PlayerStats_AddEvent(PLAYERSTATS_ALIVETIME);
+	PlayerStats_AddEvent(PLAYERSTATS_AVGLATENCY);
 	PlayerStats_AddEvent(PLAYERSTATS_WINS);
 	PlayerStats_AddEvent(PLAYERSTATS_MATCHES);
 	PlayerStats_AddEvent(PLAYERSTATS_JOINS);
@@ -145,7 +146,7 @@ void PlayerStats_AddEvent(string event_id)
 
 void PlayerStats_Event(entity e, string event_id, float value)
 {
-	if(!e.playerstats_id || playerstats_db < 0)
+	if((e.playerstats_id == "") || playerstats_db < 0)
 		return;
 	
 	string key;
@@ -193,6 +194,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 	e: followed by an event name, a space, and the event count/score
 		event names can be:
 			alivetime: total playing time of the player
+			avglatency: average network latency compounded throughout the match
 			wins: number of games won (can only be set if matches is set)
 			matches: number of matches played to the end (not aborted by map switch)
 			joins: number of matches joined (always 1 unless player never played during the match)
@@ -208,22 +210,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 			acc-<weapon netname>-cnt-fired: amount of fired shots
 			acc-<weapon netname>-frags: amount of frags dealt by weapon
 
-	Response format (not used yet):
-
-	V: format version (always 1) - this MUST be the first line!
-	#: comment (MUST be ignored by any parser)
-	R: release information on the XonStat server
-	T: current time
-	S: in case of a stats submit request, the human readable xonstat URL for the submitted match
-	P: player ID of an existing player; this also sets the owner for all following "n", "e" and "t" lines (lower case!)
-	e: followed by an event name, a space, and the event count/score, and - if this is a reply to a stats submit request - a space, and the delta of the event count/score caused by this match
-		event names can be the same as above (they then are either sums, or minimum/maximum values, depending on context), as well as:
-			elo: current Elo calculated by the stats server
-			rank <number>: global rank of player for this game type (for stats submit requests)
-			rank-<gametype> <number>: global rank of player for any game type (for non stats submit requests)
-		not all events need to be included, of course
-		if an event is counted additively from unprocessed submitted data, it should not be sent as part of stats submit response
-		achievement-<achievementname> events may be generated by the xonstat server and reported as part of stats submit responses!
+	Response format (not used yet): see https://gist.github.com/4284222
 */
 
 void PlayerStats_ready(entity fh, entity pass, float status)
@@ -236,9 +223,9 @@ void PlayerStats_ready(entity fh, entity pass, float status)
 	switch(status)
 	{
 		case URL_READY_CANWRITE:
-			url_fputs(fh, "V 4\n");
+			url_fputs(fh, "V 5\n");
 #ifdef WATERMARK
-			url_fputs(fh, sprintf("R %s\n", WATERMARK()));
+			url_fputs(fh, sprintf("R %s\n", WATERMARK));
 #endif
 			url_fputs(fh, sprintf("T %s.%06d\n", strftime(FALSE, "%s"), floor(random() * 1000000)));
 			url_fputs(fh, sprintf("G %s\n", GetGametype()));
@@ -351,7 +338,7 @@ void PlayerStats_AddGlobalInfo(entity p)
 {
 	if(playerstats_db < 0)
 		return;
-	if(!p.playerstats_id || playerstats_db < 0)
+	if((p.playerstats_id == "") || playerstats_db < 0)
 		return;
 	p.playerstats_addedglobalinfo = TRUE;
 
@@ -389,7 +376,16 @@ void PlayerStats_EndMatch(float finished)
 		
 		if((g_arena || g_lms || g_ca) && (p.alivetime <= 0)) { continue; }
 		else if(p.classname != "player") { continue; }
-			
+
+		if(clienttype(p) == CLIENTTYPE_REAL)
+		{
+			if(p.latency_cnt)
+			{
+				float latency = (p.latency_sum / p.latency_cnt);
+				if(latency) { PlayerStats_Event(p, PLAYERSTATS_AVGLATENCY, latency); }
+			}
+		}
+		
 		PlayerScore_PlayerStats(p);
 		PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_VALID, 1);
 		if(finished)