Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/server/vehicles/vehicles.qh b/qcsrc/server/vehicles/vehicles.qh
index 4f17d4af7c2d7e481800ca387a12ae6131fbcd4a..e6b976096dc30d6dfa72dd807649864f9e8f6c2b 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qh
+++ b/qcsrc/server/vehicles/vehicles.qh
@@ -1,59 +1,14 @@
-#define VEHICLES_ENABLED
-#ifdef VEHICLES_ENABLED
-
-#message "with tZork vehicles (experimental)"
-
-float SVC_SETVIEWPORT   = 5;   // Net.Protocol 0x05
-float SVC_SETVIEWANGLES = 10;  // Net.Protocol 0x0A
-float SVC_UPDATEENTITY  = 128; // Net.Protocol 0x80
-
-//#define CCVAR(part) cvar(strcat(self.cvar_basename,part))
-//.string cvar_basename;
-
-.float vehicle_flags;
-#define VHF_HASSHIELD   2
-#define VHF_SHIELDREGEN 4
-#define VHF_HEALTHREGEN 8
-#define VHF_DEATHEJECT  16
-#define VHF_ENERGYREGEN 32
-
-.float hud;
-
-.entity gun1;
-.entity gun2;
-
-//.entity shield;
-
-.float vehicle_health;
-.float vehicle_shield;
-.float vehicle_energy;
-
-.float vehicle_ammo1;
-.float vehicle_reload1;
-
-.float vehicle_ammo2;
-.float vehicle_reload2;
-
-.entity vehicle;
-.entity vehicle_viewport;
-.entity vehicle_hudmodel;
-
-.float dmg_time;
-
-#define VHEF_NORMAL 0
-#define VHEF_EJECT  1
-#define VHEF_RELESE 2
-
-var .void(float exit_flags) vehicle_exit;
-var .void() vehicle_enter;
-var .void() vehicle_die;
-var .void() vehicle_spawn;
-//var .float(float message) vehicle_message;
+#ifndef VEHICLES_H
+#define VEHICLES_H
 
+#ifdef VEHICLES_ENABLED
 #include "vehicles.qc"
 
 #include "racer.qc"
 #include "spiderbot.qc"
 #include "raptor.qc"
-
+#ifndef VEHICLES_NO_UNSTABLE
+#include "bumblebee.qc"
+#endif
+#endif
 #endif