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

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Mar 9 16:34:58 CET 2008


Revision: 31090
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31090&view=rev
Author:   eriktorbjorn
Date:     2008-03-09 08:34:58 -0700 (Sun, 09 Mar 2008)

Log Message:
-----------
Added missing line and renamed a variable to fix warnings.

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

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-09 15:26:06 UTC (rev 31089)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-09 15:34:58 UTC (rev 31090)
@@ -1889,6 +1889,7 @@
 			uint32 waitEnd = _system->getMillis() + _tickLength;
 			_screen->drawShape(0, shape, x, curY, 0, 0);
 			_screen->updateScreen();
+			delayUntil(waitEnd);
 		}
 
 		restoreGfxRect32x32(x, y);
@@ -1910,9 +1911,9 @@
 
 		while (*curStateTable != -2) {
 			int stateValue = *curStateTable++;
-			int i = 0;
-			for (; i < 25; ++i) {
-				int val = cauldronTable[i];
+			int j = 0;
+			for (; j < 25; ++j) {
+				int val = cauldronTable[j];
 
 				switch (val) {
 				case 68:
@@ -1946,12 +1947,12 @@
 				}
 
 				if (val == stateValue) {
-					cauldronTable[i] = -1;
-					i = 26;
+					cauldronTable[j] = -1;
+					j = 26;
 				}
 			}
 
-			if (i == 25)
+			if (j == 25)
 				cauldronState = -1;
 		}
 


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