Merge remote branch 'origin/master' into fruitiex/animations

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 87ff757a9e42434669043f42c92511bf2d60cb78..e42dfe086ce50d67f8082d64867af7992c491cc6 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -149,6 +149,7 @@ float maxclients;
 .vector anim_backright; // player running backward and right
 .vector anim_backleft; // player running back and left
 .vector anim_melee; // player doing the melee action
 .vector anim_backright; // player running backward and right
 .vector anim_backleft; // player running back and left
 .vector anim_melee; // player doing the melee action

+.vector anim_fly; // player animation played after jump, if player is still in air. Also if falling from a ledge

 
 // weapon animation vectors:
 .vector anim_fire1;
 
 // weapon animation vectors:
 .vector anim_fire1;


@@ -597,7 +598,7 @@ float client_cefc_accumulatortime;
 
 ..float current_ammo;
 
 
 ..float current_ammo;
 

-.float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load);
+.float weapon_load[WEP_MAXCOUNT];

 .float ammo_none; // used by the reloading system, must always be 0
 .float clip_load;
 .float old_clip_load;
 .float ammo_none; // used by the reloading system, must always be 0
 .float clip_load;
 .float old_clip_load;