Merge remote-tracking branch 'origin/master' into samual/mutator_ctf

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

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index 87220328fb8a58ba5aa435bbc274cdb6d62002aa..d1e851939012968e9e9b1407035bfc9b8e1e5686 100644 (file)
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -5,7 +5,7 @@ string events_last;
 .float playerstats_addedglobalinfo;
 .string playerstats_id;
 
-void PlayerStats_Init()
+void PlayerStats_Init() // initiated before InitGameplayMode so that scores are added properly
 {
        string uri;
        playerstats_db = -1;
@@ -17,7 +17,7 @@ void PlayerStats_Init()
        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_WINS);
@@ -124,7 +124,7 @@ void PlayerStats_AddEvent(string event_id)
 {
        if(playerstats_db < 0)
                return;
-       
+
        string key;
        key = sprintf("*:%s", event_id);
        
@@ -174,7 +174,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 
        The following keys are defined:
 
-       V: format version (always 1) - this MUST be the first line!
+       V: format version (always a fixed number) - this MUST be the first line!
        #: comment (MUST be ignored by any parser)
        R: release information on the server
        T: time at which the game ended
@@ -236,7 +236,7 @@ void PlayerStats_ready(entity fh, entity pass, float status)
        switch(status)
        {
                case URL_READY_CANWRITE:
-                       url_fputs(fh, "V 1\n");
+                       url_fputs(fh, "V 3\n");
 #ifdef WATERMARK
                        url_fputs(fh, sprintf("R %s\n", WATERMARK()));
 #endif
@@ -344,6 +344,7 @@ void PlayerStats_Accuracy(entity p)
 
         PlayerStats_Event(p, strcat("acc-", w.netname, "-frags"), a.(accuracy_frags[i-1]));
     }
+    //backtrace(strcat("adding player stat accuracy for ", p.netname, ".\n"));
 }
 
 void PlayerStats_AddGlobalInfo(entity p)
@@ -384,17 +385,13 @@ void PlayerStats_EndMatch(float finished)
        winner = PlayerScore_Sort(score_dummyfield);
        FOR_EACH_CLIENT(p) // spectators intentionally not included
        {
-               PlayerStats_Accuracy(p);
+               //PlayerStats_Accuracy(p); // stats are already written with PlayerStats_AddGlobalInfo(entity), don't double them up.
+               
                if(g_arena || g_lms || g_ca)
-               {
-                       if(p.alivetime <= 0)
-                               continue;
-               }
+                       if(p.alivetime <= 0) { continue; }
                else
-               {
-                       if(p.classname != "player")
-                               continue;
-               }
+                       if(p.classname != "player") { continue; }
+                       
                PlayerScore_PlayerStats(p);
                PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_VALID, 1);
                if(finished)