aboutsummaryrefslogtreecommitdiff
path: root/src/library_sdl.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-07-11 17:07:06 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-07-11 17:07:06 -0700
commitf0fc07b881e1e7521c2277e755b5c8feb69af36c (patch)
tree5fcb9573193a093384262b71a5e953f912c8a384 /src/library_sdl.js
parent22735259a53cbcb321a680bb5bad9fa1a0fc1786 (diff)
parent81bbbc3de43d3ea898b1b964d7e5fb668fdf8622 (diff)
Merge pull request #508 from nandhp/master
Fix SDL_MapRGB and implement SDL_MapRGBA.
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r--src/library_sdl.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index 88649c38..73848502 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -952,7 +952,12 @@ var LibrarySDL = {
SDL_MapRGB: function(fmt, r, g, b) {
// Canvas screens are always RGBA
- return r + (g << 8) + (b << 16);
+ return 0xff+((b&0xff)<<8)+((g&0xff)<<16)+((r&0xff)<<24)
+ },
+
+ SDL_MapRGBA: function(fmt, r, g, b, a) {
+ // Canvas screens are always RGBA
+ return (a&0xff)+((b&0xff)<<8)+((g&0xff)<<16)+((r&0xff)<<24)
},
SDL_WM_GrabInput: function() {},