Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

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

diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh
index ed7bd15dda55b64e509121b5611065c16109d7e7..f1d3890447140399b4206ac232694483aa42c1b1 100644 (file)
--- a/qcsrc/server/vehicles/vehicles_def.qh
+++ b/qcsrc/server/vehicles/vehicles_def.qh
@@ -26,7 +26,9 @@ float VHF_PLAYERSLOT    = 16384;    /// This ent is a player slot on a multi-per
 .entity vehicle_viewport;
 .entity vehicle_hudmodel;
 .entity vehicle_controller;
-.entity vehicle_pilot;
+
+.entity gunner1;
+.entity gunner2;
 
 .float vehicle_health;      /// If self is player this is 0..100 indicating precentage of health left on vehicle. If self is vehile, this is the real health value.
 .float vehicle_energy;      /// If self is player this is 0..100 indicating precentage of energy left on vehicle. If self is vehile, this is the real energy value.
@@ -60,7 +62,6 @@ var .void() vehicle_die;    /// Vehicles custom function to be executed when veh
 #define VHSF_NORMAL 0
 #define VHSF_FACTORY 2
 var .void(float _spawnflag) vehicle_spawn;  /// Vehicles custom fucntion to be efecuted when vehicle (re)spawns
-const var .float(float _imp) vehicles_impusle_null;
 var .float(float _imp) vehicles_impusle;
 .float vehicle_weapon2mode = volly_counter;