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

Fuse gr_string test/add

Browse source
This commit is contained in:
Kp 2016-02-06 22:12:55 +00:00
parent 69b7693720
commit 5d9c64e8fc
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
similar/2d/font.cpp
View file

@ -708,23 +708,22 @@ void gr_string(const int x, const int y, const char *const s, const int w, const
{
Assert(grd_curcanv->cv_font != NULL);
if (y + h < 0)
return;
const auto bm_h = grd_curcanv->cv_bitmap.bm_h;
if (y > bm_h)
return;
const auto bm_w = grd_curcanv->cv_bitmap.bm_w;
int xw = w;
if ( x == 0x8000 ) {
if (y + h < 0)
return;
// for x, since this will be centered, only look at
// width.
} else {
if (x > bm_w)
return;
if (x + w < 0 ||
y + h < 0)
return;
xw += x;
if (xw < 0)
return;
}
if (
#ifdef OGL