Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / cl_turrets.qc

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index 224f70377c17bed65233944dec3c4e3363d21f3f..2b4b2c0a43586270805d79eaa31005aa20d5ce27 100644 (file)
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -104,21 +104,13 @@ void turret_draw2d()
                o_z = 0;
                if(hud != HUD_NORMAL)
                {
-                       switch(hud)
-                       {
-                               case HUD_SPIDERBOT:
-                               case HUD_WAKIZASHI:
-                               case HUD_RAPTOR:
-                               case HUD_BUMBLEBEE:
-                                       if((get_turretinfo(self.turretid)).spawnflags & TUR_FLAG_MOVE)
-                                               txt = "gfx/vehicles/vth-mover.tga";
-                                       else
-                                               txt = "gfx/vehicles/vth-stationary.tga";
-
-                                       vector pz = drawgetimagesize(txt) * 0.25;
-                                       drawpic(o - pz * 0.5, txt, pz , '1 1 1', 0.75, DRAWFLAG_NORMAL);
-                                       break;
-                       }
+                       if((get_turretinfo(self.turretid)).spawnflags & TUR_FLAG_MOVE)
+                               txt = "gfx/vehicles/vth-mover.tga";
+                       else
+                               txt = "gfx/vehicles/vth-stationary.tga";
+
+                       vector pz = drawgetimagesize(txt) * 0.25;
+                       drawpic(o - pz * 0.5, txt, pz , '1 1 1', 0.75, DRAWFLAG_NORMAL);
                }
        }
 
@@ -138,7 +130,7 @@ void turret_draw2d()
        if(rgb == '0 0 0')
        {
                self.teamradar_color = '1 0 1';
-               print(sprintf("WARNING: sprite of name %s has no color, using pink so you notice it\n", spriteimage));
+               printf("WARNING: sprite of name %s has no color, using pink so you notice it\n", spriteimage);
        }
 
        txt = self.netname;