[Scummvm-cvs-logs] SF.net SVN: scummvm:[41399] scummvm/branches/gsoc2009-mods/backends/ platform/sdl/sdl.cpp

nolange at users.sourceforge.net nolange at users.sourceforge.net
Tue Jun 9 16:46:20 CEST 2009


Revision: 41399
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41399&view=rev
Author:   nolange
Date:     2009-06-09 14:46:20 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
Disable initialisation of SDL-Video and SDL-Timer. Fixes various issue when running cmd-line only

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/backends/platform/sdl/sdl.cpp

Modified: scummvm/branches/gsoc2009-mods/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/backends/platform/sdl/sdl.cpp	2009-06-09 11:26:15 UTC (rev 41398)
+++ scummvm/branches/gsoc2009-mods/backends/platform/sdl/sdl.cpp	2009-06-09 14:46:20 UTC (rev 41399)
@@ -89,7 +89,8 @@
 	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 @@
 	if (SDL_Init(sdlFlags) == -1) {
 		error("Could not initialize SDL: %s", SDL_GetError());
 	}
-
+/*
 	_graphicsMutex = createMutex();
 
 	SDL_ShowCursor(SDL_DISABLE);
@@ -163,13 +164,13 @@
 	_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 @@
 		_timer = new DefaultTimerManager();
 		_timerID = SDL_AddTimer(10, &timer_handler, _timer);
 	}
-
+*/
 	// Invoke parent implementation of this method
 	OSystem::initBackend();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list