diff options
author | Johannes Schickel | 2008-05-18 13:22:06 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-05-18 13:22:06 +0000 |
commit | fad7e1f3c11021f1656c1cee855d131b3373be16 (patch) | |
tree | 6fa3def6bceb6559a91e9700be932ed287444e13 /engines | |
parent | c72ac9916c4fec3328e0857ef59ee892dd753959 (diff) | |
download | scummvm-rg350-fad7e1f3c11021f1656c1cee855d131b3373be16.tar.gz scummvm-rg350-fad7e1f3c11021f1656c1cee855d131b3373be16.tar.bz2 scummvm-rg350-fad7e1f3c11021f1656c1cee855d131b3373be16.zip |
Reverted commit #32166.
svn-id: r32170
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/kyra_hof.h | 1 | ||||
-rw-r--r-- | engines/kyra/kyra_lok.h | 1 | ||||
-rw-r--r-- | engines/kyra/kyra_v1.h | 1 | ||||
-rw-r--r-- | engines/kyra/script_hof.cpp | 8 | ||||
-rw-r--r-- | engines/kyra/script_lok.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/script_v1.cpp | 6 |
6 files changed, 8 insertions, 15 deletions
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h index 7f13ae6be1..fe4b6390b7 100644 --- a/engines/kyra/kyra_hof.h +++ b/engines/kyra/kyra_hof.h @@ -742,7 +742,6 @@ protected: int o2_setDrawNoShapeFlag(EMCState *script); int o2_setRunFlag(EMCState *script); int o2_showLetter(EMCState *script); - int o2_fillRect(EMCState *script); int o2_playFireflyScore(EMCState *script); int o2_encodeShape(EMCState *script); int o2_defineSceneAnim(EMCState *script); diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index 679094cdf3..d3e06c701f 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -791,7 +791,6 @@ protected: int o1_pauseMusicSeconds(EMCState *script); int o1_resetMaskRegion(EMCState *script); int o1_setPaletteChangeFlag(EMCState *script); - int o1_fillRect(EMCState *script); int o1_vocUnload(EMCState *script); int o1_vocLoad(EMCState *script); int o1_dummy(EMCState *script); diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 742d7549c0..81a6254c7f 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -227,6 +227,7 @@ protected: int o1_getMouseState(EMCState *script); int o1_setDeathHandler(EMCState *script); int o1_playWanderScoreViaMap(EMCState *script); + int o1_fillRect(EMCState *script); int o1_blockInWalkableRegion(EMCState *script); int o1_blockOutWalkableRegion(EMCState *script); int o1_playSoundEffect(EMCState *script); diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index df6ebb1bcb..d2b6b08183 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -838,12 +838,6 @@ int KyraEngine_HoF::o2_showLetter(EMCState *script) { return 0; } -int KyraEngine_HoF::o2_fillRect(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_fillRect(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); - _screen->fillRect(stackPos(1), stackPos(2), stackPos(1)+stackPos(3), stackPos(2)+stackPos(4), stackPos(5), stackPos(0)); - return 0; -} - int KyraEngine_HoF::o2_playFireflyScore(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_playFireflyScore(%p) ()", (const void *)script); if (_sound->getSfxType() == Sound::kAdlib || _sound->getSfxType() == Sound::kMidiMT32 || _sound->getSfxType() == Sound::kMidiGM) { @@ -1630,7 +1624,7 @@ void KyraEngine_HoF::setupOpcodeTable() { Opcode(o2_setRunFlag); Opcode(o2_showLetter); OpcodeUnImpl(); - Opcode(o2_fillRect); + Opcode(o1_fillRect); // 0x68 OpcodeUnImpl(); OpcodeUnImpl(); diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp index 90353328ac..670c7282e3 100644 --- a/engines/kyra/script_lok.cpp +++ b/engines/kyra/script_lok.cpp @@ -1706,12 +1706,6 @@ int KyraEngine_LoK::o1_setPaletteChangeFlag(EMCState *script) { return _paletteChanged; } -int KyraEngine_LoK::o1_fillRect(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_fillRect(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); - _screen->fillRect(stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(0)); - return 0; -} - int KyraEngine_LoK::o1_vocUnload(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_vocUnload(%p) ()", (const void *)script); // this should unload all voc files (not needed) diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index 4795263ff3..f74c7e3560 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -96,6 +96,12 @@ int KyraEngine_v1::o1_playWanderScoreViaMap(EMCState *script) { return 0; } +int KyraEngine_v1::o1_fillRect(EMCState *script) { + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fillRect(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); + screen()->fillRect(stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(0)); + return 0; +} + int KyraEngine_v1::o1_blockInWalkableRegion(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); screen()->blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1); |