Merge branch 'master' into Lyberta/TeamplayOverhaul

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 9a01a79660e78dfd796e1fe6935ede8a8c9edf8b..d699d03af247583775901248108ee2c0ec7c184a 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -188,8 +188,6 @@ void FixClientCvars(entity e);
 // WEAPONTODO: remove this
 //WepSet weaponsInMap;
 
 // WEAPONTODO: remove this
 //WepSet weaponsInMap;
 

-#define weapons _STAT(WEAPONS)
-

 .float respawn_countdown; // next number to count
 
 float bot_waypoints_for_items;
 .float respawn_countdown; // next number to count
 
 float bot_waypoints_for_items;


@@ -319,6 +317,9 @@ float client_cefc_accumulatortime;
 .float vortex_charge;
 .float vortex_charge_rottime;
 .float vortex_chargepool_ammo;
 .float vortex_charge;
 .float vortex_charge_rottime;
 .float vortex_chargepool_ammo;

+.float oknex_charge;
+.float oknex_charge_rottime;
+.float oknex_chargepool_ammo;

 .int hagar_load;
 
 .int grab; // 0 = can't grab, 1 = owner can grab, 2 = owner and team mates can grab, 3 = anyone can grab
 .int hagar_load;
 
 .int grab; // 0 = can't grab, 1 = owner can grab, 2 = owner and team mates can grab, 3 = anyone can grab