libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted commit #32166.

Browse Source 
svn-id: r32170
This commit is contained in:
Johannes Schickel 2008-05-18 13:22:06 +00:00
parent c72ac9916c
commit fad7e1f3c1
6 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/kyra/kyra_hof.h
View File

@ -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);

1
engines/kyra/kyra_lok.h
View File

@ -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);

1
engines/kyra/kyra_v1.h
View File

@ -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);

8
engines/kyra/script_hof.cpp
View File

@ -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();

6
engines/kyra/script_lok.cpp
View File

@ -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)

6
engines/kyra/script_v1.cpp
View File

@ -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);