diff options
| author | Norbert Lange | 2009-06-09 14:46:20 +0000 | 
|---|---|---|
| committer | Norbert Lange | 2009-06-09 14:46:20 +0000 | 
| commit | 2ec478bf6ca2aefb8f9415c6fe0299a5277975c6 (patch) | |
| tree | 1b7215ae84db2dd553dbaebdee9febb8953297cf | |
| parent | fe28f1c73c93b8fb20a3cee14acc1625adef37de (diff) | |
| download | scummvm-rg350-2ec478bf6ca2aefb8f9415c6fe0299a5277975c6.tar.gz scummvm-rg350-2ec478bf6ca2aefb8f9415c6fe0299a5277975c6.tar.bz2 scummvm-rg350-2ec478bf6ca2aefb8f9415c6fe0299a5277975c6.zip  | |
Disable initialisation of SDL-Video and SDL-Timer. Fixes various issue when running cmd-line only
svn-id: r41399
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index c11c97c041..e65f4361ce 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -89,7 +89,8 @@ void OSystem_SDL::initBackend() {  	assert(!_inited);  	int joystick_num = ConfMan.getInt("joystick_num"); -	uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; +	joystick_num = 0; +	uint32 sdlFlags = /* SDL_INIT_VIDEO | */ SDL_INIT_AUDIO /*| SDL_INIT_TIMER*/;  	if (ConfMan.hasKey("disable_sdl_parachute"))  		sdlFlags |= SDL_INIT_NOPARACHUTE; @@ -107,7 +108,7 @@ void OSystem_SDL::initBackend() {  	if (SDL_Init(sdlFlags) == -1) {  		error("Could not initialize SDL: %s", SDL_GetError());  	} - +/*  	_graphicsMutex = createMutex();  	SDL_ShowCursor(SDL_DISABLE); @@ -163,13 +164,13 @@ void OSystem_SDL::initBackend() {  	_savefile = new DefaultSaveFileManager();  #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) {  		setupMixer();  	} - +/*  	// Create and hook up the timer manager, if none exists yet (we check for  	// this to allow subclasses to provide their own).  	if (_timer == 0) { @@ -183,7 +184,7 @@ void OSystem_SDL::initBackend() {  		_timer = new DefaultTimerManager();  		_timerID = SDL_AddTimer(10, &timer_handler, _timer);  	} - +*/  	// Invoke parent implementation of this method  	OSystem::initBackend();  | 
