aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v2.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2008-03-09 15:34:58 +0000
committerTorbjörn Andersson2008-03-09 15:34:58 +0000
commite3b17dbf6b257945146b91e053e517ce83f7b4f7 (patch)
tree1b7f15e84e7d693de7e0f836f1207f3b1eeb9b69 /engines/kyra/kyra_v2.cpp
parent4712089f18e521605bc08152fe02e5aeb4b78dd7 (diff)
downloadscummvm-rg350-e3b17dbf6b257945146b91e053e517ce83f7b4f7.tar.gz
scummvm-rg350-e3b17dbf6b257945146b91e053e517ce83f7b4f7.tar.bz2
scummvm-rg350-e3b17dbf6b257945146b91e053e517ce83f7b4f7.zip
Added missing line and renamed a variable to fix warnings.
svn-id: r31090
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
-rw-r--r--engines/kyra/kyra_v2.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index e9aa61de11..f33b69b7c9 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -1889,6 +1889,7 @@ void KyraEngine_v2::cauldronItemAnim(int item) {
uint32 waitEnd = _system->getMillis() + _tickLength;
_screen->drawShape(0, shape, x, curY, 0, 0);
_screen->updateScreen();
+ delayUntil(waitEnd);
}
restoreGfxRect32x32(x, y);
@@ -1910,9 +1911,9 @@ bool KyraEngine_v2::updateCauldron() {
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 @@ bool KyraEngine_v2::updateCauldron() {
}
if (val == stateValue) {
- cauldronTable[i] = -1;
- i = 26;
+ cauldronTable[j] = -1;
+ j = 26;
}
}
- if (i == 25)
+ if (j == 25)
cauldronState = -1;
}