Allow loading controller profiles from game ini.

Currently loads the same profile for all 4 controllers, and overwrites the default control settings.
mirror · Jan 9, 2013 · b8691df · b8691df
1 parent 4f4aa48
commit b8691df
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
@@ -47,7 +47,6 @@
 #include "VideoBackendBase.h"
 #include "Movie.h"
 
-
 namespace BootManager
 {
 
@@ -137,6 +136,11 @@ bool BootCore(const std::string& _rFilename)
 		}
 	} 
 
+	if (game_ini.Exists("Core", "WiiProfile"))
+		game_ini.Get("Core", "WiiProfile", &StartUp.strWiiControllerProfile);
+	if (game_ini.Exists("Core", "GCProfile"))
+		game_ini.Get("Core", "GCProfile", &StartUp.strGCControllerProfile);
+
 	// Run the game
 	// Init the core
 	if (!Core::Init())
@@ -169,6 +173,8 @@ void Stop()
 		StartUp.bDSPHLE = config_cache.bDSPHLE;
 		StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker;
 		StartUp.m_strVideoBackend = config_cache.strBackend;
+		StartUp.strGCControllerProfile = "";
+		StartUp.strWiiControllerProfile = "";
 		VideoBackend::ActivateBackend(StartUp.m_strVideoBackend);
 	}
 }

diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
@@ -138,7 +138,9 @@ struct SCoreStartupParameter
 
 	int iTheme;
 	int iPosX, iPosY, iWidth, iHeight;
-
+
+	std::string strGCControllerProfile;
+	std::string strWiiControllerProfile;
 	enum EBootBS2
 	{
 		BOOT_DEFAULT,

diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp
@@ -20,6 +20,7 @@
 
 #include "ControllerInterface/ControllerInterface.h"
 #include "GCPadEmu.h"
+#include "../ConfigManager.h"
 
 #include "../../InputCommon/Src/InputConfig.h"
 
@@ -55,7 +56,7 @@ void Initialize(void* const hwnd)
 	g_controller_interface.Initialize();
 
 	// load the saved controller config
-	g_plugin.LoadConfig();
+	g_plugin.LoadConfig(SConfig::GetInstance().m_LocalCoreStartupParameter.strGCControllerProfile);
 }
 
 void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)

diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp
@@ -5,6 +5,7 @@
 #include "WiimoteReal/WiimoteReal.h"
 #include "WiimoteEmu/WiimoteEmu.h"
 #include "Movie.h"
+#include "../ConfigManager.h"
 
 #include "ControllerInterface/ControllerInterface.h"
 
@@ -44,7 +45,7 @@ void Initialize(void* const hwnd)
 	g_controller_interface.SetHwnd(hwnd);
 	g_controller_interface.Initialize();
 
-	g_plugin.LoadConfig();
+	g_plugin.LoadConfig(SConfig::GetInstance().m_LocalCoreStartupParameter.strWiiControllerProfile);
 
 	WiimoteReal::Initialize();
 

diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp
@@ -26,18 +26,25 @@ InputPlugin::~InputPlugin()
 		delete *i;
 }
 
-bool InputPlugin::LoadConfig()
+bool InputPlugin::LoadConfig(std::string ini)
 {
 	IniFile inifile;
-	if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini"))
+	std::string ini2 = ini;
+	if (ini == "")
+		ini = ini_name;
+	if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini + ".ini"))
 	{
 		std::vector< ControllerEmu* >::const_iterator
 			i = controllers.begin(),
 			e = controllers.end();
 		for (; i!=e; ++i)
 		{
 			// load settings from ini
-			(*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str()));
+			std::string section;
+			section = (*i)->GetName();
+			if (ini2 != "")
+				section = "Profile";
+			(*i)->LoadConfig(inifile.GetOrCreateSection(section.c_str()));
 			// update refs
 			(*i)->UpdateReferences(g_controller_interface);
 		}

diff --git a/Source/Core/InputCommon/Src/InputConfig.h b/Source/Core/InputCommon/Src/InputConfig.h
@@ -42,7 +42,7 @@ class InputPlugin
 
 	~InputPlugin();
 
-	bool LoadConfig();
+	bool LoadConfig(std::string ini);
 	void SaveConfig();
 
 	std::vector< ControllerEmu* >	controllers;