diff options
| author | Johannes Schickel | 2006-01-04 16:57:16 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-01-04 16:57:16 +0000 |
| commit | c2702891ceef6f08b3e5b6c22346119202101813 (patch) | |
| tree | 7234cc13d382d24fcf524ab49ca3adc9be46a398 /kyra | |
| parent | ed6c07c66e15890670fd7cc93c17da6f46962518 (diff) | |
| download | scummvm-rg350-c2702891ceef6f08b3e5b6c22346119202101813.tar.gz scummvm-rg350-c2702891ceef6f08b3e5b6c22346119202101813.tar.bz2 scummvm-rg350-c2702891ceef6f08b3e5b6c22346119202101813.zip | |
Added a little 'hack' for cmd_pauseTicks until it is fully implemented
and fixed some wsa playing functions.
svn-id: r19908
Diffstat (limited to 'kyra')
| -rw-r--r-- | kyra/script_v1.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index ba17ffb43d..cdab49af08 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -67,6 +67,8 @@ int KyraEngine::cmd_pauseTicks(ScriptState *script) { debug(3, "cmd_pauseTicks(0x%X) (%d, %d)", script, stackPos(0), stackPos(1)); if (stackPos(1)) { warning("STUB: special cmd_pauseTicks"); + // delete this after correct implementing + delayWithTicks(stackPos(0)); } else { delayWithTicks(stackPos(0)); } @@ -482,13 +484,13 @@ int KyraEngine::cmd_displayWSAFrame(ScriptState *script) { _movieObjects[wsaIndex]->_y = ypos; _movieObjects[wsaIndex]->_drawPage = 0; _movieObjects[wsaIndex]->displayFrame(frame); + _animator->_updateScreen = true; uint32 continueTime = waitTime * _tickLength + _system->getMillis(); while (_system->getMillis() < continueTime) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); delay(10); } - _animator->_updateScreen = true; _screen->showMouse(); return 0; } @@ -523,6 +525,7 @@ int KyraEngine::cmd_runWSAFrames(ScriptState *script) { for (; startFrame <= endFrame; ++startFrame) { uint32 nextRun = _system->getMillis() + delayTime * _tickLength; _movieObjects[wsaIndex]->displayFrame(startFrame); + _animator->_updateScreen = true; while (_system->getMillis() < nextRun) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); @@ -708,6 +711,7 @@ int KyraEngine::cmd_displayWSAFrameOnHidPage(ScriptState *script) { _movieObjects[wsaIndex]->_y = ypos; _movieObjects[wsaIndex]->_drawPage = 2; _movieObjects[wsaIndex]->displayFrame(frame); + _animator->_updateScreen = true; uint32 continueTime = waitTime * _tickLength + _system->getMillis(); while (_system->getMillis() < continueTime) { _sprites->updateSceneAnims(); |