diff options
| author | Paweł Kołodziejski | 2004-01-06 17:28:29 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-01-06 17:28:29 +0000 |
| commit | 8fd123992d746a3afa683b60790668757d0c9437 (patch) | |
| tree | 5f9b3d854b8aad9c40e50e7cf0e51e3485bc6c33 /scumm/script_v8.cpp | |
| parent | 2c2ae5f59ff309950fe5ffabbdb309b89f7531b8 (diff) | |
| download | scummvm-rg350-8fd123992d746a3afa683b60790668757d0c9437.tar.gz scummvm-rg350-8fd123992d746a3afa683b60790668757d0c9437.tar.bz2 scummvm-rg350-8fd123992d746a3afa683b60790668757d0c9437.zip | |
synced imuse digital with local tree
svn-id: r12187
Diffstat (limited to 'scumm/script_v8.cpp')
| -rw-r--r-- | scumm/script_v8.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 7ae55bac74..61fec48cbb 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -24,7 +24,7 @@ #include "scumm/actor.h" #include "scumm/akos.h" #include "scumm/charset.h" -#include "scumm/imuse_digi.h" +#include "scumm/imuse_digi/dimuse.h" #include "scumm/intern.h" #include "scumm/object.h" #include "scumm/resource.h" @@ -1444,14 +1444,9 @@ void ScummEngine_v8::o8_kernelGetFunctions() { break; } case 0xDA: // lipSyncWidth + push(_imuseDigital->getCurVoiceLipSyncWidth()); case 0xDB: // lipSyncHeight - { - // TODO - get lip sync data for the currently active voice - // HACK - return random values for now, to make things look half decent - int val = _rnd.getRandomNumber(255); -// warning("o8_kernelGetFunctions: lipSync(case 0x%x, len %d, val %d)", args[0], len, val); - push(val); - } + push(_imuseDigital->getCurVoiceLipSyncHeight()); break; case 0xDC: // actorTalkAnimation { @@ -1482,18 +1477,12 @@ void ScummEngine_v8::o8_kernelGetFunctions() { } break; case 0xE1: // imGetMusicPosition - warning("o8_kernelGetFunctions: imGetMusicPosition(stub)"); - // FIXME - get this stuff to be properly implemented - push(_imuseDigital->_bundleSongPosInMs); + push(_imuseDigital->getCurMusicPosInMs()); break; case 0xE2: // musicLipSyncWidth + push(_imuseDigital->getCurMusicLipSyncWidth()); case 0xE3: // musicLipSyncHeight - { - // TODO - get lip sync data for the currently active music - int val = _rnd.getRandomNumber(255); -// warning("o8_kernelGetFunctions: musicLipSync(case 0x%x, len %d, val %d)", args[0], len, val); - push(val); - } + push(_imuseDigital->getCurMusicLipSyncHeight()); break; default: error("o8_kernelGetFunctions: default case 0x%x (len = %d)", args[0], len); |