From b17c6e100e5b34aa93a97968df57b3e7905fa0a7 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 2 May 2008 15:59:57 +0000 Subject: Started to move opcodes used in both kyra2 and kyra3 to KyraEngine_v2. svn-id: r31825 --- engines/kyra/script_hof.cpp | 45 --------------------------------------------- 1 file changed, 45 deletions(-) (limited to 'engines/kyra/script_hof.cpp') diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index dc2c825d72..29a426d575 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -89,26 +89,6 @@ int KyraEngine_HoF::o2_refreshCharacter(EMCState *script) { return 0; } -int KyraEngine_HoF::o2_getCharacterX(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getCharacterX(%p) ()", (const void *)script); - return _mainCharacter.x1; -} - -int KyraEngine_HoF::o2_getCharacterY(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getCharacterY(%p) ()", (const void *)script); - return _mainCharacter.y1; -} - -int KyraEngine_HoF::o2_getCharacterFacing(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getCharacterFacing(%p) ()", (const void *)script); - return _mainCharacter.facing; -} - -int KyraEngine_HoF::o2_getCharacterScene(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getCharacterScene(%p) ()", (const void *)script); - return _mainCharacter.sceneId; -} - int KyraEngine_HoF::o2_setSceneComment(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_setSceneComment(%p) ('%s')", (const void *)script, stackPosString(0)); _sceneCommentString = stackPosString(0); @@ -134,31 +114,6 @@ int KyraEngine_HoF::o2_setCharacterFacing(EMCState *script) { return 0; } -int KyraEngine_HoF::o2_trySceneChange(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script, - stackPos(0), stackPos(1), stackPos(2), stackPos(3)); - - _unkHandleSceneChangeFlag = 1; - int success = inputSceneChange(stackPos(0), stackPos(1), stackPos(2), stackPos(3)); - _unkHandleSceneChangeFlag = 0; - - if (success) { - _emc->init(script, script->dataPtr); - _unk4 = 0; - _unk3 = -1; - _unk5 = 1; - return 0; - } else { - return (_unk4 != 0) ? 1 : 0; - } -} - -int KyraEngine_HoF::o2_moveCharacter(EMCState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_moveCharacter(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); - moveCharacter(stackPos(0), stackPos(1), stackPos(2)); - return 0; -} - int KyraEngine_HoF::o2_customCharacterChat(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_customCharacterChat(%p) ('%s', %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); playVoice(_vocHigh, stackPos(4)); -- cgit v1.2.3