From f7b49851264843b6e24c57dcbf9ca4751d6dae2f Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 28 Dec 2005 21:34:40 +0000 Subject: Implemented: - cmd_magicInMouseItem - cmd_poisonDeathNow - cmd_poisonBrandonAndRemaps - cmd_playFluteAnimation Also implemented healing function for brandon. And implemented poison death sequence. svn-id: r19841 --- kyra/script_v1.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'kyra/script_v1.cpp') diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index 87a641b0a3..28beb26353 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -299,7 +299,8 @@ void ScriptHelper::c1_setRetAndJmp() { #define stackPosString(x) (char*)&script->dataPtr->text[READ_BE_UINT16(&((uint16 *)script->dataPtr->text)[stackPos(x)])] int KyraEngine::cmd_magicInMouseItem(ScriptState *script) { - warning("STUB: cmd_magicInMouseItem"); + debug(3, "cmd_magicInMouseItem(0x%X) (%d, %d)", script, stackPos(0), stackPos(1)); + magicInMouseItem(stackPos(0), stackPos(1), -1); return 0; } @@ -640,7 +641,8 @@ int KyraEngine::cmd_forceBrandonToNormal(ScriptState *script) { } int KyraEngine::cmd_poisonDeathNow(ScriptState *script) { - warning("STUB: cmd_poisonDeathNow"); + debug(3, "cmd_poisonDeathNow(0x%X) ()", script); + seq_poisonDeathNow(1); return 0; } @@ -1579,7 +1581,8 @@ int KyraEngine::cmd_setSceneAnimCurrXY(ScriptState *script) { } int KyraEngine::cmd_poisonBrandonAndRemaps(ScriptState *script) { - warning("STUB: cmd_poisonBrandonAndRemaps"); + debug(3, "cmd_setSceneAnimCurrXY(0x%X) ()", script); + setBrandonPoisonFlags(1); return 0; } @@ -1610,7 +1613,8 @@ int KyraEngine::cmd_queryBrandonStatusBit(ScriptState *script) { } int KyraEngine::cmd_playFluteAnimation(ScriptState *script) { - warning("STUB: cmd_playFluteAnimation"); + debug(3, "cmd_playFluteAnimation(0x%X) ()", script); + seq_playFluteAnimation(); return 0; } -- cgit v1.2.3