diff options
| author | Florian Kagerer | 2009-09-02 06:24:01 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-09-02 06:24:01 +0000 |
| commit | ad5d918ad5f90cedd3d851cb821d63d6a5de4294 (patch) | |
| tree | f5081251b7f3c948ca6d1e559980df11dbabc591 /engines/kyra/script_lol.cpp | |
| parent | b2415c11c70a72c3f11595bd72b4780241ac4fbe (diff) | |
| download | scummvm-rg350-ad5d918ad5f90cedd3d851cb821d63d6a5de4294.tar.gz scummvm-rg350-ad5d918ad5f90cedd3d851cb821d63d6a5de4294.tar.bz2 scummvm-rg350-ad5d918ad5f90cedd3d851cb821d63d6a5de4294.zip | |
LOL: update kyra.dat with floppy version data (floppy version still doesn't work, though)
svn-id: r43904
Diffstat (limited to 'engines/kyra/script_lol.cpp')
| -rw-r--r-- | engines/kyra/script_lol.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index e4b77f6a07..432603be5c 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -2257,6 +2257,10 @@ int LoLEngine::olol_setMouseCursor(EMCState *script) { int LoLEngine::olol_characterSays(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_characterSays(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); + + if (!_flags.isTalkie) + return 0; + if (stackPos(0) == -1) { snd_stopSpeech(true); return 1; @@ -2305,7 +2309,7 @@ int LoLEngine::olol_getLanguage(EMCState *script) { #pragma mark - int LoLEngine::tlol_setupPaletteFade(const TIM *tim, const uint16 *param) { - debugC(3, kDebugLevelScriptFuncs, "LoLEngine::t2_playSoundEffect(%p, %p) (%d)", (const void *)tim, (const void *)param, param[0]); + debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_setupPaletteFade(%p, %p) (%d)", (const void *)tim, (const void *)param, param[0]); _screen->getFadeParams(_screen->getPalette(0), param[0], _tim->_palDelayInc, _tim->_palDiff); _tim->_palDelayAcc = 0; return 1; |