From c11ec1916be586704cd822dc3356273cf7de839d Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 5 Feb 2018 17:39:27 +1000 Subject: [PATCH] Clean up the sprite drawing code a little so it isn't duplicated as much --- .../mutator/waypoints/waypointsprites.qc | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc index c2f8f298e..720d92a57 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc @@ -695,10 +695,13 @@ void Draw_WaypointSprite(entity this) txt = strtoupper(txt); } + float txt_offset = 0; + vector icon_offset; + draw_beginBoldFont(); if (this.health >= 0) { - float align, marg; + float align = 0, marg; if (this.build_finished) align = 0.5; else @@ -725,18 +728,17 @@ void Draw_WaypointSprite(entity this) DRAWFLAG_NORMAL ); - if(autocvar_g_waypointsprite_text || !icon_found) - o = drawspritetext(o, ang, (SPRITE_HEALTHBAR_WIDTH + 2 * SPRITE_HEALTHBAR_BORDER) * t, rgb, a, waypointsprite_fontsize * '1 1 0', txt); - else - drawpic(o - vec2(autocvar_g_waypointsprite_iconsize/2, autocvar_g_waypointsprite_iconsize*t + 2*marg + SPRITE_HEALTHBAR_HEIGHT*t), pic, '1 1 0'*autocvar_g_waypointsprite_iconsize, iconcolor, a, DRAWFLAG_NORMAL); + txt_offset = (SPRITE_HEALTHBAR_WIDTH + 2 * SPRITE_HEALTHBAR_BORDER) * t; + icon_offset = vec2(autocvar_g_waypointsprite_iconsize/2, autocvar_g_waypointsprite_iconsize*t + 2*marg + SPRITE_HEALTHBAR_HEIGHT*t); } else - { - if (autocvar_g_waypointsprite_text || !icon_found) - o = drawspritetext(o, ang, 0, rgb, a, waypointsprite_fontsize * '1 1 0', txt); - else - drawpic(o - vec2(autocvar_g_waypointsprite_iconsize/2, autocvar_g_waypointsprite_iconsize*t + 2 + SPRITE_HEALTHBAR_HEIGHT*t), pic, '1 1 0'*autocvar_g_waypointsprite_iconsize, iconcolor, a, DRAWFLAG_NORMAL); - } + icon_offset = vec2(autocvar_g_waypointsprite_iconsize/2, autocvar_g_waypointsprite_iconsize*t + 2 + SPRITE_HEALTHBAR_HEIGHT*t); + + if (autocvar_g_waypointsprite_text || !icon_found) + o = drawspritetext(o, ang, txt_offset, rgb, a, waypointsprite_fontsize * '1 1 0', txt); + else + drawpic(o - icon_offset, pic, '1 1 0'*autocvar_g_waypointsprite_iconsize, iconcolor, a, DRAWFLAG_NORMAL); + draw_endBoldFont(); } -- 2.39.2