diff options
| author | Johannes Schickel | 2006-01-11 13:28:38 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-01-11 13:28:38 +0000 |
| commit | e179f3f6ed35864517cf4cb5e99e6b8002bf1d5d (patch) | |
| tree | 4d704f8c9d7b141885c06e9e736884b6ebcea352 /kyra/script_v1.cpp | |
| parent | 67d1cc0cf957d22cb5c6f8b2bf8de4ac02e25f67 (diff) | |
| download | scummvm-rg350-e179f3f6ed35864517cf4cb5e99e6b8002bf1d5d.tar.gz scummvm-rg350-e179f3f6ed35864517cf4cb5e99e6b8002bf1d5d.tar.bz2 scummvm-rg350-e179f3f6ed35864517cf4cb5e99e6b8002bf1d5d.zip | |
Fixed for bug report # 1401360.
Also added some delay calls while waiting in some script functions.
svn-id: r19982
Diffstat (limited to 'kyra/script_v1.cpp')
| -rw-r--r-- | kyra/script_v1.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index fc019fce39..206af7a3a5 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -250,6 +250,7 @@ int KyraEngine::cmd_runSceneAnimUntilDone(ScriptState *script) { while (_sprites->_anims[stackPos(0)].play) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); + delay(10); } _animator->restoreAllObjectBackgrounds(); _screen->showMouse(); @@ -463,7 +464,8 @@ int KyraEngine::cmd_runWSAFromBeginningToEnd(ScriptState *script) { } else { _screen->updateScreen(); } - delay(10); + if (continueTime - _system->getMillis() >= 10) + delay(10); } } @@ -489,7 +491,8 @@ int KyraEngine::cmd_displayWSAFrame(ScriptState *script) { while (_system->getMillis() < continueTime) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); - delay(10); + if (continueTime - _system->getMillis() >= 10) + delay(10); } _screen->showMouse(); return 0; @@ -529,7 +532,8 @@ int KyraEngine::cmd_runWSAFrames(ScriptState *script) { while (_system->getMillis() < nextRun) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); - delay(10); + if (nextRun - _system->getMillis() >= 10) + delay(10); } } _screen->showMouse(); @@ -716,7 +720,8 @@ int KyraEngine::cmd_displayWSAFrameOnHidPage(ScriptState *script) { while (_system->getMillis() < continueTime) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); - delay(10); + if (continueTime - _system->getMillis() >= 10) + delay(10); } _screen->showMouse(); @@ -1254,6 +1259,8 @@ int KyraEngine::cmd_makeAmuletAppear(ScriptState *script) { while (_system->getMillis() < nextTime) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); + if (nextTime - _system->getMillis() >= 10) + delay(10); } } _screen->showMouse(); |