[Scummvm-cvs-logs] SF.net SVN: scummvm:[39570] scummvm/trunk/backends/platform/wii

[dhewg at users.sourceforge.net]

Revision: 39570
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39570&view=rev
Author:   dhewg
Date:     2009-03-20 19:02:32 +0000 (Fri, 20 Mar 2009)

Log Message:
-----------
Fix some warnings in the Wii backend.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wii/gx_supp.cpp
    scummvm/trunk/backends/platform/wii/osystem.cpp
    scummvm/trunk/backends/platform/wii/osystem.h
    scummvm/trunk/backends/platform/wii/osystem_events.cpp
    scummvm/trunk/backends/platform/wii/osystem_gfx.cpp

Modified: scummvm/trunk/backends/platform/wii/gx_supp.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/gx_supp.cpp	2009-03-20 17:33:08 UTC (rev 39569)
+++ scummvm/trunk/backends/platform/wii/gx_supp.cpp	2009-03-20 19:02:32 UTC (rev 39570)
@@ -180,7 +180,7 @@
 	memset(texturemem, 0, texturesize);
 
 	/*** Setup for first call to scaler ***/
-	oldvwidth = oldvheight = -1;
+	oldvwidth = oldvheight = 0;
 
 	if (inited)
 		return;

Modified: scummvm/trunk/backends/platform/wii/osystem.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem.cpp	2009-03-20 17:33:08 UTC (rev 39569)
+++ scummvm/trunk/backends/platform/wii/osystem.cpp	2009-03-20 19:02:32 UTC (rev 39570)
@@ -31,7 +31,6 @@
 
 OSystem_Wii::OSystem_Wii() :
 	_startup_time(0),
-	_alarm(-1),
 
 	_palette(NULL),
 	_cursorPalette(NULL),

Modified: scummvm/trunk/backends/platform/wii/osystem.h
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem.h	2009-03-20 17:33:08 UTC (rev 39569)
+++ scummvm/trunk/backends/platform/wii/osystem.h	2009-03-20 19:02:32 UTC (rev 39570)
@@ -56,7 +56,6 @@
 class OSystem_Wii : public BaseBackend {
 private:
 	s64 _startup_time;
-	syswd_t _alarm;
 
 	u16 *_palette;
 	u16 *_cursorPalette;

Modified: scummvm/trunk/backends/platform/wii/osystem_events.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem_events.cpp	2009-03-20 17:33:08 UTC (rev 39569)
+++ scummvm/trunk/backends/platform/wii/osystem_events.cpp	2009-03-20 19:02:32 UTC (rev 39570)
@@ -357,8 +357,8 @@
 		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;

Modified: scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem_gfx.cpp	2009-03-20 17:33:08 UTC (rev 39569)
+++ scummvm/trunk/backends/platform/wii/osystem_gfx.cpp	2009-03-20 19:02:32 UTC (rev 39570)
@@ -128,7 +128,7 @@
 
 #ifndef GAMECUBE
 	if (CONF_GetAspectRatio() && !_fullscreen)
-		xar /= 1.33f;
+		xar = s16(float(xar) / 1.33f);
 #endif
 
 	GX_SetCamPosZ(400 - mode * 10);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.