[Scummvm-cvs-logs] SF.net SVN: scummvm:[39762] scummvm/trunk/engines/sword1

[lordhoto at users.sourceforge.net]

Revision: 39762
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39762&view=rev
Author:   lordhoto
Date:     2009-03-30 12:11:22 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
SWORD1: Commit of parentheses patch from salty-horse. (from -devel "Enabling -Wparentheses in the Makefile").

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/control.cpp
    scummvm/trunk/engines/sword1/screen.cpp

Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp	2009-03-30 12:10:10 UTC (rev 39761)
+++ scummvm/trunk/engines/sword1/control.cpp	2009-03-30 12:11:22 UTC (rev 39762)
@@ -1112,8 +1112,8 @@
 	tm curTime;
 	_system->getTimeAndDate(curTime);
 
-	uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | (curTime.tm_year + 1900) & 0xFFFF;
-	uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | (curTime.tm_min) & 0xFF;
+	uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | ((curTime.tm_year + 1900) & 0xFFFF);
+	uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | ((curTime.tm_min) & 0xFF);
 
 	outf->writeUint32BE(saveDate);
 	outf->writeUint16BE(saveTime);
@@ -1278,8 +1278,8 @@
 	tm curTime;
 	_system->getTimeAndDate(curTime);
 
-	uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | (curTime.tm_year + 1900) & 0xFFFF;
-	uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | (curTime.tm_min) & 0xFF;
+	uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | ((curTime.tm_year + 1900) & 0xFFFF);
+	uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | ((curTime.tm_min) & 0xFF);
 
 	newSave->writeUint32BE(saveDate);
 	newSave->writeUint16BE(saveTime);

Modified: scummvm/trunk/engines/sword1/screen.cpp
===================================================================
--- scummvm/trunk/engines/sword1/screen.cpp	2009-03-30 12:10:10 UTC (rev 39761)
+++ scummvm/trunk/engines/sword1/screen.cpp	2009-03-30 12:11:22 UTC (rev 39762)
@@ -538,7 +538,7 @@
 
 	if ((sprSizeX > 0) && (sprSizeY > 0)) {
 		if( (!(SwordEngine::isPsx()) || (compact->o_type == TYPE_TEXT) 
-		|| (compact->o_resource == LVSFLY) || !(compact->o_resource == GEORGE_MEGA) && (sprSizeX < 260))) 
+		|| (compact->o_resource == LVSFLY) || (!(compact->o_resource == GEORGE_MEGA) && (sprSizeX < 260))))
 			drawSprite(sprData + incr, spriteX, spriteY, sprSizeX, sprSizeY, sprPitch);
 		else if (((sprSizeX >= 260) && (sprSizeX < 450)) || ((compact->o_resource == GMWRITH) && (sprSizeX < 515))  // a psx shrinked sprite (1/2 width)
 				|| ((compact->o_resource == GMPOWER) && (sprSizeX < 515)) )                                         // some needs to be hardcoded, headers don't give useful infos


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