- Some more opcodes moved to KyraEngine_v1

- Yet more naming consistency fixes

svn-id: r32056

8 files changed, 58 insertions, 90 deletions

diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 8b03cbc019..fe4b6390b7 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -709,7 +709,6 @@ protected:
 	int o2_wipeDownMouseItem(EMCState *script);
 	int o2_getElapsedSecs(EMCState *script);
 	int o2_getTimerDelay(EMCState *script);
-	//int o2_playSoundEffect(EMCState *script);
 	int o2_delaySecs(EMCState *script);
 	int o2_setTimerDelay(EMCState *script);
 	int o2_setScaleTableItem(EMCState *script);
@@ -736,17 +735,13 @@ protected:
 	int o2_setLayerFlag(EMCState *script);
 	int o2_setZanthiaPos(EMCState *script);
 	int o2_loadMusicTrack(EMCState *script);
-	int o2_playSoundEffect(EMCState *script);
 	int o2_setSceneAnimPos(EMCState *script);
-	int o2_blockInRegion(EMCState *script);
-	int o2_blockOutRegion(EMCState *script);
 	int o2_setCauldronState(EMCState *script);
 	int o2_showItemString(EMCState *script);
 	int o2_isAnySoundPlaying(EMCState *script);
 	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 4e68a9da22..05900ffe7b 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -658,8 +658,6 @@ protected:
 	int o1_drawSceneAnimShape(EMCState *script);
 	int o1_runNPCScript(EMCState *script);
 	int o1_setSpecialExitList(EMCState *script);
-	int o1_blockInWalkableRegion(EMCState *script);
-	int o1_blockOutWalkableRegion(EMCState *script);
 	int o1_walkPlayerToPoint(EMCState *script);
 	int o1_dropItemInScene(EMCState *script);
 	int o1_drawAnimShapeIntoScene(EMCState *script);
@@ -670,7 +668,6 @@ protected:
 	int o1_mouseIsPointer(EMCState *script);
 	int o1_runSceneAnimUntilDone(EMCState *script);
 	int o1_fadeSpecialPalette(EMCState *script);
-	int o1_playSoundEffect(EMCState *script);
 	int o1_phaseInSameScene(EMCState *script);
 	int o1_setScenePhasingFlag(EMCState *script);
 	int o1_resetScenePhasingFlag(EMCState *script);
@@ -723,7 +720,7 @@ protected:
 	int o1_mobileCharacterInScene(EMCState *script);
 	int o1_hideMobileCharacter(EMCState *script);
 	int o1_unhideMobileCharacter(EMCState *script);
-	int o1_setCharactersLocation(EMCState *script);
+	int o1_setCharacterLocation(EMCState *script);
 	int o1_walkCharacterToPoint(EMCState *script);
 	int o1_specialEventDisplayBrynnsNote(EMCState *script);
 	int o1_specialEventRemoveBrynnsNote(EMCState *script);
@@ -732,8 +729,8 @@ protected:
 	int o1_preserveAllObjectBackgrounds(EMCState *script);
 	int o1_updateSceneAnimations(EMCState *script);
 	int o1_sceneAnimationActive(EMCState *script);
-	int o1_setCharactersMovementDelay(EMCState *script);
-	int o1_getCharactersFacing(EMCState *script);
+	int o1_setCharacterMovementDelay(EMCState *script);
+	int o1_getCharacterFacing(EMCState *script);
 	int o1_bkgdScrollSceneAndMasksRight(EMCState *script);
 	int o1_dispelMagicAnimation(EMCState *script);
 	int o1_findBrightestFireberry(EMCState *script);
@@ -742,7 +739,7 @@ protected:
 	int o1_drinkPotionAnimation(EMCState *script);
 	int o1_makeAmuletAppear(EMCState *script);
 	int o1_drawItemShapeIntoScene(EMCState *script);
-	int o1_setCharactersCurrentFrame(EMCState *script);
+	int o1_setCharacterCurrentFrame(EMCState *script);
 	int o1_waitForConfirmationMouseClick(EMCState *script);
 	int o1_pageFlip(EMCState *script);
 	int o1_setSceneFile(EMCState *script);
@@ -755,7 +752,7 @@ protected:
 	int o1_setSceneAnimCurrXY(EMCState *script);
 	int o1_poisonBrandonAndRemaps(EMCState *script);
 	int o1_fillFlaskWithWater(EMCState *script);
-	int o1_getCharactersMovementDelay(EMCState *script);
+	int o1_getCharacterMovementDelay(EMCState *script);
 	int o1_getBirthstoneGem(EMCState *script);
 	int o1_queryBrandonStatusBit(EMCState *script);
 	int o1_playFluteAnimation(EMCState *script);
@@ -794,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_dummy(EMCState *script);
 	int o1_vocUnload(EMCState *script);
 	int o1_vocLoad(EMCState *script);
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 5831759314..79ef7903e3 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -631,7 +631,7 @@ private:
 	int o3_playSoundEffect(EMCState *script);
 	int o3_getScore(EMCState *script);
 	int o3_daggerWarning(EMCState *script);
-	int o3_blockOutRegion(EMCState *script);
+	int o3_blockOutWalkableRegion(EMCState *script);
 	int o3_showSceneStringsMessage(EMCState *script);
 	int o3_showGoodConscience(EMCState *script);
 	int o3_goodConscienceChat(EMCState *script);
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 0a7bf40a12..81a6254c7f 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -227,6 +227,10 @@ 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);
 
 	// items
 	int _mouseState;
diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp
index 00dcc1fe6a..8ab6fb9424 100644
--- a/engines/kyra/script_hof.cpp
+++ b/engines/kyra/script_hof.cpp
@@ -723,12 +723,6 @@ int KyraEngine_HoF::o2_loadMusicTrack(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_HoF::o2_playSoundEffect(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0));
-	snd_playSoundEffect(stackPos(0));
-	return 0;
-}
-
 int KyraEngine_HoF::o2_setSceneAnimPos(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_setSceneAnimPos(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	_sceneAnims[stackPos(0)].x = stackPos(1);
@@ -736,18 +730,6 @@ int KyraEngine_HoF::o2_setSceneAnimPos(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_HoF::o2_blockInRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_blockInRegion(%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);
-	return 0;
-}
-
-int KyraEngine_HoF::o2_blockOutRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_blockOutRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-	_screen->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
-	return 0;
-}
-
 int KyraEngine_HoF::o2_setCauldronState(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_setCauldronState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	setCauldronState(stackPos(0), stackPos(1) != 0);
@@ -856,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) {
@@ -1578,7 +1554,7 @@ void KyraEngine_HoF::setupOpcodeTable() {
 	Opcode(o2_getElapsedSecs);
 	// 0x34
 	Opcode(o2_getTimerDelay);
-	Opcode(o2_playSoundEffect);
+	Opcode(o1_playSoundEffect);
 	Opcode(o2_delaySecs);
 	Opcode(o2_delay);
 	// 0x38
@@ -1623,11 +1599,11 @@ void KyraEngine_HoF::setupOpcodeTable() {
 	Opcode(o2_loadMusicTrack);
 	// 0x58
 	Opcode(o1_playWanderScoreViaMap);
-	Opcode(o2_playSoundEffect);
+	Opcode(o1_playSoundEffect);
 	Opcode(o2_setSceneAnimPos);
-	Opcode(o2_blockInRegion);
+	Opcode(o1_blockInWalkableRegion);
 	// 0x5c
-	Opcode(o2_blockOutRegion);
+	Opcode(o1_blockOutWalkableRegion);
 	OpcodeUnImpl();
 	Opcode(o2_setCauldronState);
 	Opcode(o2_showItemString);
@@ -1640,7 +1616,7 @@ void KyraEngine_HoF::setupOpcodeTable() {
 	Opcode(o2_setRunFlag);
 	Opcode(o2_showLetter);
 	OpcodeUnImpl();
-	Opcode(o2_fillRect);
+	Opcode(o1_fillRect);
 	// 0x68
 	OpcodeUnImpl();
 	OpcodeUnImpl();
@@ -1737,7 +1713,7 @@ void KyraEngine_HoF::setupOpcodeTable() {
 	// 0x00
 	Opcode(o2a_setAnimationShapes);
 	Opcode(o2a_setCharacterFrame);
-	Opcode(o2_playSoundEffect);
+	Opcode(o1_playSoundEffect);
 	Opcode(o2_fadeScenePal);
 	// 0x04
 	_flags.isTalkie ? Opcode(o2a_setResetFrame) : Opcode(o2_dummy);
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp
index 6016feff0f..14fd2ca642 100644
--- a/engines/kyra/script_lok.cpp
+++ b/engines/kyra/script_lok.cpp
@@ -107,18 +107,6 @@ int KyraEngine_LoK::o1_setSpecialExitList(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_LoK::o1_blockInWalkableRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::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);
-	return 0;
-}
-
-int KyraEngine_LoK::o1_blockOutWalkableRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-	_screen->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
-	return 0;
-}
-
 int KyraEngine_LoK::o1_walkPlayerToPoint(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_walkPlayerToPoint(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 
@@ -256,12 +244,6 @@ int KyraEngine_LoK::o1_fadeSpecialPalette(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_LoK::o1_playSoundEffect(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0));
-	snd_playSoundEffect(stackPos(0));
-	return 0;
-}
-
 int KyraEngine_LoK::o1_phaseInSameScene(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_phaseInSameScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	transcendScenes(stackPos(0), stackPos(1));
@@ -940,8 +922,8 @@ int KyraEngine_LoK::o1_unhideMobileCharacter(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_LoK::o1_setCharactersLocation(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharactersLocation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setCharacterLocation(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharacterLocation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	Character *ch = &_characterList[stackPos(0)];
 	Animator_LoK::AnimObject *animObj = &_animator->actors()[stackPos(0)];
 	int newScene = stackPos(1);
@@ -1112,14 +1094,14 @@ int KyraEngine_LoK::o1_sceneAnimationActive(EMCState *script) {
 	return _sprites->_anims[stackPos(0)].play;
 }
 
-int KyraEngine_LoK::o1_setCharactersMovementDelay(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharactersMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setCharacterMovementDelay(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharacterMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_timer->setDelay(stackPos(0)+5, stackPos(1));
 	return 0;
 }
 
-int KyraEngine_LoK::o1_getCharactersFacing(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharactersFacing(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getCharacterFacing(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharacterFacing(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].facing;
 }
 
@@ -1298,8 +1280,8 @@ int KyraEngine_LoK::o1_drawItemShapeIntoScene(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_LoK::o1_setCharactersCurrentFrame(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharactersCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setCharacterCurrentFrame(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharacterCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_characterList[stackPos(0)].currentAnimFrame = stackPos(1);
 	return 0;
 }
@@ -1399,8 +1381,8 @@ int KyraEngine_LoK::o1_fillFlaskWithWater(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_LoK::o1_getCharactersMovementDelay(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharactersMovementDelay(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getCharacterMovementDelay(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharacterMovementDelay(%p) (%d)", (const void *)script, stackPos(0));
 	return _timer->getDelay(stackPos(0)+5);
 }
 
@@ -1724,15 +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, 0x%X)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
-	int videoPageBackup = _screen->_curPage;
-	_screen->_curPage = stackPos(0);
-	_screen->fillRect(stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
-	_screen->_curPage = videoPageBackup;
-	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)
@@ -1860,7 +1833,7 @@ void KyraEngine_LoK::setupOpcodeTable() {
 	Opcode(o1_hideMobileCharacter);
 	Opcode(o1_unhideMobileCharacter);
 	// 0x50
-	Opcode(o1_setCharactersLocation);
+	Opcode(o1_setCharacterLocation);
 	Opcode(o1_walkCharacterToPoint);
 	Opcode(o1_specialEventDisplayBrynnsNote);
 	Opcode(o1_specialEventRemoveBrynnsNote);
@@ -1871,8 +1844,8 @@ void KyraEngine_LoK::setupOpcodeTable() {
 	Opcode(o1_updateSceneAnimations);
 	// 0x58
 	Opcode(o1_sceneAnimationActive);
-	Opcode(o1_setCharactersMovementDelay);
-	Opcode(o1_getCharactersFacing);
+	Opcode(o1_setCharacterMovementDelay);
+	Opcode(o1_getCharacterFacing);
 	Opcode(o1_bkgdScrollSceneAndMasksRight);
 	// 0x5c
 	Opcode(o1_dispelMagicAnimation);
@@ -1883,7 +1856,7 @@ void KyraEngine_LoK::setupOpcodeTable() {
 	Opcode(o1_drinkPotionAnimation);
 	Opcode(o1_makeAmuletAppear);
 	Opcode(o1_drawItemShapeIntoScene);
-	Opcode(o1_setCharactersCurrentFrame);
+	Opcode(o1_setCharacterCurrentFrame);
 	// 0x64
 	Opcode(o1_waitForConfirmationMouseClick);
 	Opcode(o1_pageFlip);
@@ -1900,7 +1873,7 @@ void KyraEngine_LoK::setupOpcodeTable() {
 	Opcode(o1_poisonBrandonAndRemaps);
 	Opcode(o1_fillFlaskWithWater);
 	// 0x70
-	Opcode(o1_getCharactersMovementDelay);
+	Opcode(o1_getCharacterMovementDelay);
 	Opcode(o1_getBirthstoneGem);
 	Opcode(o1_queryBrandonStatusBit);
 	Opcode(o1_playFluteAnimation);
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp
index 965a727071..9a059ead2a 100644
--- a/engines/kyra/script_mr.cpp
+++ b/engines/kyra/script_mr.cpp
@@ -811,8 +811,8 @@ int KyraEngine_MR::o3_daggerWarning(EMCState *script) {
 	return selection;
 }
 
-int KyraEngine_MR::o3_blockOutRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_blockOutRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_MR::o3_blockOutWalkableRegion(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	const int x1 = stackPos(0);
 	int y1 = stackPos(1);
 	const int x2 = stackPos(2);
@@ -1266,7 +1266,7 @@ void KyraEngine_MR::setupOpcodeTable() {
 	Opcode(o3_getScore);
 	Opcode(o3_daggerWarning);
 	// 0x5c
-	Opcode(o3_blockOutRegion);
+	Opcode(o3_blockOutWalkableRegion);
 	Opcode(o3_dummy);
 	Opcode(o3_showSceneStringsMessage);
 	OpcodeUnImpl();
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index 80678db32d..7881605b9e 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -96,5 +96,29 @@ 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(1)+stackPos(3), stackPos(2)+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);
+	return 0;
+}
+
+int KyraEngine_v1::o1_blockOutWalkableRegion(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	screen()->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
+	return 0;
+}
+
+int KyraEngine_v1::o1_playSoundEffect(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0));
+	snd_playSoundEffect(stackPos(0));
+	return 0;
+}
+
 } // end of namespace Kyra