TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix potential canvas.cv_font / cv_font inconsistency in gr_ustring

Browse source 
A prior conversion changed the actual rendering to use the argument
cv_font, but still picked which render function to use based on the
flags for the active font.  Switch to use only the supplied font.
This commit is contained in:
Kp 2020-12-27 22:03:09 +00:00
parent a4f41f8360
commit aaf4629c05
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
similar/2d/font.cpp
View file

@ -766,9 +766,8 @@ void gr_ustring(grs_canvas &canvas, const grs_font &cv_font, const int x, const
}
#endif
if (canvas.cv_font->ft_flags & FT_COLOR) {
if (cv_font.ft_flags & FT_COLOR)
gr_internal_color_string(canvas, cv_font, x, y, s);
}
else
gr_ustring_mono(canvas, cv_font, x, y, s);
}