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

Pass cv_font to get_centered_x

Browse source
This commit is contained in:
Kp 2016-02-12 04:02:28 +00:00
parent a92ab4079f
commit 6edab5ca0a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
similar/2d/font.cpp
View file

@ -162,9 +162,8 @@ static get_char_width_result<T> get_char_width(const grs_font &cv_font, const ui
return {width, width};
}
static int get_centered_x(const char *s)
static int get_centered_x(const grs_font &cv_font, const char *s)
{
const auto &cv_font = *grd_curcanv->cv_font;
float w;
for (w=0;*s!=0 && *s!='\n';s++) {
if (*s<=0x06) {
@ -224,7 +223,7 @@ static int gr_internal_string0_template(int x, int y, const char *s)
next_row = NULL;
if (x==0x8000) { //centered
int xx = get_centered_x(text_ptr1);
int xx = get_centered_x(cv_font, text_ptr1);
VideoOffset1 = y * ROWSIZE + xx;
}
@ -377,7 +376,7 @@ static int gr_internal_color_string(int x, int y, const char *s )
xx = x;
if (xx==0x8000) //centered
xx = get_centered_x(text_ptr);
xx = get_centered_x(cv_font, text_ptr);
while (*text_ptr)
{
@ -636,7 +635,7 @@ static int ogl_internal_string(int x, int y, const char *s )
xx = x;
if (xx==0x8000) //centered
xx = get_centered_x(text_ptr);
xx = get_centered_x(cv_font, text_ptr);
while (*text_ptr)
{
@ -1099,7 +1098,7 @@ static int gr_internal_string_clipped_template(int x, int y, const char *s)
x = x1;
if (x==0x8000) //centered
x = get_centered_x(text_ptr1);
x = get_centered_x(cv_font, text_ptr1);
last_x = x;