aboutsummaryrefslogtreecommitdiff
path: root/src/library_sdl.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-03-24 16:48:32 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-03-24 16:48:32 -0700
commit31c060ef9de2097a344ccccae0c47f95ecc0e19b (patch)
tree4355a191808e9455e4235e68d30538888d422e3d /src/library_sdl.js
parent1fec3101dd42c568e17b9d8d3a32228f514625d4 (diff)
misc sdl stuff
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r--src/library_sdl.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index 9ba78ae2..d346facd 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -548,7 +548,7 @@ mergeInto(LibraryManager.library, {
},
SDL_FreeSurface: function(surf) {
- SDL.freeSurface(surf);
+ if (surf) SDL.freeSurface(surf);
},
SDL_UpperBlit: function(src, srcrect, dst, dstrect) {
@@ -766,6 +766,8 @@ mergeInto(LibraryManager.library, {
Mix_FadeInMusicPos: 'Mix_PlayMusic', // XXX ignore fading in effect
+ Mix_FadeOutMusic: function(id) {}, // TODO
+
// SDL TTF
TTF_Init: function() { return 0 },
@@ -866,6 +868,11 @@ mergeInto(LibraryManager.library, {
SDL_NumJoysticks: function() { return 0 },
+ SDL_RWFromFile__deps: ['fopen'],
+ SDL_RWFromFile: function(filename, mode) {
+ return _fopen(filename, mode);
+ },
+
SDL_EnableUNICODE: function(on) {
var ret = SDL.unicode || 0;
SDL.unicode = on;