Merge remote-tracking branch 'origin/tzork/vehicles-2'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / waypointsprites.qc

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index fffc72485235682c8994514f595cf0a4af027013..3b5deca87134d8a4438e54a33fd76938a0bd0d05 100644 (file)
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -213,6 +213,7 @@ float spritelookupblinkvalue(string s)
                case "item-shueld":      return 2;
                case "item-fuelregen":   return 2;
                case "item-jetpack":     return 2;
+               case "tagged-target":    return 2;
                default:                 return 1;
        }
 }
@@ -293,6 +294,7 @@ string spritelookuptext(string s)
                case "item-jetpack": return _("Jet Pack");
                case "freezetag_frozen": return _("Frozen!");
                case "tagged-target": return _("Tagged");
+               case "vehicle": return _("Vehicle");
                default: return s;
        }
 }
@@ -428,7 +430,7 @@ void Draw_WaypointSprite()
        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")); 
+               print(sprintf("WARNING: sprite of name %s has no color, using pink so you notice it\n", spriteimage)); 
        }
 
        if(time - floor(time) > 0.5)
@@ -494,7 +496,13 @@ void Draw_WaypointSprite()
        }
        else
        {
+#if 1
                ang = M_PI;
+#else
+               vector d;
+               d = o - '0.5 0 0' * vid_conwidth - '0 0.5 0' * vid_conheight;
+               ang = atan2(-d_x, -d_y);
+#endif
        }
        o_z = 0;