Merge branch 'master' into Mario/turrets

[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 080f891f4ece6ca1f76bb93c97aef426decba311..ca40a93e8d9415a5984ce96d59b70fb532adca78 100644 (file)
--- a/qcsrc/server/vehicles/vehicles_def.qh
+++ b/qcsrc/server/vehicles/vehicles_def.qh
@@ -1,8 +1,6 @@
 #ifndef VEHICLES_DEF_H
 #define VEHICLES_DEF_H
 
-#include "../tturrets/include/turrets_early.qh"
-
 // #define VEHICLES_USE_ODE
 #define VEHICLES_ENABLED
 #ifdef VEHICLES_ENABLED
@@ -52,6 +50,10 @@ const float VOL_VEHICLEENGINE = 1;
 .float  vehicle_respawntime;
 //.void() vehicle_spawn;
 
+.float volly_counter;
+
+.float tur_health;
+
 void vehicles_exit(float eject);
 .void(float exit_flags) vehicle_exit;
 const float VHEF_NORMAL = 0;  /// User pressed exit key