[Scummvm-cvs-logs] SF.net SVN: scummvm: [28304] scummvm/trunk/engines/kyra

[thebluegr at users.sourceforge.net]

Revision: 28304
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28304&view=rev
Author:   thebluegr
Date:     2007-07-29 10:10:51 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
Fixed some warnings

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/screen_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2007-07-29 17:06:23 UTC (rev 28303)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2007-07-29 17:10:51 UTC (rev 28304)
@@ -901,7 +901,7 @@
 	_timer->disable(5);
 	
 	if (wayLength != 0 && wayLength != 0x7D00)
-		refreshNPC = trySceneChange(_movFacingTable, unk1, unk2);
+		refreshNPC = (trySceneChange(_movFacingTable, unk1, unk2) != 0);
 
 	//XXX
 	

Modified: scummvm/trunk/engines/kyra/screen_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_v2.cpp	2007-07-29 17:06:23 UTC (rev 28303)
+++ scummvm/trunk/engines/kyra/screen_v2.cpp	2007-07-29 17:10:51 UTC (rev 28304)
@@ -417,7 +417,7 @@
 	
 	uint16 sx1 = getScreenDim(sd)->sx << 3;
 	uint16 sy1 = getScreenDim(sd)->sy;
-	uint16 sx2 = sx1 + getScreenDim(sd)->w << 3;
+	uint16 sx2 = sx1 + (getScreenDim(sd)->w << 3);
 	uint16 sy2 = sy1 + getScreenDim(sd)->h;
 	if (flags & 0x10) {
 		x += sx1;


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