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

Pass canvas to gr_internal_string0{,m}

Browse source
This commit is contained in:
Kp 2017-01-08 22:31:59 +00:00
parent f0ee7af1aa
commit 83e86707aa
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
similar/2d/font.cpp
View file

@ -335,14 +335,14 @@ static int gr_internal_string0_template(grs_canvas &canvas, const int x, int y,
return 0;
}
static int gr_internal_string0(int x, int y, const char *s )
static int gr_internal_string0(grs_canvas &canvas, const int x, const int y, const char *const s)
{
return gr_internal_string0_template<true>(*grd_curcanv, x, y, s);
return gr_internal_string0_template<true>(canvas, x, y, s);
}
static int gr_internal_string0m(int x, int y, const char *s )
static int gr_internal_string0m(grs_canvas &canvas, const int x, const int y, const char *const s)
{
return gr_internal_string0_template<false>(*grd_curcanv, x, y, s);
return gr_internal_string0_template<false>(canvas, x, y, s);
}
#if !DXX_USE_OGL
@ -702,9 +702,9 @@ static void gr_ustring_mono(int x, int y, const char *s)
{
case bm_mode::linear:
if (grd_curcanv->cv_font_bg_color == -1)
gr_internal_string0m(x, y, s);
gr_internal_string0m(*grd_curcanv, x, y, s);
else
gr_internal_string0(x, y, s);
gr_internal_string0(*grd_curcanv, x, y, s);
}
}