diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /backends/platform/sdl | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'backends/platform/sdl')
| -rw-r--r-- | backends/platform/sdl/macosx/macosx.cpp | 6 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp index ddfc99570a..d9de4e5e33 100644 --- a/backends/platform/sdl/macosx/macosx.cpp +++ b/backends/platform/sdl/macosx/macosx.cpp @@ -30,6 +30,7 @@ #include "backends/platform/sdl/macosx/macosx.h" #include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h" #include "backends/platform/sdl/macosx/appmenu_osx.h" +#include "backends/updates/macosx/macosx-updates.h" #include "common/archive.h" #include "common/config-manager.h" @@ -63,6 +64,11 @@ void OSystem_MacOSX::initBackend() { // Replace the SDL generated menu items with our own translated ones on Mac OS X replaceApplicationMenuItems(); +#ifdef USE_SPARKLE + // Initialize updates manager + _updateManager = new MacOSXUpdateManager(); +#endif + // Invoke parent implementation of this method OSystem_POSIX::initBackend(); } diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index d05cca4d1f..e72b95bdc1 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -472,7 +472,8 @@ uint32 OSystem_SDL::getMillis() { } void OSystem_SDL::delayMillis(uint msecs) { - SDL_Delay(msecs); + if (!g_eventRec.processDelayMillis(msecs)) + SDL_Delay(msecs); } void OSystem_SDL::getTimeAndDate(TimeDate &td) const { |