[Scummvm-cvs-logs] SF.net SVN: scummvm: [31552] scummvm/trunk/backends/platform/gp2x/gp2x.cpp

[djwillis at users.sourceforge.net]

Revision: 31552
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31552&view=rev
Author:   djwillis
Date:     2008-04-17 12:27:03 -0700 (Thu, 17 Apr 2008)

Log Message:
-----------
GP2X: Fix 'oops'. No point not initialising the joystick when you need to use it to have some form of input ;).

Modified Paths:
--------------
    scummvm/trunk/backends/platform/gp2x/gp2x.cpp

Modified: scummvm/trunk/backends/platform/gp2x/gp2x.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x.cpp	2008-04-17 19:24:27 UTC (rev 31551)
+++ scummvm/trunk/backends/platform/gp2x/gp2x.cpp	2008-04-17 19:27:03 UTC (rev 31552)
@@ -96,11 +96,11 @@
 	int joystick_num = ConfMan.getInt("joystick_num");
 	uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_EVENTTHREAD;
 
-	//if (ConfMan.hasKey("disable_sdl_parachute"))
-	//	sdlFlags |= SDL_INIT_NOPARACHUTE;
+	if (ConfMan.hasKey("disable_sdl_parachute"))
+		sdlFlags |= SDL_INIT_NOPARACHUTE;
 
-	//if (joystick_num > -1)
-	//	sdlFlags |= SDL_INIT_JOYSTICK;
+	if (joystick_num > -1)
+		sdlFlags |= SDL_INIT_JOYSTICK;
 
 	if (SDL_Init(sdlFlags) == -1) {
 		error("Could not initialize SDL: %s", SDL_GetError());


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