ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8546 from jordan-woyak/default-num-mappings 

HW: Add ticks to default mappings that are valid numeric literals.
This commit is contained in:
Léo Lam 2020-01-04 10:41:45 +01:00 committed by GitHub
parent 671defd8b9 2a9a04a1ec
commit 94c5460693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/HW/GCKeyboardEmu.cpp
View File

@ -157,16 +157,16 @@ void GCKeyboard::LoadDefaults(const ControllerInterface& ciface)
m_keys1x->SetControlExpression(13, "Y");
m_keys1x->SetControlExpression(14, "Z");
m_keys1x->SetControlExpression(15, "1");
m_keys2x->SetControlExpression(0, "2");
m_keys2x->SetControlExpression(1, "3");
m_keys2x->SetControlExpression(2, "4");
m_keys2x->SetControlExpression(3, "5");
m_keys2x->SetControlExpression(4, "6");
m_keys2x->SetControlExpression(5, "7");
m_keys2x->SetControlExpression(6, "8");
m_keys2x->SetControlExpression(7, "9");
m_keys2x->SetControlExpression(8, "0");
m_keys1x->SetControlExpression(15, "`1`");
m_keys2x->SetControlExpression(0, "`2`");
m_keys2x->SetControlExpression(1, "`3`");
m_keys2x->SetControlExpression(2, "`4`");
m_keys2x->SetControlExpression(3, "`5`");
m_keys2x->SetControlExpression(4, "`6`");
m_keys2x->SetControlExpression(5, "`7`");
m_keys2x->SetControlExpression(6, "`8`");
m_keys2x->SetControlExpression(7, "`9`");
m_keys2x->SetControlExpression(8, "`0`");
m_keys3x->SetControlExpression(5, "F1");
m_keys3x->SetControlExpression(6, "F2");

8
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -685,10 +685,10 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
// B
m_buttons->SetControlExpression(1, "Click 1");
#endif
m_buttons->SetControlExpression(2, "1"); // 1
m_buttons->SetControlExpression(3, "2"); // 2
m_buttons->SetControlExpression(4, "Q"); // -
m_buttons->SetControlExpression(5, "E"); // +
m_buttons->SetControlExpression(2, "`1`"); // 1
m_buttons->SetControlExpression(3, "`2`"); // 2
m_buttons->SetControlExpression(4, "Q"); // -
m_buttons->SetControlExpression(5, "E"); // +
#ifdef _WIN32
m_buttons->SetControlExpression(6, "!LMENU & RETURN"); // Home