Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ancurio/mkxp 

Conflicts:
	src/tileatlasvx.cpp

I fucked up somehow.
This commit is contained in:
Jonas Kulla 2014-10-03 20:21:07 +02:00
parent c1d89e4f8d df73045d81
commit 18076c9ae4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tileatlasvx.cpp
View File

@ -277,7 +277,6 @@ static void doBlit(Bitmap *bm, const IntRect &src, const Vec2i &dst)
Vec2i _dst(dst.x*32, dst.y*32); Vec2i _dst(dst.x*32, dst.y*32);
IntRect bmr(0, 0, bm->width(), bm->height()); IntRect bmr(0, 0, bm->width(), bm->height());
/* Drop blit if source rect lies outside bitmap rect */
if (!SDL_IntersectRect(&_src, &bmr, &_src)) if (!SDL_IntersectRect(&_src, &bmr, &_src))
return; return;