diff options
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index e40966f6b0..8972234f9e 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -89,12 +89,7 @@ void OSystem_SDL::initBackend() { assert(!_inited); int joystick_num = ConfMan.getInt("joystick_num"); - joystick_num = 0; -#if !defined(TFMX_CMDLINE_TOOL) && !defined(MXTX_CMDLINE_TOOL) - uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; -#else - uint32 sdlFlags = /*SDL_INIT_VIDEO |*/ SDL_INIT_AUDIO | SDL_INIT_TIMER; -#endif + uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; if (ConfMan.hasKey("disable_sdl_parachute")) sdlFlags |= SDL_INIT_NOPARACHUTE; @@ -113,11 +108,10 @@ void OSystem_SDL::initBackend() { error("Could not initialize SDL: %s", SDL_GetError()); } - _graphicsMutex = createMutex(); -#if !defined(TFMX_CMDLINE_TOOL) && !defined(MXTX_CMDLINE_TOOL) + SDL_ShowCursor(SDL_DISABLE); - + // Enable unicode support if possible SDL_EnableUNICODE(1); @@ -169,7 +163,7 @@ void OSystem_SDL::initBackend() { _savefile = new DefaultSaveFileManager(); #endif } -#endif + // Create and hook up the mixer, if none exists yet (we check for this to // allow subclasses to provide their own). if (_mixer == 0) { |