diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-17 08:55:19 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-17 08:55:19 +0100 |
| commit | 73691a8587e5f09ef138384d2ff97e4059ba9380 (patch) | |
| tree | 1b5509192851cdd3e6c09251c0051b33d8d3ca15 /Source/Core/DolphinWX/Android/ButtonManager.cpp | |
| parent | a8ca2c6cc2ed6177bd26b6c022b919179a8ce37a (diff) | |
| parent | 3fd87a7636ff434118a5d7f7334550be8db55c0b (diff) | |
Merge pull request #86 from lioncash/vertical-alignments2-electric-boogaloo
Second and final pass of clearing out tabs.
Diffstat (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Android/ButtonManager.cpp | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index 7d4fb97f3d..257237252f 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp @@ -25,26 +25,28 @@ namespace ButtonManager std::map<std::pair<int, int>, Button*> m_buttons; std::map<std::pair<int, int>, Axis*> m_axises; std::unordered_map<std::string, InputDevice*> m_controllers; - const char* configStrings[] = { "InputA", - "InputB", - "InputStart", - "InputX", - "InputY", - "InputZ", - "DPadUp", - "DPadDown", - "DPadLeft", - "DPadRight", - "MainUp", - "MainDown", - "MainLeft", - "MainRight", - "CStickUp", - "CStickDown", - "CStickLeft", - "CStickRight", - "InputL", - "InputR" }; + const char* configStrings[] = { + "InputA", + "InputB", + "InputStart", + "InputX", + "InputY", + "InputZ", + "DPadUp", + "DPadDown", + "DPadLeft", + "DPadRight", + "MainUp", + "MainDown", + "MainLeft", + "MainRight", + "CStickUp", + "CStickDown", + "CStickLeft", + "CStickRight", + "InputL", + "InputR" + }; const int configStringNum = 20; void AddBind(std::string dev, sBind *bind) |