[Scummvm-cvs-logs] SF.net SVN: scummvm:[46536] scummvm/trunk/engines/sci/engine/kernel32.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Dec 24 21:45:32 CET 2009


Revision: 46536
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46536&view=rev
Author:   thebluegr
Date:     2009-12-24 20:45:32 +0000 (Thu, 24 Dec 2009)

Log Message:
-----------
Silenced some MSVC warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel32.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel32.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel32.cpp	2009-12-24 18:43:18 UTC (rev 46535)
+++ scummvm/trunk/engines/sci/engine/kernel32.cpp	2009-12-24 20:45:32 UTC (rev 46536)
@@ -397,8 +397,9 @@
 
 		// A count of -1 means fill the rest of the array
 		uint16 count = argv[3].toSint16() == -1 ? array->getSize() - index : argv[3].toUint16();
+		uint16 arraySize = array->getSize();
 
-		if (array->getSize() < index + count)
+		if (arraySize < index + count)
 			array->setSize(index + count);
 
 		for (uint16 i = 0; i < count; i++)
@@ -498,8 +499,9 @@
 
 		// A count of -1 means fill the rest of the array
 		uint16 count = argv[3].toSint16() == -1 ? string->getSize() - index : argv[3].toUint16();
+		uint16 stringSize = string->getSize();
 
-		if (string->getSize() < index + count)
+		if (stringSize < index + count)
 			string->setSize(index + count);
 
 		for (uint16 i = 0; i < count; i++)


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




More information about the Scummvm-git-logs mailing list