Merge branch 'TimePath/waypointsprites' into 'master'

[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 65f050f3b82bcc9295e15d1b42801a3e6f67998c..141f8fc42d59b5362e4e8bfad7712cc27c8c22fb 100644 (file)
--- a/qcsrc/common/vehicles/cl_vehicles.qc
+++ b/qcsrc/common/vehicles/cl_vehicles.qc
@@ -5,8 +5,6 @@ const string vCROSS_HEAL  = "gfx/vehicles/crosshair_heal.tga";
 const string vCROSS_HINT  = "gfx/vehicles/crosshair_hint.tga";
 const string vCROSS_LOCK  = "gfx/vehicles/crosshair_lock.tga";
 const string vCROSS_RAIN  = "gfx/vehicles/crosshair_rain.tga";
-const string vCROSS_TANK  = "gfx/vehicles/crosshair_tank.tga";
-const string vCROSS_TANK2 = "gfx/vehicles/crosshair_tank2.tga";
 
 entity dropmark;
 
@@ -297,7 +295,7 @@ void Vehicles_drawHUD(
        }
 
        // Bumblebee gunner crosshairs
-       if(hud == VEH_BUMBLEBEE)
+       if(hud == VEH_BUMBLEBEE.vehicleid)
        {
                tmpSize = '1 1 1' * hud_fontsize;
                tmpPos.x = hudPos.x + hudSize.x * (520/768);
@@ -316,7 +314,7 @@ void Vehicles_drawHUD(
        }
 
        // Raptor bomb crosshair
-       if(hud == VEH_RAPTOR && weapon2mode != RSM_FLARE)
+       if(hud == VEH_RAPTOR.vehicleid && weapon2mode != RSM_FLARE)
        {
                vector where;