Merge branch 'master' into mirceakitsune/universal_reload_system

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index d37af0d12a95a5a1e9cf4cd50f173dfb27b033c3..df80e703b7fe14dbd73c5f0c3148e34ff9a29d23 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -77,6 +77,7 @@ float maxclients;
 //.float       style;
 //.float       skill;
 .float sounds;
+.float  platmovetype;
 
 .string killtarget;
 
@@ -328,6 +329,7 @@ float sv_loddistance2;
 .string weaponorder_byimpulse;
 
 .float cvar_cl_allow_uid2name;
+.float cvar_cl_allow_uidtracking;
 .string stored_netname;
 
 void Announce(string snd);
@@ -603,6 +605,9 @@ string matchid;
 
 .float last_pickup;
 
+.float hit_time; 
+.float typehit_time; 
+
 .float stat_leadlimit;
 
 float radar_showennemies;
@@ -612,16 +617,14 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;
 #endif
 
+..float current_ammo;
+
 .float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load);
-.float zero_ammo; // used by the reloading system, must always be 0
+.float ammo_none; // used by the reloading system, must always be 0
 .float clip_load;
 .float old_clip_load;
 .float clip_size;
 
-..float reload_ammo_player;
-.float reload_ammo_amount, reload_ammo_min, reload_time;
-.string reload_sound;
-
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // when doing this, hagar can go through clones
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX