Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc
index 30b115095b05300ccaf0347003bc52e61418b9fd..f15829d574a4a90b232a94f72cbba7d67291eafb 100644 (file)
--- a/qcsrc/common/vehicles/cl_vehicles.qc
+++ b/qcsrc/common/vehicles/cl_vehicles.qc
@@ -18,7 +18,7 @@ var float autocvar_cl_vehicles_hudalpha = 0.75;
 
 void CSQC_BUMBLE_GUN_HUD();
 
-#define MAX_AXH 4
+const float MAX_AXH = 4;
 entity AuxiliaryXhair[MAX_AXH];
 
 .string axh_image;
@@ -35,7 +35,6 @@ entity AuxiliaryXhair[MAX_AXH];
 
 float alarm1time;
 float alarm2time;
-float weapon2mode;
 
 void vehicle_alarm(entity e, float ch, string s0und)
 {
@@ -92,18 +91,10 @@ void Net_AuXair2(float bIsNew)
 
 void Net_VehicleSetup()
 {
-
        float i;
 
        float hud_id = ReadByte();
 
-       // Weapon update?
-       if(hud_id > VEH_LAST && hud_id != HUD_BUMBLEBEE_GUN)
-       {
-               weapon2mode = hud_id - VEH_LAST;
-               return;
-       }
-
        // hud_id == 0 means we exited a vehicle, so stop alarm sound/s
        if(hud_id == 0)
        {