diff options
| author | Johannes Schickel | 2008-05-12 13:19:11 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-12 13:19:11 +0000 |
| commit | 4db0bd90465fe74252d8a35751856991b31f7788 (patch) | |
| tree | a4c950832281ccbc5da639a716dfd16f7edc6ded /engines/kyra | |
| parent | 56d2603d4f712877901e0ded022445e0d8984abe (diff) | |
| download | scummvm-rg350-4db0bd90465fe74252d8a35751856991b31f7788.tar.gz scummvm-rg350-4db0bd90465fe74252d8a35751856991b31f7788.tar.bz2 scummvm-rg350-4db0bd90465fe74252d8a35751856991b31f7788.zip | |
Two more KyraEngine_LoK opcodes renamed.
svn-id: r32057
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_lok.h | 4 | ||||
| -rw-r--r-- | engines/kyra/script_lok.cpp | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index 05900ffe7b..5e244e4925 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -654,7 +654,7 @@ protected: // Opcodes int o1_magicInMouseItem(EMCState *script); int o1_characterSays(EMCState *script); - int o1_pauseTicks(EMCState *script); + int o1_delay(EMCState *script); int o1_drawSceneAnimShape(EMCState *script); int o1_runNPCScript(EMCState *script); int o1_setSpecialExitList(EMCState *script); @@ -676,7 +676,7 @@ protected: int o1_setBirthstoneGem(EMCState *script); int o1_placeItemInGenericMapScene(EMCState *script); int o1_setBrandonStatusBit(EMCState *script); - int o1_pauseSeconds(EMCState *script); + int o1_delaySecs(EMCState *script); int o1_getCharacterScene(EMCState *script); int o1_runNPCSubscript(EMCState *script); int o1_magicOutMouseItem(EMCState *script); diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp index 14fd2ca642..670c7282e3 100644 --- a/engines/kyra/script_lok.cpp +++ b/engines/kyra/script_lok.cpp @@ -74,10 +74,10 @@ int KyraEngine_LoK::o1_characterSays(EMCState *script) { return 0; } -int KyraEngine_LoK::o1_pauseTicks(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseTicks(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +int KyraEngine_LoK::o1_delay(EMCState *script) { + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_delay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); if (stackPos(1)) { - warning("STUB: special o1_pauseTicks"); + warning("STUB: special o1_delay"); // delete this after correct implementing delayWithTicks(stackPos(0)); } else { @@ -319,8 +319,8 @@ int KyraEngine_LoK::o1_setBrandonStatusBit(EMCState *script) { return 0; } -int KyraEngine_LoK::o1_pauseSeconds(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseSeconds(%p) (%d)", (const void *)script, stackPos(0)); +int KyraEngine_LoK::o1_delaySecs(EMCState *script) { + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_delaySecs(%p) (%d)", (const void *)script, stackPos(0)); if (stackPos(0) > 0 && !_skipFlag) delay(stackPos(0)*1000, true); _skipFlag = false; @@ -1691,7 +1691,7 @@ int KyraEngine_LoK::o1_pauseMusicSeconds(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseMusicSeconds(%p) ()", (const void *)script); // if music disabled // return - o1_pauseSeconds(script); + o1_delaySecs(script); return 0; } @@ -1735,7 +1735,7 @@ void KyraEngine_LoK::setupOpcodeTable() { // 0x00 Opcode(o1_magicInMouseItem); Opcode(o1_characterSays); - Opcode(o1_pauseTicks); + Opcode(o1_delay); Opcode(o1_drawSceneAnimShape); // 0x04 Opcode(o1_queryGameFlag); @@ -1774,7 +1774,7 @@ void KyraEngine_LoK::setupOpcodeTable() { Opcode(o1_placeItemInGenericMapScene); // 0x20 Opcode(o1_setBrandonStatusBit); - Opcode(o1_pauseSeconds); + Opcode(o1_delaySecs); Opcode(o1_getCharacterScene); Opcode(o1_runNPCSubscript); // 0x24 |