Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

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

diff --git a/qcsrc/server/playerstats.qh b/qcsrc/server/playerstats.qh
index d02a8f23c9b4d2bbab0c9958828b99355eb167d3..445d6f31cc66028fe2e318e66363dc8f6fa23f96 100644 (file)
--- a/qcsrc/server/playerstats.qh
+++ b/qcsrc/server/playerstats.qh
@@ -1,72 +1,12 @@
 // time the player was alive and kicking
 string PLAYERSTATS_ALIVETIME  = "alivetime";
+string PLAYERSTATS_AVGLATENCY = "avglatency";
 string PLAYERSTATS_WINS = "wins";
 string PLAYERSTATS_MATCHES = "matches";
 string PLAYERSTATS_JOINS = "joins";
 string PLAYERSTATS_SCOREBOARD_VALID = "scoreboardvalid";
 string PLAYERSTATS_RANK = "rank";
-
-string PLAYERSTATS_ACC_LASER_HIT = "acc-laser-hit";
-string PLAYERSTATS_ACC_LASER_FIRED = "acc-laser-fired";
-string PLAYERSTATS_ACC_SHOTGUN_HIT = "acc-sg-hit";
-string PLAYERSTATS_ACC_SHOTGUN_FIRED = "acc-sg-fired";
-string PLAYERSTATS_ACC_UZI_HIT = "acc-uzi-hit";
-string PLAYERSTATS_ACC_UZI_FIRED = "acc-uzi-fired";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_HIT = "acc-gl-hit";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_FIRED = "acc-gl-fired";
-string PLAYERSTATS_ACC_ELECTRO_HIT = "acc-electro-hit";
-string PLAYERSTATS_ACC_ELECTRO_FIRED = "acc-electro-fired";
-string PLAYERSTATS_ACC_CRYLINK_HIT = "acc-crylink-hit";
-string PLAYERSTATS_ACC_CRYLINK_FIRED = "acc-crylink-fired";
-string PLAYERSTATS_ACC_NEX_HIT = "acc-nex-hit";
-string PLAYERSTATS_ACC_NEX_FIRED = "acc-nex-fired";
-string PLAYERSTATS_ACC_HAGAR_HIT = "acc-hagar-hit";
-string PLAYERSTATS_ACC_HAGAR_FIRED = "acc-hagar-fired";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_HIT = "acc-rl-hit";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_FIRED = "acc-rl-fired";
-string PLAYERSTATS_ACC_MINSTANEX_HIT = "acc-minstanex-hit";
-string PLAYERSTATS_ACC_MINSTANEX_FIRED = "acc-minstanex-fired";
-string PLAYERSTATS_ACC_SNIPERRIFLE_HIT = "acc-rifle-hit";
-string PLAYERSTATS_ACC_SNIPERRIFLE_FIRED = "acc-rifle-fired";
-string PLAYERSTATS_ACC_FIREBALL_HIT = "acc-fireball-hit";
-string PLAYERSTATS_ACC_FIREBALL_FIRED = "acc-fireball-fired";
-string PLAYERSTATS_ACC_MINE_LAYER_HIT = "acc-minelayer-hit";
-string PLAYERSTATS_ACC_MINE_LAYER_FIRED = "acc-minelayer-fired";
-string PLAYERSTATS_ACC_SEEKER_HIT = "acc-seeker-hit";
-string PLAYERSTATS_ACC_SEEKER_FIRED = "acc-seeker-fired";
-string PLAYERSTATS_ACC_TUBA_HIT = "acc-tuba-hit";
-string PLAYERSTATS_ACC_TUBA_FIRED = "acc-tuba-fired";
-
-string PLAYERSTATS_ACC_LASER_CNT_HIT = "acc-laser-cnt-hit";
-string PLAYERSTATS_ACC_LASER_CNT_FIRED = "acc-laser-cnt-fired";
-string PLAYERSTATS_ACC_SHOTGUN_CNT_HIT = "acc-sg-cnt-hit";
-string PLAYERSTATS_ACC_SHOTGUN_CNT_FIRED = "acc-sg-cnt-fired";
-string PLAYERSTATS_ACC_UZI_CNT_HIT = "acc-uzi-cnt-hit";
-string PLAYERSTATS_ACC_UZI_CNT_FIRED = "acc-uzi-cnt-fired";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_CNT_HIT = "acc-gl-cnt-hit";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_CNT_FIRED = "acc-gl-cnt-fired";
-string PLAYERSTATS_ACC_ELECTRO_CNT_HIT = "acc-electro-cnt-hit";
-string PLAYERSTATS_ACC_ELECTRO_CNT_FIRED = "acc-electro-cnt-fired";
-string PLAYERSTATS_ACC_CRYLINK_CNT_HIT = "acc-crylink-cnt-hit";
-string PLAYERSTATS_ACC_CRYLINK_CNT_FIRED = "acc-crylink-cnt-fired";
-string PLAYERSTATS_ACC_NEX_CNT_HIT = "acc-nex-cnt-hit";
-string PLAYERSTATS_ACC_NEX_CNT_FIRED = "acc-nex-cnt-fired";
-string PLAYERSTATS_ACC_HAGAR_CNT_HIT = "acc-hagar-cnt-hit";
-string PLAYERSTATS_ACC_HAGAR_CNT_FIRED = "acc-hagar-cnt-fired";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_CNT_HIT = "acc-rl-cnt-hit";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_CNT_FIRED = "acc-rl-cnt-fired";
-string PLAYERSTATS_ACC_MINSTANEX_CNT_HIT = "acc-minstanex-cnt-hit";
-string PLAYERSTATS_ACC_MINSTANEX_CNT_FIRED = "acc-minstanex-cnt-fired";
-string PLAYERSTATS_ACC_SNIPERRIFLE_CNT_HIT = "acc-rifle-cnt-hit";
-string PLAYERSTATS_ACC_SNIPERRIFLE_CNT_FIRED = "acc-rifle-cnt-fired";
-string PLAYERSTATS_ACC_FIREBALL_CNT_HIT = "acc-fireball-cnt-hit";
-string PLAYERSTATS_ACC_FIREBALL_CNT_FIRED = "acc-fireball-cnt-fired";
-string PLAYERSTATS_ACC_MINE_LAYER_CNT_HIT = "acc-minelayer-cnt-hit";
-string PLAYERSTATS_ACC_MINE_LAYER_CNT_FIRED = "acc-minelayer-cnt-fired";
-string PLAYERSTATS_ACC_SEEKER_CNT_HIT = "acc-seeker-cnt-hit";
-string PLAYERSTATS_ACC_SEEKER_CNT_FIRED = "acc-seeker-cnt-fired";
-string PLAYERSTATS_ACC_TUBA_CNT_HIT = "acc-tuba-cnt-hit";
-string PLAYERSTATS_ACC_TUBA_CNT_FIRED = "acc-tuba-cnt-fired";
+string PLAYERSTATS_SCOREBOARD_POS = "scoreboardpos";
 
 string PLAYERSTATS_TOTAL = "total-";
 string PLAYERSTATS_SCOREBOARD = "scoreboard-";
@@ -98,7 +38,7 @@ void PlayerStats_AddTeam(float t);
 void PlayerStats_AddEvent(string event_id);
 
 // call on each event to track, or at player disconnect OR match end for "global stuff"
-void PlayerStats_Event(entity e, string event_id, float value);
+float PlayerStats_Event(entity e, string event_id, float value);
 
 // add a team score
 void PlayerStats_TeamScore(float t, string event_id, float value);
@@ -106,9 +46,6 @@ void PlayerStats_TeamScore(float t, string event_id, float value);
 // call at game over
 void PlayerStats_Shutdown(); // send stats to the server
 
-// URI GET callback
-void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data);
-
 // call this whenever a player leaves
 void PlayerStats_AddGlobalInfo(entity p);