From: TimePath Date: Sun, 27 Mar 2016 09:05:18 +0000 (+1100) Subject: hud: correctly identify icon_right_align as an int X-Git-Tag: xonotic-v0.8.2~995 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b34c9928b7ffaa29800572dc7d5c78e3b6427cc5;p=xonotic%2Fxonotic-data.pk3dir.git hud: correctly identify icon_right_align as an int --- diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 996055360..d89f31064 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -243,9 +243,9 @@ void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theA drawsubpic(pos + eX * mySize.x - eX * min(mySize.x * 0.5, mySize.y), eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0.75 0 0', '0.25 1 0', color, theAlpha, drawflag); } -void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp) +void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, int icon_right_align, vector color, float theAlpha, float fadelerp) { - TC(bool, vertical); TC(bool, icon_right_align); + TC(bool, vertical); TC(int, icon_right_align); vector newPos = '0 0 0', newSize = '0 0 0'; vector picpos, numpos; diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index 7664abc2f..d46b11db5 100644 --- a/qcsrc/client/hud/hud.qh +++ b/qcsrc/client/hud/hud.qh @@ -44,7 +44,7 @@ void HUD_Radar_Hide_Maximized(); float HUD_GetRowCount(int item_count, vector size, float item_aspect); vector HUD_Get_Num_Color (float x, float maxvalue); void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha); -void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp); +void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, int icon_right_align, vector color, float theAlpha, float fadelerp); void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag); vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect);