]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix a couple of leftovers from bad merges
authorMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 10:01:52 +0000 (20:01 +1000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 10:01:52 +0000 (20:01 +1000)
qcsrc/client/tturrets.qc
qcsrc/common/vehicles/cl_vehicles.qc

index 6fe073e27e29e954c0d675ae40f4fcf2fe67106c..d469fdcca07bf322316c0a9717d58d4d0937464f 100644 (file)
@@ -280,9 +280,9 @@ void turret_draw2d()
         if(hud != HUD_NORMAL)
         {        
                        if(self.turret_type == TID_EWHEEL || self.turret_type == TID_WALKER)
-                               txt = "gfx/vehicles/vth-mover.tga";
+                               txt = "gfx/vehicles/turret_moving.tga";
                        else
-                               txt = "gfx/vehicles/vth-stationary.tga";
+                               txt = "gfx/vehicles/turret_stationary.tga";
 
                        vector pz = drawgetimagesize(txt) * autocvar_cl_vehicles_crosshair_size;
                        drawpic(o - pz * 0.5, txt, pz , '1 1 1', 0.7, DRAWFLAG_NORMAL);
index 65f050f3b82bcc9295e15d1b42801a3e6f67998c..2511defb43860a8baa577b13aed7884329d601cf 100644 (file)
@@ -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;