diff options
| author | Mat M <mathew1800@gmail.com> | 2017-02-10 13:50:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 13:50:33 -0500 |
| commit | f6d364e37b35c7743d64cade8e7367457b372dfc (patch) | |
| tree | 584416b87bbc0589a8541cf2236dfc960c052664 /Source/Core/InputCommon/InputConfig.cpp | |
| parent | 8f81051df3df66a9647dbaeab8273dba7127a5c7 (diff) | |
| parent | 6a75ea5653ec596b1a08e985e98fca0b05ccd6f7 (diff) | |
Merge pull request #4873 from lioncash/controller-emu
ControllerEmu: Separate ControlGroup from ControllerEmu
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
| -rw-r--r-- | Source/Core/InputCommon/InputConfig.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 1a723c5fbb..86bda0189f 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -9,10 +9,19 @@ #include "Common/MsgHandler.h" #include "Core/ConfigManager.h" #include "Core/HW/Wiimote.h" +#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/InputConfig.h" +InputConfig::InputConfig(const std::string& ini_name, const std::string& gui_name, + const std::string& profile_name) + : m_ini_name(ini_name), m_gui_name(gui_name), m_profile_name(profile_name) +{ +} + +InputConfig::~InputConfig() = default; + bool InputConfig::LoadConfig(bool isGC) { IniFile inifile; @@ -104,7 +113,7 @@ void InputConfig::SaveConfig() inifile.Save(ini_filename); } -ControllerEmu* InputConfig::GetController(int index) +ControllerEmu::EmulatedController* InputConfig::GetController(int index) { return m_controllers.at(index).get(); } |
