Merge branch 'master' into zykure/teamscores

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index a6e3d61e96824c813394cad6125eb98f8f3c95ce..f6fc8a6a739846bcd5ae80585ff2c93baf2eb575 100644 (file)
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -99,7 +99,7 @@ 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;
@@ -159,7 +159,7 @@ 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?
+void PlayerStats_TeamScore(float t, string event_id, float value)
 {
        string key;
        float val;
@@ -217,6 +217,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;
@@ -238,6 +239,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 +398,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

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 28715147bd7138cd41e86e0e8d87eca051864ffa..347dc0fe6ec172f921fc97c3a9b0600ef4d70684 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -927,6 +927,7 @@ void PlayerScore_TeamStats(void)
                for(i = 0; i < MAX_TEAMSCORE; ++i)
                        if(sk.(teamscores[i]) != 0)
                                if(teamscores_label[i] != "")
-                                       PlayerStats_TeamScore(t, strcat(PLAYERSTATS_SCOREBOARD, teamscores_label[i]), sk.(teamscores[i]));
+                                       // the +1 is important here!
+                                       PlayerStats_TeamScore(t+1, strcat(PLAYERSTATS_SCOREBOARD, teamscores_label[i]), sk.(teamscores[i]));
        }
 }