diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-25 01:50:09 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-25 01:50:09 -0400 |
| commit | 7738b8b0e056b0eebd2e4238b1cf2671fc177e87 (patch) | |
| tree | ae1acc1ad529cd52e0dfaa659faf0e3d2ccd6a55 /Source/Core | |
| parent | c5c86d17dc5f8fcb4421a9e745b443ea33f143c4 (diff) | |
| parent | 54e1b58199e9f11e9d8015777ebfcd53c86d485d (diff) | |
Merge branch 'expression-parser-fixes'
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/GCPadEmu.cpp | 12 | ||||
| -rw-r--r-- | Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 26 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp index af4130b1bc..a183d27714 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.cpp +++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp @@ -181,14 +181,14 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface) set_control(m_main_stick, 4, "LSHIFT"); // Modifier #elif __APPLE__ - set_control(m_c_stick, 4, "Left Control"); // Modifier + set_control(m_c_stick, 4, "`Left Control`"); // Modifier // Main Stick - set_control(m_main_stick, 0, "Up Arrow"); // Up - set_control(m_main_stick, 1, "Down Arrow"); // Down - set_control(m_main_stick, 2, "Left Arrow"); // Left - set_control(m_main_stick, 3, "Right Arrow"); // Right - set_control(m_main_stick, 4, "Left Shift"); // Modifier + set_control(m_main_stick, 0, "`Up Arrow"); // Up + set_control(m_main_stick, 1, "`Down Arrow`"); // Down + set_control(m_main_stick, 2, "`Left Arrow`"); // Left + set_control(m_main_stick, 3, "`Right Arrow`"); // Right + set_control(m_main_stick, 4, "`Left Shift`"); // Modifier #else // not sure if these are right diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index 5ccfb19b43..80c24bb078 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -894,11 +894,11 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface) // Buttons #if defined HAVE_X11 && HAVE_X11 - set_control(m_buttons, 0, "Click 1"); // A - set_control(m_buttons, 1, "Click 3"); // B + set_control(m_buttons, 0, "`Click 1`"); // A + set_control(m_buttons, 1, "`Click 3`"); // B #else - set_control(m_buttons, 0, "Click 0"); // A - set_control(m_buttons, 1, "Click 1"); // B + set_control(m_buttons, 0, "`Click 0`"); // A + set_control(m_buttons, 1, "`Click 1`"); // B #endif set_control(m_buttons, 2, "1"); // 1 set_control(m_buttons, 3, "2"); // 2 @@ -913,13 +913,13 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface) // Shake for (size_t i = 0; i != 3; ++i) - set_control(m_shake, i, "Click 2"); + set_control(m_shake, i, "`Click 2`"); // IR - set_control(m_ir, 0, "Cursor Y-"); - set_control(m_ir, 1, "Cursor Y+"); - set_control(m_ir, 2, "Cursor X-"); - set_control(m_ir, 3, "Cursor X+"); + set_control(m_ir, 0, "`Cursor Y-1"); + set_control(m_ir, 1, "`Cursor Y+`"); + set_control(m_ir, 2, "`Cursor X-`"); + set_control(m_ir, 3, "`Cursor X+`"); // DPad #ifdef _WIN32 @@ -928,10 +928,10 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface) set_control(m_dpad, 2, "LEFT"); // Left set_control(m_dpad, 3, "RIGHT"); // Right #elif __APPLE__ - set_control(m_dpad, 0, "Up Arrow"); // Up - set_control(m_dpad, 1, "Down Arrow"); // Down - set_control(m_dpad, 2, "Left Arrow"); // Left - set_control(m_dpad, 3, "Right Arrow"); // Right + set_control(m_dpad, 0, "`Up Arrow`"); // Up + set_control(m_dpad, 1, "`Down Arrow`"); // Down + set_control(m_dpad, 2, "`Left Arrow`"); // Left + set_control(m_dpad, 3, "`Right Arrow`"); // Right #else set_control(m_dpad, 0, "Up"); // Up set_control(m_dpad, 1, "Down"); // Down diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp index 91c275e71b..a259f303c8 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp @@ -98,12 +98,12 @@ public: while (it != expr.end()) { char c = *it; + it++; if (c == '`') return false; if (c > 0 && c == otherDelim) return true; value += c; - it++; } return false; } |