From 2dcd92db551924ecc0b4454874f46ebf92f0469f Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@debian.org>
Date: Thu, 6 Aug 2015 19:50:58 +0200
Subject: [PATCH] Make the game playable using only a gamepad.

---
 src/CEngine.cpp | 61 +++++++++++++++++++++++++++++++++++++++++--------
 src/CEngine.h   |  3 +++
 src/init.cpp    |  2 +-
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/CEngine.cpp b/src/CEngine.cpp
index 45f30ef..5c44b96 100644
--- a/src/CEngine.cpp
+++ b/src/CEngine.cpp
@@ -241,17 +241,21 @@ void Engine::getInput()
 			case SDL_JOYAXISMOTION:
 				if (event.jaxis.axis == 0)
 				{
-				  joyX = event.jaxis.value;
+					joyX = event.jaxis.value;
+					int joycurX = joyX < -25000 ? -1 : joyX > 25000 ? 1 : 0;
+					if (joycurX != joyprevX)
+						joykeyX = joyprevX = joycurX;
 				}
 				else if (event.jaxis.axis == 1)
 				{
-				  joyY = event.jaxis.value;
+					joyY = event.jaxis.value;
+					int joycurY = joyY < -25000 ? -1 : joyY > 25000 ? 1 : 0;
+					if (joycurY != joyprevY)
+						joykeyY = joyprevY = joycurY;
 				}
-				
 				break;
 
 			case SDL_JOYBUTTONDOWN:
-			
 				if (waitForButton)
 				{
 					lastButtonPressed = event.jbutton.button;
@@ -263,10 +267,12 @@ void Engine::getInput()
 				}
 				
 				joystickState[event.jbutton.button] = 1;
+				joykeyFire = true;
 				break;
 
 			case SDL_JOYBUTTONUP:
 				joystickState[event.jbutton.button] = 0;
+				joykeyFire = false;
 				break;
 
 			case SDL_WINDOWEVENT:
@@ -297,7 +303,7 @@ void Engine::setMouse(int x, int y)
 
 bool Engine::userAccepts()
 {
-	if ((keyState[SDL_SCANCODE_SPACE]) || (keyState[SDL_SCANCODE_ESCAPE]) || (keyState[SDL_SCANCODE_LCTRL]) || (keyState[SDL_SCANCODE_RCTRL]) || (keyState[SDL_SCANCODE_RETURN]) || (keyState[SDL_SCANCODE_LCTRL]))
+	if ((keyState[SDL_SCANCODE_SPACE]) || (keyState[SDL_SCANCODE_ESCAPE]) || (keyState[SDL_SCANCODE_LCTRL]) || (keyState[SDL_SCANCODE_RCTRL]) || (keyState[SDL_SCANCODE_RETURN]) || (keyState[SDL_SCANCODE_LCTRL]) || joykeyFire)
 	{
 		return true;
 	}
@@ -315,6 +321,8 @@ void Engine::clearInput()
 	memset(keyState, 0, sizeof keyState);
 
 	mouseLeft = mouseRight = 0;
+	joykeyX = joykeyY = 0;
+	joykeyFire = false;
 }
 
 void Engine::setUserHome(const char *path)
@@ -738,21 +746,21 @@ int Engine::processWidgets()
 {
 	int update = 0;
 
-	if (keyState[SDL_SCANCODE_UP])
+	if (keyState[SDL_SCANCODE_UP] || joykeyY < 0)
 	{
 		highlightWidget(-1);
 		update = 1;
 		clearInput();
 	}
 
-	if (keyState[SDL_SCANCODE_DOWN])
+	if (keyState[SDL_SCANCODE_DOWN] || joykeyY > 0)
 	{
 		highlightWidget(1);
 		update = 1;
 		clearInput();
 	}
 
-	if (keyState[SDL_SCANCODE_LEFT] && (highlightedWidget->type != WG_BUTTON && highlightedWidget->type != WG_JOYPAD))
+	if ((keyState[SDL_SCANCODE_LEFT] || joykeyX < 0) && (highlightedWidget->type != WG_BUTTON && highlightedWidget->type != WG_JOYPAD))
 	{
 		SDL_Delay(1);
 
@@ -769,7 +777,7 @@ int Engine::processWidgets()
 			clearInput();
 	}
 
-	if (keyState[SDL_SCANCODE_RIGHT] && (highlightedWidget->type != WG_BUTTON && highlightedWidget->type != WG_JOYPAD))
+	if ((keyState[SDL_SCANCODE_RIGHT] || joykeyX > 0) && (highlightedWidget->type != WG_BUTTON && highlightedWidget->type != WG_JOYPAD))
 	{
 		SDL_Delay(1);
 
@@ -786,7 +794,7 @@ int Engine::processWidgets()
 			clearInput();
 	}
 
-	if ((keyState[SDL_SCANCODE_RETURN]) || (keyState[SDL_SCANCODE_SPACE]) || (keyState[SDL_SCANCODE_LCTRL]))
+	if ((keyState[SDL_SCANCODE_RETURN]) || (keyState[SDL_SCANCODE_SPACE]) || (keyState[SDL_SCANCODE_LCTRL]) || (joykeyFire && highlightedWidget->type != WG_JOYPAD))
 	{
 		if (highlightedWidget->value == NULL)
 		{
@@ -826,6 +834,39 @@ int Engine::processWidgets()
 		clearInput();
 	}
 
+	if (joykeyX > 0 && highlightedWidget->type == WG_JOYPAD)
+	{
+		waitForButton = true;
+		waitForKey = false;
+		allowJoypad = true;
+
+		if (*highlightedWidget->value > -1000)
+		{
+			*highlightedWidget->value = (-1000 - *highlightedWidget->value);
+		}
+
+		clearInput();
+	}
+
+	if (joykeyX < 0 && highlightedWidget->type == WG_JOYPAD)
+	{
+		if (waitForButton)
+		{
+			lastButtonPressed = -1;
+			*highlightedWidget->value = abs(*highlightedWidget->value) - 1000;
+		}
+		else
+		{
+			lastButtonPressed = -2;
+			*highlightedWidget->value = -2;
+		}
+
+		waitForButton = false;
+		allowJoypad = false;
+		highlightedWidget->redraw();
+		clearInput();
+	}
+
 	return update;
 }
 
diff --git a/src/CEngine.h b/src/CEngine.h
index 81c1556..d0a8c74 100644
--- a/src/CEngine.h
+++ b/src/CEngine.h
@@ -49,6 +49,9 @@ class Engine {
 		char mouseLeft, mouseRight;
 		
 		int joyX, joyY;
+		int joyprevX, joyprevY;
+		int joykeyX, joykeyY;
+		bool joykeyFire;
 		int joystickState[32]; // hopefully no one has a joystick with this many buttons(!)
 		bool waitForButton;
 		bool waitForKey;
diff --git a/src/init.cpp b/src/init.cpp
index 33592b8..d3bfea5 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -83,7 +83,7 @@ void showLicense()
 		graphics.updateScreen();
 		engine.getInput();
 		config.populate();
-		if (engine.keyState[SDL_SCANCODE_SPACE])
+		if (engine.userAccepts())
 			break;
 		SDL_Delay(16);
 	}
-- 
2.39.2