Merge branch 'master' into Mario/stats_eloranking

[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 1368353bcb26a15b823c729138958b47bff5db0c..327074b98641e72631bbb3089ecc3829b008dca5 100644 (file)
--- a/qcsrc/common/vehicles/cl_vehicles.qh
+++ b/qcsrc/common/vehicles/cl_vehicles.qh
@@ -1,17 +1,9 @@
-// vehicle cvars
-var float autocvar_cl_vehicles_alarm = 1;
-var float autocvar_cl_vehicle_spiderbot_cross_alpha = 0.6;
-var float autocvar_cl_vehicle_spiderbot_cross_size = 1;
-var float autocvar_cl_vehicles_hud_tactical = 1;
+#pragma once
 
-void RaptorCBShellfragDraw();
+vector vehicleHud_Size;
+vector vehicleHud_Pos;
+
+void RaptorCBShellfragDraw(entity this);
 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);
+#define weapon2mode STAT(VEHICLESTAT_W2MODE)