fix antispam of hitsounds; fix shotgun and electro refire times with weapon rate...

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

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index 7da57f2c23102dc26ca4e73af96cce7387940e21..7904e30ef1efab3ce7ed4dba8214781522401020 100644 (file)
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -7,13 +7,14 @@ float playerstats_requested;
 void PlayerStats_Init()
 {
        string uri;
-       playerstats_sent = TRUE;
-       uri = cvar_string("g_playerstats_uri");
+       playerstats_db = -1;
+       playerstats_waitforme = TRUE;
+       uri = autocvar_g_playerstats_uri;
        if(uri == "")
                return;
        playerstats_db = db_create();
        if(playerstats_db >= 0)
-               playerstats_sent = FALSE; // must wait for it at match end
+               playerstats_waitforme = FALSE; // must wait for it at match end
        
        PlayerStats_AddEvent(PLAYERSTATS_ALIVETIME);
        PlayerStats_AddEvent(PLAYERSTATS_KILLS);
@@ -81,9 +82,10 @@ void PlayerStats_Event(entity e, string event_id, float value)
 void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data)
 {
        if(playerstats_requested)
-               playerstats_sent = TRUE;
+               playerstats_waitforme = TRUE;
 }
 
+//#NO AUTOCVARS START
 void PlayerStats_Shutdown()
 {
        string p, pn;
@@ -96,7 +98,7 @@ void PlayerStats_Shutdown()
        if(playerstats_db < 0)
                return;
 
-       uri = cvar_string("g_playerstats_uri");
+       uri = autocvar_g_playerstats_uri;
        if(uri != "")
        {
                b = buf_create();
@@ -108,6 +110,8 @@ void PlayerStats_Shutdown()
                bufstr_set(b, i++, sprintf("T %s.%06d", strftime(FALSE, "%s"), floor(random() * 1000000)));
                bufstr_set(b, i++, sprintf("G %s", GetGametype()));
                bufstr_set(b, i++, sprintf("M %s", GetMapname()));
+               bufstr_set(b, i++, sprintf("S %s", cvar_string("hostname")));
+               bufstr_set(b, i++, sprintf("C %d", cvar_purechanges_count));
                for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
                {
                        bufstr_set(b, i++, sprintf("P %s", p));
@@ -126,16 +130,17 @@ void PlayerStats_Shutdown()
                if(crypto_uri_postbuf(uri, URI_GET_PLAYERSTATS_SENT, "text/plain", "\n", b, 0))
                        playerstats_requested = TRUE;
                else
-                       playerstats_sent = TRUE; // if posting fails, we must continue anyway
+                       playerstats_waitforme = TRUE; // if posting fails, we must continue anyway
 
                buf_del(b);
        }
        else
-               playerstats_sent = TRUE;
+               playerstats_waitforme = TRUE;
 
        db_close(playerstats_db);
        playerstats_db = -1;
 }
+//#NO AUTOCVARS END
 
 void PlayerStats_AddGlobalInfo(entity p)
 {
@@ -149,6 +154,6 @@ void PlayerStats_AddGlobalInfo(entity p)
        if(p.alivetime)
                PlayerStats_Event(p, PLAYERSTATS_ALIVETIME, time - p.alivetime);
        
-       if(p.cvar_cl_allow_uid2name)
+       if(p.cvar_cl_allow_uid2name == 1)
                db_put(playerstats_db, sprintf("%s:_netname", p.crypto_idfp), p.netname);
 }