cvar cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / playerstats.qc

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index a6e3d61e96824c813394cad6125eb98f8f3c95ce..2c6e941a6a4dfd7585986ea74c969702e8609b81 100644 (file)
--- 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);
@@ -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 == "")
@@ -99,14 +99,14 @@ void PlayerStats_AddPlayer(entity e)
        }
 }
 
-void PlayerStats_AddTeam(float t) // TODO: doesn't this remain unused?
+void PlayerStats_AddTeam(float t)
 {
        if(playerstats_db < 0)
                return;
 
        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) // TODO: doesn't this remain unused?
+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) // TODO: doesn
        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
@@ -217,6 +222,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 
 void PlayerStats_ready(entity fh, entity pass, float status)
 {
+       string t, tn;
        string p, pn;
        string e, en;
        string nn, tt;
@@ -225,7 +231,7 @@ void PlayerStats_ready(entity fh, entity pass, float status)
        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
@@ -238,6 +244,20 @@ void PlayerStats_ready(entity fh, entity pass, float status)
                        url_fputs(fh, sprintf("C %d\n", cvar_purechanges_count));
                        url_fputs(fh, sprintf("U %d\n", cvar("port")));
                        url_fputs(fh, sprintf("D %f\n", max(0, time - game_starttime)));
+                       if(teamplay)
+                       {
+                               for(t = teamstats_last; (tn = db_get(playerstats_db, sprintf("%d", stof(t)))) != ""; t = tn)
+                               {
+                                       url_fputs(fh, sprintf("Q team#%s\n", t));
+                                       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)
                        {
                                url_fputs(fh, sprintf("P %s\n", p));
@@ -383,6 +403,8 @@ void PlayerStats_EndMatch(float finished)
        entity p;
        PlayerScore_Sort(score_dummyfield, 0, 0, 0);
        PlayerScore_Sort(scoreboard_pos, 1, 1, 1);
+       if(teamplay)
+               PlayerScore_TeamStats();
        FOR_EACH_CLIENT(p)
        {
                // add personal score rank