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

Move bitmap clipping to eliminate warning

Browse source
This commit is contained in:
Kp 2013-06-23 04:34:40 +00:00
parent 7885199dbd
commit d78fd3561b
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/2d/bitblt.c
View file

@ -388,27 +388,23 @@ void gr_bitmap( int x, int y, grs_bitmap *bm )
if ((dx1 >= grd_curcanv->cv_bitmap.bm_w ) || (dx2 < 0)) return;
if ((dy1 >= grd_curcanv->cv_bitmap.bm_h) || (dy2 < 0)) return;
// Draw bitmap bm[x,y] into (dx1,dy1)-(dx2,dy2)
#ifdef OGL
ogl_ubitmapm_cs(x, y, 0, 0, bm, -1, F1_0);
#else
if ( dx1 < 0 )
{
#ifndef OGL
sx = -dx1;
#endif
dx1 = 0;
}
if ( dy1 < 0 )
{
#ifndef OGL
sy = -dy1;
#endif
dy1 = 0;
}
if ( dx2 >= grd_curcanv->cv_bitmap.bm_w ) { dx2 = grd_curcanv->cv_bitmap.bm_w-1; }
if ( dy2 >= grd_curcanv->cv_bitmap.bm_h ) { dy2 = grd_curcanv->cv_bitmap.bm_h-1; }
// Draw bitmap bm[x,y] into (dx1,dy1)-(dx2,dy2)
#ifdef OGL
ogl_ubitmapm_cs(x, y, 0, 0, bm, -1, F1_0);
#else
gr_bm_ubitblt(dx2-dx1+1,dy2-dy1+1, dx1, dy1, sx, sy, bm, &grd_curcanv->cv_bitmap );
#endif
}