Merge branch 'master' into TimePath/experiments/csqc_prediction

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 4e48878fb218951389193e67fd71946e8007456a..474e859d3e16555849e17bd64497c9da63c724e1 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -82,7 +82,6 @@ float server_is_dedicated;
 
 .float pain_finished;                  //Added by Supajoe
 .float pain_frame;                     //"
 
 .float pain_finished;                  //Added by Supajoe
 .float pain_frame;                     //"

-.float statdraintime;                  // record the one-second intervals between draining health and armour when they're over 100

 .float  crouch;        // Crouching or not?
 
 .float strength_finished;
 .float  crouch;        // Crouching or not?
 
 .float strength_finished;


@@ -349,7 +348,6 @@ float next_pingtime;
                _VOICEMSG(death) \
                _VOICEMSG(drown) \
                _VOICEMSG(fall) \
                _VOICEMSG(death) \
                _VOICEMSG(drown) \
                _VOICEMSG(fall) \

-               _VOICEMSG(fall) \

                _VOICEMSG(falling) \
                _VOICEMSG(gasp) \
                _VOICEMSG(jump) \
                _VOICEMSG(falling) \
                _VOICEMSG(gasp) \
                _VOICEMSG(jump) \


@@ -483,8 +481,6 @@ void ClientData_Touch(entity e);
 
 float servertime, serverprevtime, serverframetime;
 
 
 float servertime, serverprevtime, serverframetime;
 

-.entity soundentity;
-

 .float ammo_fuel;
 
 .vector prevorigin;
 .float ammo_fuel;
 
 .vector prevorigin;


@@ -605,3 +601,12 @@ string modname;
 #define MISSILE_IS_CONFUSABLE(m) ((m.missile_flags & MIF_GUIDED_CONFUSABLE) ? TRUE : FALSE)
 #define MISSILE_IS_GUIDED(m) ((m.missile_flags & MIF_GUIDED_ALL) ? TRUE : FALSE)
 #define MISSILE_IS_TRACKING(m) ((m.missile_flags & MIF_GUIDED_TRACKING) ? TRUE : FALSE)
 #define MISSILE_IS_CONFUSABLE(m) ((m.missile_flags & MIF_GUIDED_CONFUSABLE) ? TRUE : FALSE)
 #define MISSILE_IS_GUIDED(m) ((m.missile_flags & MIF_GUIDED_ALL) ? TRUE : FALSE)
 #define MISSILE_IS_TRACKING(m) ((m.missile_flags & MIF_GUIDED_TRACKING) ? TRUE : FALSE)

+
+
+////
+
+.entity player_stats;
+//.float playerid;
+.string playernick;
+.float elos;
+.float ranks;