diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-12-06 02:33:36 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-12-06 02:33:36 +0000 |
| commit | e5e4e1f1b00cfe28340251e487dc907c2e10c6c2 (patch) | |
| tree | c44f793b2ff0fa6c9ea0b2096d007fe416c17835 | |
| parent | bc0d6defc6031354acc34ccc1fa6bbe7954199fe (diff) | |
buildfix for some wiimote plugin errors
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4651 8ced0084-cf51-0410-be5f-012b33b47a6e
| -rw-r--r-- | Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj | 6 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp | 4 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_Wiimote/Src/Rumble.cpp | 2 |
3 files changed, 8 insertions, 4 deletions
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 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="Plugin_Wiimote"
ProjectGUID="{8D612734-FAA5-4B8A-804F-4DEA2367D495}"
RootNamespace="Plugin_Wiimote"
@@ -577,6 +577,10 @@ >
</File>
<File
+ RelativePath=".\Src\Rumble.cpp"
+ >
+ </File>
+ <File
RelativePath=".\Src\wiimote_hid.h"
>
</File>
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<LONG>(1.4142f*nXYForce);
}
ZeroMemory(&pRumble[npad].eff, sizeof(pRumble[npad].eff));
|