From e5e4e1f1b00cfe28340251e487dc907c2e10c6c2 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Sun, 6 Dec 2009 02:33:36 +0000
Subject: [PATCH] buildfix for some wiimote plugin errors

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4651 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj  | 6 +++++-
 Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp | 4 ++--
 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"
@@ -576,6 +576,10 @@
 				RelativePath=".\Src\FillReport.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\Src\Rumble.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\wiimote_hid.h"
 				>
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));