diff --git a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj index 983bbfd74f..740a37a5a3 100644 --- a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj +++ b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj @@ -1,7 +1,7 @@ + + diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp index 0f65dee9bc..ec710526c5 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp @@ -472,7 +472,7 @@ void WmRequestStatus(u16 _channelID, wm_request_status* rs, int Extension) wm_status_report* pStatus = (wm_status_report*)(DataFrame + Offset); Offset += sizeof(wm_status_report); - memset(pStatus, 0, sizeof(wm_status_report)); // fill the status report with zeroes + memset(pStatus, 0, sizeof(wm_status_report)); // fill the status report with zeros // Status values FillReportInfo(pStatus->buttons); @@ -506,7 +506,7 @@ void WmRequestStatus(u16 _channelID, wm_request_status* rs, int Extension) INFO_LOG(WIIMOTE, "Request Status"); DEBUG_LOG(WIIMOTE, " Extension: %x", pStatus->extension); - DEBUG_LOG(WIIMOTE, " Flags: 0x%02x", pStatus->padding1[2]); + DEBUG_LOG(WIIMOTE, " Buttons: 0x%04x", pStatus->buttons); g_WiimoteInitialize.pWiimoteInput(_channelID, DataFrame, Offset); diff --git a/Source/Plugins/Plugin_Wiimote/Src/Rumble.cpp b/Source/Plugins/Plugin_Wiimote/Src/Rumble.cpp index 6ed532bba6..c0644daeb6 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/Rumble.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/Rumble.cpp @@ -228,7 +228,7 @@ void SetDeviceForcesXY(int npad, int nXYForce) { rglDirection[0] = nXYForce; rglDirection[1] = nXYForce; - cf.lMagnitude = 1.4142f*nXYForce; + cf.lMagnitude = static_cast(1.4142f*nXYForce); } ZeroMemory(&pRumble[npad].eff, sizeof(pRumble[npad].eff));