piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2965 from Sonicadvance1/Android_config_changes

Browse Source 
[Android] Fix multi-gamecube controller input, config changes
This commit is contained in:
Ryan Houdek
2015-09-06 20:07:32 -05:00
parent 1b026364bf 9bb63bf2eb
commit 99a7dfaf5e
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/Android/ButtonManager.cpp
View File

@ -201,20 +201,12 @@ namespace ButtonManager
auto it = m_controllers.find(dev);
if (it != m_controllers.end())
return it->second->PressEvent(button, action);
m_controllers[dev] = new InputDevice(dev);
return m_controllers[dev]->PressEvent(button, action);
}
void GamepadAxisEvent(const std::string& dev, int axis, float value)
{
auto it = m_controllers.find(dev);
if (it != m_controllers.end())
{
it->second->AxisEvent(axis, value);
return;
}
m_controllers[dev] = new InputDevice(dev);
m_controllers[dev]->AxisEvent(axis, value);
}
void Shutdown()
{