From 317de0f4847c912a405e318368331f86f1e0f0cd Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Fri, 20 Mar 2009 19:02:32 +0000
Subject: Fix some warnings in the Wii backend.

svn-id: r39570
---
 backends/platform/wii/gx_supp.cpp        | 2 +-
 backends/platform/wii/osystem.cpp        | 1 -
 backends/platform/wii/osystem.h          | 1 -
 backends/platform/wii/osystem_events.cpp | 4 ++--
 backends/platform/wii/osystem_gfx.cpp    | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'backends')

diff --git a/backends/platform/wii/gx_supp.cpp b/backends/platform/wii/gx_supp.cpp
index 448496814c..34cd31fd13 100644
--- a/backends/platform/wii/gx_supp.cpp
+++ b/backends/platform/wii/gx_supp.cpp
@@ -180,7 +180,7 @@ void GX_Start(u16 width, u16 height, s16 haspect, s16 vaspect) {
 	memset(texturemem, 0, texturesize);
 
 	/*** Setup for first call to scaler ***/
-	oldvwidth = oldvheight = -1;
+	oldvwidth = oldvheight = 0;
 
 	if (inited)
 		return;
diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index f36aaad503..ae1eb11f4f 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -31,7 +31,6 @@
 
 OSystem_Wii::OSystem_Wii() :
 	_startup_time(0),
-	_alarm(-1),
 
 	_palette(NULL),
 	_cursorPalette(NULL),
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index b4f38e93b7..e4176e8415 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -56,7 +56,6 @@ extern void wii_memstats(void);
 class OSystem_Wii : public BaseBackend {
 private:
 	s64 _startup_time;
-	syswd_t _alarm;
 
 	u16 *_palette;
 	u16 *_cursorPalette;
diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 05f3469e42..f28e5b547b 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -357,8 +357,8 @@ bool OSystem_Wii::pollEvent(Common::Event &event) {
 		WPAD_IR(0, &ir);
 
 		if (ir.valid) {
-			mx = ir.x - _currentWidth / 10;
-			my = ir.y - _currentHeight / 10;
+			mx = s32(ir.x) - _currentWidth / 10;
+			my = s32(ir.y) - _currentHeight / 10;
 
 			if (mx < 0)
 				mx = 0;
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 5a849d10ab..4454acb318 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -128,7 +128,7 @@ bool OSystem_Wii::setGraphicsMode(int mode) {
 
 #ifndef GAMECUBE
 	if (CONF_GetAspectRatio() && !_fullscreen)
-		xar /= 1.33f;
+		xar = s16(float(xar) / 1.33f);
 #endif
 
 	GX_SetCamPosZ(400 - mode * 10);
-- 
cgit v1.2.3