Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/common/vehicles/cl_vehicles.qh b/qcsrc/common/vehicles/cl_vehicles.qh
index 67701e4189d75bde9e362b43b74aa39255cb75bf..f91add3f1e81d970859c3d3a912c68017eb5300a 100644 (file)
--- a/qcsrc/common/vehicles/cl_vehicles.qh
+++ b/qcsrc/common/vehicles/cl_vehicles.qh
@@ -1,15 +1,24 @@
+#ifndef CL_VEHICLES_H
+#define CL_VEHICLES_H
+
 // vehicle cvars
-var float autocvar_cl_vehicles_alarm = 1;
-var float autocvar_cl_vehicles_hud_tactical = 1;
+bool autocvar_cl_vehicles_alarm = 1;
+bool autocvar_cl_vehicles_hud_tactical = 1;
+
+void Net_AuXair2(float bIsNew);
+
+void Net_VehicleSetup();
 
 void RaptorCBShellfragDraw();
 void RaptorCBShellfragToss(vector _org, vector _vel, vector _ang);
 
 #define HUD_GETVEHICLESTATS \
-       local noref float vh_health     = getstati(STAT_VEHICLESTAT_HEALTH); \
-       local noref float shield        = getstati(STAT_VEHICLESTAT_SHIELD); \
-       local noref float energy        = getstati(STAT_VEHICLESTAT_ENERGY); \
-       local noref float ammo1         = getstati(STAT_VEHICLESTAT_AMMO1); \
-       local noref float reload1       = getstati(STAT_VEHICLESTAT_RELOAD1); \
-       local noref float ammo2         = getstati(STAT_VEHICLESTAT_AMMO2); \
-       local noref float reload2       = getstati(STAT_VEHICLESTAT_RELOAD2);
+    int vh_health       = getstati(STAT_VEHICLESTAT_HEALTH);  \
+       float shield        = getstati(STAT_VEHICLESTAT_SHIELD);  \
+       noref int energy    = getstati(STAT_VEHICLESTAT_ENERGY);  \
+       noref float ammo1   = getstati(STAT_VEHICLESTAT_AMMO1);   \
+       noref float reload1 = getstati(STAT_VEHICLESTAT_RELOAD1); \
+       noref int ammo2     = getstati(STAT_VEHICLESTAT_AMMO2);   \
+       noref int reload2   = getstati(STAT_VEHICLESTAT_RELOAD2);
+
+#endif