FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2025-01-01 13:45:40 +01:00
Code Issues 2 Projects Releases Wiki Activity

engine: client: font: fix colorcodes, don't reset Colo4ub, it will be reset by consequent draw calls anyway

Browse Source
This commit is contained in:
Alibek Omarov 2023-02-03 18:20:02 +03:00
parent e2c2821191
commit bec0b36bb9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/client/cl_font.c
View File

@ -178,7 +178,6 @@ int CL_DrawCharacter( float x, float y, int number, rgba_t color, cl_font_t *fon
ref.dllFuncs.Color4ub( color[0], color[1], color[2], color[3] ); ref.dllFuncs.Color4ub( color[0], color[1], color[2], color[3] );
else ref.dllFuncs.Color4ub( 255, 255, 255, color[3] ); else ref.dllFuncs.Color4ub( 255, 255, 255, color[3] );
ref.dllFuncs.R_DrawStretchPic( x, y, w, h, s1, t1, s2, t2, font->hFontTexture ); ref.dllFuncs.R_DrawStretchPic( x, y, w, h, s1, t1, s2, t2, font->hFontTexture );
ref.dllFuncs.Color4ub( 255, 255, 255, 255 ); // don't forget reset color
return font->charWidths[number]; return font->charWidths[number];
} }
@ -214,7 +213,8 @@ int CL_DrawString( float x, float y, const char *s, rgba_t color, cl_font_t *fon
if( IsColorString( s )) if( IsColorString( s ))
{ {
if( FBitSet( flags, FONT_DRAW_FORCECOL )) // don't copy alpha
if( !FBitSet( flags, FONT_DRAW_FORCECOL ))
VectorCopy( g_color_table[ColorIndex(*( s + 1 ))], current_color ); VectorCopy( g_color_table[ColorIndex(*( s + 1 ))], current_color );
s += 2; s += 2;
@ -222,7 +222,7 @@ int CL_DrawString( float x, float y, const char *s, rgba_t color, cl_font_t *fon
} }
// skip setting rendermode, it was changed for this string already // skip setting rendermode, it was changed for this string already
draw_len += CL_DrawCharacter( x + draw_len, y, (byte)*s, color, font, flags | FONT_DRAW_NORENDERMODE ); draw_len += CL_DrawCharacter( x + draw_len, y, (byte)*s, current_color, font, flags | FONT_DRAW_NORENDERMODE );
s++; s++;
} }