From f916381a9bb02c508a90b8e494bde3197a36646e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Tue, 31 Aug 2021 07:23:27 +0200
Subject: [PATCH] added gamecontrollersDB.txt

---
 source/director.cpp | 5 +++--
 source/input.cpp    | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/director.cpp b/source/director.cpp
index 86e106e..d1966b5 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -143,7 +143,8 @@ bool Director::initSDL()
 	bool success = true;
 
 	// Inicializa SDL
-	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO) < 0)
+	//if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO) < 0)
+	if (SDL_Init(SDL_INIT_EVERYTHING) < 0)
 	{
 		printf("SDL could not initialize!\nSDL Error: %s\n", SDL_GetError());
 		success = false;
@@ -271,7 +272,7 @@ void Director::setFileList()
 	mFileList[51] = mExecutablePath + "/" + "../media/lang/ba_BA.txt";
 	
 	// DATA
-	mFileList[52] = mExecutablePath + "/" + "../media/data/gamecontrollerdb.txt";
+	mFileList[52] = mExecutablePath + "/" + "../data/gamecontrollerdb.txt";
 }
 
 // Comprueba los ficheros del vector de ficheros que coinciden con una ruta dada
diff --git a/source/input.cpp b/source/input.cpp
index 945e7e2..12010ce 100644
--- a/source/input.cpp
+++ b/source/input.cpp
@@ -137,6 +137,9 @@ bool Input::discoverGameController()
 	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) != 1)
 		SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
 
+	if (SDL_GameControllerAddMappingsFromFile(mDBpath.c_str())<0)
+	printf("Error, could not load %s file: %s\n", mDBpath.c_str(), SDL_GetError());
+
 	int nJoysticks = SDL_NumJoysticks();
 	mNumGamepads = 0;
 
@@ -170,7 +173,6 @@ bool Input::discoverGameController()
 
 		mGameController = mConnectedControllers[0];
 		SDL_GameControllerEventState(SDL_ENABLE);
-		SDL_GameControllerAddMappingsFromFile(mDBpath.c_str());
 	}
 
 	return found;
@@ -191,5 +193,5 @@ std::string Input::getControllerName(int index)
 	if (mNumGamepads > 0)
 		return mControllerNames[index];
 	else
-	return "";
+		return "";
 }
\ No newline at end of file