Skip to content

Commit 712e5b9

Browse files
committed
sbar.c: rename CHAR_WIDTH to QCHAR_WIDTH to avoid shadowing
1 parent e867cc6 commit 712e5b9

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

engine/client/sbar.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ static mpic_t *Sbar_Q2CachePic(char *name)
335335

336336
#define ICON_WIDTH 24
337337
#define ICON_HEIGHT 24
338-
#define CHAR_WIDTH 16
338+
#define QCHAR_WIDTH 16
339339
#define ICON_SPACE 8
340340
static void SCR_DrawField (float x, float y, int color, float width, int value)
341341
{
@@ -356,7 +356,7 @@ static void SCR_DrawField (float x, float y, int color, float width, int value)
356356
l = strlen(num);
357357
if (l > width)
358358
l = width;
359-
x += 2 + CHAR_WIDTH*(width - l);
359+
x += 2 + QCHAR_WIDTH*(width - l);
360360

361361
ptr = num;
362362
while (*ptr && l)
@@ -369,7 +369,7 @@ static void SCR_DrawField (float x, float y, int color, float width, int value)
369369
p = Sbar_Q2CachePic(q2sb_nums[color][frame]);
370370
if (p && R_GetShaderSizes(p, &pw, &ph, false)>0)
371371
R2D_ScalePic (x,y,pw, ph, p);
372-
x += CHAR_WIDTH;
372+
x += QCHAR_WIDTH;
373373
ptr++;
374374
l--;
375375
}

0 commit comments

Comments
 (0)