From e08a00fd0eee8a7f30f32078cddc43d515c0cf53 Mon Sep 17 00:00:00 2001
From: John Willis
Date: Thu, 17 Apr 2008 19:27:03 +0000
Subject: GP2X: Fix 'oops'. No point not initialising the joystick when you
 need to use it to have some form of input ;).

svn-id: r31552
---
 backends/platform/gp2x/gp2x.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'backends')

diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 06c28d8f99..2d2b4b8078 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -96,11 +96,11 @@ void OSystem_GP2X::initBackend() {
 	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());
-- 
cgit v1.2.3