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

Merge branch 'expression-parser-fixes'

This commit is contained in:
Jasper St. Pierre 2013-06-25 01:50:09 -04:00
parent c5c86d17dc 54e1b58199
commit 7738b8b0e0
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/Src/HW/GCPadEmu.cpp
View File

@ -181,14 +181,14 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
set_control(m_main_stick, 4, "LSHIFT"); // Modifier set_control(m_main_stick, 4, "LSHIFT"); // Modifier
#elif __APPLE__ #elif __APPLE__
set_control(m_c_stick, 4, "Left Control"); // Modifier set_control(m_c_stick, 4, "`Left Control`"); // Modifier
// Main Stick // Main Stick
set_control(m_main_stick, 0, "Up Arrow"); // Up set_control(m_main_stick, 0, "`Up Arrow"); // Up
set_control(m_main_stick, 1, "Down Arrow"); // Down set_control(m_main_stick, 1, "`Down Arrow`"); // Down
set_control(m_main_stick, 2, "Left Arrow"); // Left set_control(m_main_stick, 2, "`Left Arrow`"); // Left
set_control(m_main_stick, 3, "Right Arrow"); // Right set_control(m_main_stick, 3, "`Right Arrow`"); // Right
set_control(m_main_stick, 4, "Left Shift"); // Modifier set_control(m_main_stick, 4, "`Left Shift`"); // Modifier
#else #else
// not sure if these are right // not sure if these are right

26
Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -894,11 +894,11 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
// Buttons // Buttons
#if defined HAVE_X11 && HAVE_X11 #if defined HAVE_X11 && HAVE_X11
set_control(m_buttons, 0, "Click 1"); // A set_control(m_buttons, 0, "`Click 1`"); // A
set_control(m_buttons, 1, "Click 3"); // B set_control(m_buttons, 1, "`Click 3`"); // B
#else #else
set_control(m_buttons, 0, "Click 0"); // A set_control(m_buttons, 0, "`Click 0`"); // A
set_control(m_buttons, 1, "Click 1"); // B set_control(m_buttons, 1, "`Click 1`"); // B
#endif #endif
set_control(m_buttons, 2, "1"); // 1 set_control(m_buttons, 2, "1"); // 1
set_control(m_buttons, 3, "2"); // 2 set_control(m_buttons, 3, "2"); // 2
@ -913,13 +913,13 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
// Shake // Shake
for (size_t i = 0; i != 3; ++i) for (size_t i = 0; i != 3; ++i)
set_control(m_shake, i, "Click 2"); set_control(m_shake, i, "`Click 2`");
// IR // IR
set_control(m_ir, 0, "Cursor Y-"); set_control(m_ir, 0, "`Cursor Y-1");
set_control(m_ir, 1, "Cursor Y+"); set_control(m_ir, 1, "`Cursor Y+`");
set_control(m_ir, 2, "Cursor X-"); set_control(m_ir, 2, "`Cursor X-`");
set_control(m_ir, 3, "Cursor X+"); set_control(m_ir, 3, "`Cursor X+`");
// DPad // DPad
#ifdef _WIN32 #ifdef _WIN32
@ -928,10 +928,10 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
set_control(m_dpad, 2, "LEFT"); // Left set_control(m_dpad, 2, "LEFT"); // Left
set_control(m_dpad, 3, "RIGHT"); // Right set_control(m_dpad, 3, "RIGHT"); // Right
#elif __APPLE__ #elif __APPLE__
set_control(m_dpad, 0, "Up Arrow"); // Up set_control(m_dpad, 0, "`Up Arrow`"); // Up
set_control(m_dpad, 1, "Down Arrow"); // Down set_control(m_dpad, 1, "`Down Arrow`"); // Down
set_control(m_dpad, 2, "Left Arrow"); // Left set_control(m_dpad, 2, "`Left Arrow`"); // Left
set_control(m_dpad, 3, "Right Arrow"); // Right set_control(m_dpad, 3, "`Right Arrow`"); // Right
#else #else
set_control(m_dpad, 0, "Up"); // Up set_control(m_dpad, 0, "Up"); // Up
set_control(m_dpad, 1, "Down"); // Down set_control(m_dpad, 1, "Down"); // Down

2
Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
View File

@ -98,12 +98,12 @@ public:
while (it != expr.end()) while (it != expr.end())
{ {
char c = *it; char c = *it;
it++;
if (c == '`') if (c == '`')
return false; return false;
if (c > 0 && c == otherDelim) if (c > 0 && c == otherDelim)
return true; return true;
value += c; value += c;
it++;
} }
return false; return false;
} }