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 f91add3f1e81d970859c3d3a912c68017eb5300a..a495f036705874843ea21d755ba2daded058ef8c 100644 (file)
--- a/qcsrc/common/vehicles/cl_vehicles.qh
+++ b/qcsrc/common/vehicles/cl_vehicles.qh
@@ -1,10 +1,6 @@
 #ifndef CL_VEHICLES_H
 #define CL_VEHICLES_H
 
-// vehicle cvars
-bool autocvar_cl_vehicles_alarm = 1;
-bool autocvar_cl_vehicles_hud_tactical = 1;
-
 void Net_AuXair2(float bIsNew);
 
 void Net_VehicleSetup();
@@ -12,13 +8,6 @@ void Net_VehicleSetup();
 void RaptorCBShellfragDraw();
 void RaptorCBShellfragToss(vector _org, vector _vel, vector _ang);
 
-#define HUD_GETVEHICLESTATS \
-    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);
+#define weapon2mode getstati(STAT_VEHICLESTAT_W2MODE)
 
 #endif