X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fwaypointsprites.qc;h=2066aec68c7dd189bfcd8c30e48f27b8f94f4ce9;hb=f2debcdc74dfbfa8065e9d763df84e867c58b9f4;hp=78ddc8b793c22f4b080100ace1df2a94538979be;hpb=2d2a167c9d4f4ffd8f4234309c936d99e842869b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc index 78ddc8b79..2066aec68 100644 --- a/qcsrc/client/waypointsprites.qc +++ b/qcsrc/client/waypointsprites.qc @@ -256,6 +256,7 @@ string spritelookuptext(string s) case "as-defend": return _("Defend"); case "bluebase": return _("Blue base"); case "danger": return _("DANGER"); + case "enemyflagcarrier": return _("Enemy carrier"); case "flagcarrier": return _("Flag carrier"); case "flagdropped": return _("Dropped flag"); case "helpme": return _("Help me!"); @@ -422,7 +423,7 @@ void Draw_WaypointSprite() spriteimage = self.netname; break; case SPRITERULE_TEAMPLAY: - if(t == COLOR_SPECTATOR + 1) + if(t == NUM_SPECTATOR + 1) spriteimage = self.netname3; else if(self.team == t) spriteimage = self.netname2; @@ -595,6 +596,7 @@ void Draw_WaypointSprite() if(autocvar_g_waypointsprite_uppercase) txt = strtoupper(txt); + draw_beginBoldFont(); if(self.health >= 0) { o = drawspritetext(o, ang, (SPRITE_HEALTHBAR_WIDTH + 2 * SPRITE_HEALTHBAR_BORDER) * t, rgb, a, waypointsprite_fontsize * '1 1 0', txt); @@ -630,6 +632,7 @@ void Draw_WaypointSprite() { o = drawspritetext(o, ang, 0, rgb, a, waypointsprite_fontsize * '1 1 0', txt); } + draw_endBoldFont(); } void Ent_RemoveWaypointSprite() @@ -653,6 +656,7 @@ void Ent_WaypointSprite() self.draw2d = Draw_WaypointSprite; InterpolateOrigin_Undo(); + self.iflags |= IFLAG_ORIGIN; if(sendflags & 0x80) { @@ -685,6 +689,7 @@ void Ent_WaypointSprite() self.origin_x = ReadCoord(); self.origin_y = ReadCoord(); self.origin_z = ReadCoord(); + setorigin(self, self.origin); } if(sendflags & 1)