diff options
| author | Gregory Montoir | 2006-12-10 00:41:45 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2006-12-10 00:41:45 +0000 |
| commit | 80dfce00a599824a257d32de99c0b0633a6827bb (patch) | |
| tree | dfe147129cdb7eba69b941f970b844597a7505e2 /engines/touche/opcodes.cpp | |
| parent | 56d63740e8aa9a44c096ebccfa88fb5e402a04d1 (diff) | |
| download | scummvm-rg350-80dfce00a599824a257d32de99c0b0633a6827bb.tar.gz scummvm-rg350-80dfce00a599824a257d32de99c0b0633a6827bb.tar.bz2 scummvm-rg350-80dfce00a599824a257d32de99c0b0633a6827bb.zip | |
cleanup (added a few more constants, renamed some opcodes) and reverted my previous change to op_sleep.
svn-id: r24830
Diffstat (limited to 'engines/touche/opcodes.cpp')
| -rw-r--r-- | engines/touche/opcodes.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/engines/touche/opcodes.cpp b/engines/touche/opcodes.cpp index 65124449aa..04fe0cabda 100644 --- a/engines/touche/opcodes.cpp +++ b/engines/touche/opcodes.cpp @@ -175,7 +175,7 @@ void ToucheEngine::setupOpcodes() { &ToucheEngine::op_sleep, 0, /* 0x74 */ - &ToucheEngine::op_delay, + &ToucheEngine::op_setKeyCharDelay, &ToucheEngine::op_lockHitBox, &ToucheEngine::op_removeItemFromInventory, &ToucheEngine::op_unlockHitBox, @@ -192,7 +192,7 @@ void ToucheEngine::setupOpcodes() { /* 0x80 */ &ToucheEngine::op_unsetKeyCharFlags, &ToucheEngine::op_drawSpriteOnBackdrop, - &ToucheEngine::op_loadVoice, + &ToucheEngine::op_loadSpeechSegment, 0, /* 0x84 */ &ToucheEngine::op_startPaletteFadeIn, @@ -868,12 +868,18 @@ void ToucheEngine::op_startMusic() { void ToucheEngine::op_sleep() { debugC(9, kDebugOpcodes, "ToucheEngine::op_sleep()"); - int16 cycles = _script.readNextWord(); - _sleepCycles = cycles * 2; + // this should probably be turned into a no-op/debug-op... + int cycles = _script.readNextWord() * 2; + if (!_fastMode) { + for (; cycles > 0; --cycles) { + _system->delayMillis(kCycleDelay); + _system->updateScreen(); + } + } } -void ToucheEngine::op_delay() { - debugC(9, kDebugOpcodes, "ToucheEngine::op_delay()"); +void ToucheEngine::op_setKeyCharDelay() { + debugC(9, kDebugOpcodes, "ToucheEngine::op_setKeyCharDelay()"); int16 delay = _script.readNextWord(); _keyCharsTable[_script.keyCharNum].delay = delay; _script.quitFlag = 3; @@ -927,8 +933,8 @@ void ToucheEngine::op_unsetKeyCharFlags() { _keyCharsTable[keyChar].flags &= ~flags; } -void ToucheEngine::op_loadVoice() { - debugC(9, kDebugOpcodes, "ToucheEngine::op_loadVoice()"); +void ToucheEngine::op_loadSpeechSegment() { + debugC(9, kDebugOpcodes, "ToucheEngine::op_loadSpeechSegment()"); int16 num = _script.readNextWord(); res_loadSpeech(num); } |