AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-24 04:29:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

properly calculate maximum HUD text line length

Browse Source 
Fixes #1192, thanks @MrAlaux
This commit is contained in:
Fabian Greffrath 2023-08-30 21:41:03 +02:00
parent 3464ee75a1
commit 275b5e73f1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hu_lib.c
View File

@ -26,17 +26,22 @@
// [FG] horizontal alignment
#define HU_GAPX 2
static int left_margin, right_margin;
static int left_margin, right_margin, max_width;
int hud_widescreen_widgets;
void HUlib_set_margins (void)
{
left_margin = HU_GAPX;
max_width = SCREENWIDTH - WIDESCREENDELTA - 2 * HU_GAPX;
if (hud_widescreen_widgets)
{
left_margin -= WIDESCREENDELTA;
}
else
{
max_width -= WIDESCREENDELTA;
}
right_margin = ORIGWIDTH - left_margin;
}
@ -331,20 +336,22 @@ static void draw_line_aligned (const hu_multiline_t *m, const hu_line_t *l, cons
{
int w = SHORT(p[c-HU_FONTSTART]->width);
if (x+w > SCREENWIDTH)
if (x+w >= max_width)
break;
// killough 1/18/98 -- support multiple lines:
V_DrawPatchTranslated(x, y, 0, p[c-HU_FONTSTART], cr);
x += w;
}
else if ((x += f->space_width) >= SCREENWIDTH)
else if ((x += f->space_width) >= max_width)
break;
}
// draw the cursor if requested
// killough 1/18/98 -- support multiple lines
if (m->drawcursor && (leveltime & 16))
if (m->drawcursor &&
x + SHORT(p['_'-HU_FONTSTART]->width) < max_width &&
leveltime & 16)
{
cr = m->cr; //jff 2/17/98 restore original color
V_DrawPatchTranslated(x, y, 0, p['_' - HU_FONTSTART], cr);