diff options
author | Johannes Schickel | 2005-11-27 00:12:07 +0000 |
---|---|---|
committer | Johannes Schickel | 2005-11-27 00:12:07 +0000 |
commit | 46d02cd9def7ab76a3c223b4845ff70b33139b01 (patch) | |
tree | b3e9217374e8f2a0fa2876438897b8880e045dcd /kyra | |
parent | e7ccaa866e226b74cfd52172535d6dcb7c5b5bdb (diff) | |
download | scummvm-rg350-46d02cd9def7ab76a3c223b4845ff70b33139b01.tar.gz scummvm-rg350-46d02cd9def7ab76a3c223b4845ff70b33139b01.tar.bz2 scummvm-rg350-46d02cd9def7ab76a3c223b4845ff70b33139b01.zip |
Implemented cmd_runSceneAnimUntilDone and cmd_displayWSAFrameOnHidPage.
Also fixed cursor hotspot position.
svn-id: r19707
Diffstat (limited to 'kyra')
-rw-r--r-- | kyra/screen.cpp | 2 | ||||
-rw-r--r-- | kyra/script_v1.cpp | 32 |
2 files changed, 31 insertions, 3 deletions
diff --git a/kyra/screen.cpp b/kyra/screen.cpp index e28f178712..d0813d5bec 100644 --- a/kyra/screen.cpp +++ b/kyra/screen.cpp @@ -1621,7 +1621,7 @@ void Screen::setMouseCursor(int x, int y, byte *shape) { _system->showMouse(false); copyRegionToBuffer(8, 0, 0, mouseWidth, mouseHeight, cursor); - _system->setMouseCursor(cursor, mouseWidth, mouseHeight, 0, 0, 0); + _system->setMouseCursor(cursor, mouseWidth, mouseHeight, x, y, 0); _system->showMouse(true); free(cursor); diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index d63c678025..13effe320f 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -483,7 +483,19 @@ int KyraEngine::cmd_destroyMouseItem(ScriptState *script) { } int KyraEngine::cmd_runSceneAnimUntilDone(ScriptState *script) { - warning("STUB: cmd_runSceneAnimUntilDone"); + debug(3, "cmd_runSceneAnimUntilDone(0x%X) (%d)", script, stackPos(0)); + _sprites->_anims[stackPos(0)].play = true; + _sprites->_animObjects[stackPos(0)].active = 1; + _screen->hideMouse(); + restoreAllObjectBackgrounds(); + flagAllObjectsForBkgdChange(); + preserveAnyChangedBackgrounds(); + while (_sprites->_anims[stackPos(0)].play) { + _sprites->updateSceneAnims(); + updateAllObjectShapes(); + } + restoreAllObjectBackgrounds(); + _screen->showMouse(); return 0; } @@ -634,6 +646,7 @@ int KyraEngine::cmd_runWSAFromBeginningToEnd(ScriptState *script) { if (wsaFrame >= wsa_getNumFrames(_wsaObjects[wsaIndex])) running = false; + // XXX waitTicks(waitTime); if (worldUpdate) { _sprites->updateSceneAnims(); @@ -656,6 +669,7 @@ int KyraEngine::cmd_displayWSAFrame(ScriptState *script) { int wsaIndex = stackPos(4); _screen->hideMouse(); wsa_play(_wsaObjects[wsaIndex], frame, xpos, ypos, 0); + // XXX waitTicks(waitTime); _sprites->updateSceneAnims(); updateAllObjectShapes(); @@ -832,7 +846,21 @@ int KyraEngine::cmd_loadSoundFile(ScriptState *script) { } int KyraEngine::cmd_displayWSAFrameOnHidPage(ScriptState *script) { - warning("STUB: cmd_displayWSAFrameOnHidPage"); + debug(3, "cmd_displayWSAFrameOnHidPage(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(3), stackPos(4)); + int frame = stackPos(0); + int xpos = stackPos(1); + int ypos = stackPos(2); + int waitTime = stackPos(3); + int wsaIndex = stackPos(4); + + _screen->hideMouse(); + wsa_play(_wsaObjects[wsaIndex], frame, xpos, ypos, 2); + // XXX + waitTicks(waitTime); + _sprites->updateSceneAnims(); + updateAllObjectShapes(); + _screen->showMouse(); + return 0; } |