Merge pull request #1193 from RachelBryk/ir-input-display

Fix IR input display.
dolphin-emu · Oct 2, 2014 · 68edddf · 68edddf
2 parents 50bf301 + f7a993a
commit 68edddf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
@@ -628,9 +628,11 @@ static void SetWiiInputDisplayString(int remoteID, u8* const data, const Wiimote
 		s_InputDisplay[controllerID].append(accel);
 	}
 
-	if (irData) // incomplete
+	if (irData)
 	{
-		std::string ir = StringFromFormat(" IR:%d,%d", ((u8*)irData)[0], ((u8*)irData)[1]);
+		u16 x = irData[0] | ((irData[2] >> 4 & 0x3) << 8);
+		u16 y = irData[1] | ((irData[2] >> 2 & 0x3) << 8);
+		std::string ir = StringFromFormat(" IR:%d,%d", x, y);
 		s_InputDisplay[controllerID].append(ir);
 	}