From: terencehill <piuntn@gmail.com>
Date: Fri, 26 Nov 2010 18:59:49 +0000 (+0100)
Subject: The caller of DrawNumIcon should set drawfont
X-Git-Tag: xonotic-v0.5.0~382
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63c67a1f78606bc0e9e229a639ff2c586362c0a3;p=xonotic%2Fxonotic-data.pk3dir.git

The caller of DrawNumIcon should set drawfont
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 8883e3953..cfe83a2d6 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2042,13 +2042,11 @@ void DrawNumIcon(vector myPos, vector mySize, float x, string icon, float vertic
 
 		newSize_y /= 2;
 		drawpic_aspect_skin(picpos, icon, newSize, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
-		drawfont = hud_bigfont;
 		// make number smaller than icon, it looks better
 		// reduce only y to draw numbers with different number of digits with the same y size
 		numpos_y += newSize_y * ((1 - 0.7) / 2);
 		newSize_y *= 0.7;
 		drawstring_aspect(numpos, ftos(x), newSize, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
-		drawfont = hud_font;
 		return;
 	}
 
@@ -2080,9 +2078,7 @@ void DrawNumIcon(vector myPos, vector mySize, float x, string icon, float vertic
 		picpos = newPos;
 	}
 
-	drawfont = hud_bigfont;
 	drawstring_aspect(numpos, ftos(x), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
-	drawfont = hud_font;
 	drawpic_aspect_skin(picpos, icon, '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
 }