FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-29 05:20:23 +01:00
Code Issues 2 Projects Releases Wiki Activity

engine: client: make client string drawing functions ignore linefeeds

Browse Source
This commit is contained in:
Alibek Omarov 2023-02-04 20:58:33 +03:00
parent 2225915702
commit fd63018fb5
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/client/cl_font.c
View File

@ -270,8 +270,11 @@ void CL_DrawStringLen( cl_font_t *font, const char *s, int *width, int *height,
// but high chances somebody's relying on this
s++;
draw_len = 0;
if( height )
*height += font->charHeight;
if( !FBitSet( flags, FONT_DRAW_NOLF ))
{
if( height )
*height += font->charHeight;
}
}
if( IsColorString( s ))

12
engine/client/cl_game.c
View File

@ -1895,7 +1895,8 @@ void GAME_EXPORT pfnDrawConsoleStringLen( const char *pText, int *length, int *h
{
cl_font_t *font = Con_GetFont( con_fontsize->value );
CL_DrawStringLen( font, pText, length, height, FONT_DRAW_UTF8 | FONT_DRAW_HUD );
if( height ) *height = font->charHeight;
CL_DrawStringLen( font, pText, length, NULL, FONT_DRAW_UTF8 | FONT_DRAW_HUD );
}
/*
@ -2841,7 +2842,7 @@ pfnDrawString
static int GAME_EXPORT pfnDrawString( int x, int y, const char *str, int r, int g, int b )
{
rgba_t color = { r, g, b, 255 };
int flags = FONT_DRAW_HUD;
int flags = FONT_DRAW_HUD | FONT_DRAW_NOLF;
if( hud_utf8->value )
SetBits( flags, FONT_DRAW_UTF8 );
@ -2858,16 +2859,15 @@ pfnDrawStringReverse
static int GAME_EXPORT pfnDrawStringReverse( int x, int y, const char *str, int r, int g, int b )
{
rgba_t color = { r, g, b, 255 };
int flags = FONT_DRAW_HUD;
int width, height;
int flags = FONT_DRAW_HUD | FONT_DRAW_NOLF;
int width;
if( hud_utf8->value )
SetBits( flags, FONT_DRAW_UTF8 );
CL_DrawStringLen( &cls.creditsFont, str, &width, &height, flags );
CL_DrawStringLen( &cls.creditsFont, str, &width, NULL, flags );
x -= width;
y -= height;
return CL_DrawString( x, y, str, color, &cls.creditsFont, flags );
}