aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2007-02-01 13:31:07 +0000
committerJohannes Schickel2007-02-01 13:31:07 +0000
commit61531524dc94d5289eeacce3d3549c64521f03cf (patch)
treee399c24e4fab4163b33b91f1d0c718662446681e /engines/kyra
parente9074ea021f44615abcfd412695b52b45b076058 (diff)
downloadscummvm-rg350-61531524dc94d5289eeacce3d3549c64521f03cf.tar.gz
scummvm-rg350-61531524dc94d5289eeacce3d3549c64521f03cf.tar.bz2
scummvm-rg350-61531524dc94d5289eeacce3d3549c64521f03cf.zip
cleanup
svn-id: r25322
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/script_v1.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index 246119f539..baefab215e 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -758,24 +758,21 @@ int KyraEngine::o1_displayWSASequentialFrames(ScriptState *script) {
if (maxTime - 1 <= 0)
maxTime = 1;
+ _movieObjects[wsaIndex]->setX(xpos);
+ _movieObjects[wsaIndex]->setY(ypos);
+ _movieObjects[wsaIndex]->setDrawPage(0);
+
// Workaround for bug #1498221 "KYRA1: Glitches when meeting Zanthia"
// the original didn'to do a forced screen update after displaying a wsa frame
// while we have to do it, which make brandon disappear for a short moment,
// which shouldn't happen. So we're not updating the screen for this special
// case too.
if (startFrame == 18 && endFrame == 18 && _currentRoom == 45) {
- _movieObjects[wsaIndex]->setX(xpos);
- _movieObjects[wsaIndex]->setY(ypos);
- _movieObjects[wsaIndex]->setDrawPage(0);
_movieObjects[wsaIndex]->displayFrame(18);
delay(waitTime * _tickLength);
return 0;
}
- _movieObjects[wsaIndex]->setX(xpos);
- _movieObjects[wsaIndex]->setY(ypos);
- _movieObjects[wsaIndex]->setDrawPage(0);
-
int curTime = 0;
_screen->hideMouse();
while (curTime < maxTime) {