diff options
author | Alon Zakai <alonzakai@gmail.com> | 2014-01-03 15:16:17 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-03 15:16:17 -0800 |
commit | 8478d6aee54d6c52de16d8c58309534afbf5bf9e (patch) | |
tree | bec73fd8e0cd6888d2dfb6b9e6a1423cc2432f61 /src/library_sdl.js | |
parent | 1a007b1631509b9d72499a8f4402294017ee04dc (diff) | |
parent | a8e26049c1a72fa6b19dac45fa2b44616f94241a (diff) |
Merge branch 'incoming'
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r-- | src/library_sdl.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js index 40e5e3ab..1c1e8107 100644 --- a/src/library_sdl.js +++ b/src/library_sdl.js @@ -1220,6 +1220,7 @@ var LibrarySDL = { if (surf) SDL.freeSurface(surf); }, + SDL_UpperBlit__deps: ['SDL_LockSurface'], SDL_UpperBlit: function(src, srcrect, dst, dstrect) { var srcData = SDL.surfaces[src]; var dstData = SDL.surfaces[dst]; @@ -1247,10 +1248,7 @@ var LibrarySDL = { return 0; }, - SDL_LowerBlit__deps: ['SDL_UpperBlit'], - SDL_LowerBlit: function(src, srcrect, dst, dstrect) { - return _SDL_UpperBlit(src, srcrect, dst, dstrect); - }, + SDL_LowerBlit: 'SDL_UpperBlit', SDL_FillRect: function(surf, rect, color) { var surfData = SDL.surfaces[surf]; |