Merge branch 'expression-parser-fixes'

dolphin-emu · Jun 25, 2013 · 7738b8b · 7738b8b
2 parents c5c86d1 + 54e1b58
commit 7738b8b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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
@@ -98,12 +98,12 @@ class Lexer {
 		while (it != expr.end())
 		{
 			char c = *it;
+			it++;
 			if (c == '`')
 				return false;
 			if (c > 0 && c == otherDelim)
 				return true;
 			value += c;
-			it++;
 		}
 		return false;
 	}