From 6c672d92f0558a52c8d549e31f6b8f46f3d3f866 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 16 Mar 2008 18:42:29 +0000 Subject: Changed Kyra2 script debug printfs to be consistent with Kyra1 ones. svn-id: r31150 --- engines/kyra/script_v2.cpp | 238 ++++++++++++++++++++++----------------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index 5d4f3c2cb7..fc1b9957fa 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -33,7 +33,7 @@ namespace Kyra { int KyraEngine_v2::o2_setCharacterFacingRefresh(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setCharacterFacingRefresh(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharacterFacingRefresh(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2)); int animFrame = stackPos(2); if (animFrame >= 0) _mainCharacter.animFrame = animFrame; @@ -44,7 +44,7 @@ int KyraEngine_v2::o2_setCharacterFacingRefresh(ScriptState *script) { } int KyraEngine_v2::o2_setCharacterPos(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setCharacterFacingRefresh(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharacterFacingRefresh(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2)); int x = stackPos(1); int y = stackPos(2); @@ -60,7 +60,7 @@ int KyraEngine_v2::o2_setCharacterPos(ScriptState *script) { } int KyraEngine_v2::o2_defineObject(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_defineObject(%p) (%d, '%s', %d, %d, %d, %d)", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineObject(%p) (%d, '%s', %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); TalkObject *object = &_talkObjectList[stackPos(0)]; strcpy(object->filename, stackPosString(1)); @@ -72,7 +72,7 @@ int KyraEngine_v2::o2_defineObject(ScriptState *script) { } int KyraEngine_v2::o2_refreshCharacter(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_refreshCharacter(%p) (-, %d, %d, %d)", (const void *)script, stackPos(1), stackPos(2), stackPos(3)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_refreshCharacter(%p) (-, %d, %d, %d)", (const void *)script, stackPos(1), stackPos(2), stackPos(3)); int unk = stackPos(1); int facing = stackPos(2); int refresh = stackPos(3); @@ -87,33 +87,33 @@ int KyraEngine_v2::o2_refreshCharacter(ScriptState *script) { } int KyraEngine_v2::o2_getCharacterX(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getCharacterX(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterX(%p) ()", (const void *)script); return _mainCharacter.x1; } int KyraEngine_v2::o2_getCharacterY(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getCharacterY(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterY(%p) ()", (const void *)script); return _mainCharacter.y1; } int KyraEngine_v2::o2_getCharacterFacing(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getCharacterFacing(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterFacing(%p) ()", (const void *)script); return _mainCharacter.facing; } int KyraEngine_v2::o2_getCharacterScene(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getCharacterScene(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterScene(%p) ()", (const void *)script); return _mainCharacter.sceneId; } int KyraEngine_v2::o2_setSceneComment(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setSceneComment(%p) ('%s')", (const void *)script, stackPosString(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSceneComment(%p) ('%s')", (const void *)script, stackPosString(0)); _sceneCommentString = stackPosString(0); return 0; } int KyraEngine_v2::o2_setCharacterAnimFrame(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setCharacterAnimFrame(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharacterAnimFrame(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2)); int animFrame = stackPos(1); int updateAnim = stackPos(2); @@ -125,7 +125,7 @@ int KyraEngine_v2::o2_setCharacterAnimFrame(ScriptState *script) { } int KyraEngine_v2::o2_trySceneChange(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); _unkHandleSceneChangeFlag = 1; @@ -144,39 +144,39 @@ int KyraEngine_v2::o2_trySceneChange(ScriptState *script) { } int KyraEngine_v2::o2_customCharacterChat(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_customCharacterChat(%p) ('%s', %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::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)); _text->printCustomCharacterText(stackPosString(0), stackPos(1), stackPos(2), stackPos(3), 0, 2); return 0; } int KyraEngine_v2::o2_soundFadeOut(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_soundFadeOut(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_soundFadeOut(%p) ()", (const void *)script); _sound->beginFadeOut(); return 0; } int KyraEngine_v2::o2_showChapterMessage(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_showChapterMessage(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showChapterMessage(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); showChapterMessage(stackPos(0), stackPos(1)); return 0; } int KyraEngine_v2::o2_restoreTalkTextMessageBkgd(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_restoreTalkTextMessageBkgd(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_restoreTalkTextMessageBkgd(%p) ()", (const void *)script); _text->restoreTalkTextMessageBkgd(2, 0); return 0; } int KyraEngine_v2::o2_wsaClose(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_wsaClose(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_wsaClose(%p) (%d)", (const void *)script, stackPos(0)); assert(stackPos(0) >= 0 && stackPos(0) < ARRAYSIZE(_wsaSlots)); _wsaSlots[stackPos(0)]->close(); return 0; } int KyraEngine_v2::o2_displayWsaFrame(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_displayWsaFrame(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_displayWsaFrame(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8)); int frame = stackPos(0); int x = stackPos(1); @@ -211,7 +211,7 @@ int KyraEngine_v2::o2_displayWsaFrame(ScriptState *script) { } int KyraEngine_v2::o2_displayWsaSequentialFramesLooping(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_displayWsaSequentialFramesLooping(%p) (%d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_displayWsaSequentialFramesLooping(%p) (%d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7)); int startFrame = stackPos(0); int endFrame = stackPos(1); @@ -268,14 +268,14 @@ int KyraEngine_v2::o2_displayWsaSequentialFramesLooping(ScriptState *script) { } int KyraEngine_v2::o2_wsaOpen(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_wsaOpen(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_wsaOpen(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); assert(stackPos(1) >= 0 && stackPos(1) < ARRAYSIZE(_wsaSlots)); _wsaSlots[stackPos(1)]->open(stackPosString(0), 1, 0); return 0; } int KyraEngine_v2::o2_displayWsaSequentialFrames(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_displayWsaSequentialFrames(%p) (%d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_displayWsaSequentialFrames(%p) (%d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6)); uint16 frameDelay = stackPos(2) * _tickLength; uint16 currentFrame = stackPos(3); @@ -303,7 +303,7 @@ int KyraEngine_v2::o2_displayWsaSequentialFrames(ScriptState *script) { } int KyraEngine_v2::o2_displayWsaSequence(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_displayWsaSequence(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_displayWsaSequence(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); const int frameDelay = stackPos(2) * _tickLength; const int index = stackPos(3); @@ -335,7 +335,7 @@ int KyraEngine_v2::o2_displayWsaSequence(ScriptState *script) { } int KyraEngine_v2::o2_addItemToCurScene(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_addItemToCurScene(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addItemToCurScene(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); const int16 id = stackPos(0); int x = stackPos(1); int y = stackPos(2); @@ -357,18 +357,18 @@ int KyraEngine_v2::o2_addItemToCurScene(ScriptState *script) { } int KyraEngine_v2::o2_checkForItem(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_checkForItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_checkForItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); return findItem(stackPos(0), stackPos(1)) == -1 ? 0 : 1; } int KyraEngine_v2::o2_removeItemSlotFromInventory(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_removeItemSlotFromInventory(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_removeItemSlotFromInventory(%p) (%d)", (const void *)script, stackPos(0)); removeItemFromInventory(stackPos(0)); return 0; } int KyraEngine_v2::o2_defineItem(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_defineItem(%p) (%d, %d, %d, %d)", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineItem(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); int freeItem = findFreeItem(); @@ -383,7 +383,7 @@ int KyraEngine_v2::o2_defineItem(ScriptState *script) { } int KyraEngine_v2::o2_removeItemFromInventory(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_removeItemFromInventory(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_removeItemFromInventory(%p) (%d)", (const void *)script, stackPos(0)); uint16 item = stackPos(0); int slot = -1; while ((slot = getInventoryItemSlot(item)) != -1) @@ -392,7 +392,7 @@ int KyraEngine_v2::o2_removeItemFromInventory(ScriptState *script) { } int KyraEngine_v2::o2_countItemInInventory(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_countItemInInventory(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_countItemInInventory(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); uint16 item = stackPos(1); int count = 0; @@ -408,45 +408,45 @@ int KyraEngine_v2::o2_countItemInInventory(ScriptState *script) { } int KyraEngine_v2::o2_queryGameFlag(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_queryGameFlag(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_queryGameFlag(%p) (%d)", (const void *)script, stackPos(0)); return queryGameFlag(stackPos(0)); } int KyraEngine_v2::o2_resetGameFlag(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_resetGameFlag(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_resetGameFlag(%p) (%d)", (const void *)script, stackPos(0)); return resetGameFlag(stackPos(0)); } int KyraEngine_v2::o2_setGameFlag(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setGameFlag(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setGameFlag(%p) (%d)", (const void *)script, stackPos(0)); return setGameFlag(stackPos(0)); } int KyraEngine_v2::o2_setHandItem(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setHandItem(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setHandItem(%p) (%d)", (const void *)script, stackPos(0)); setHandItem(stackPos(0)); return 0; } int KyraEngine_v2::o2_removeHandItem(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_removeHandItem(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_removeHandItem(%p) ()", (const void *)script); removeHandItem(); return 0; } int KyraEngine_v2::o2_handItemSet(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_handItemSet(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_handItemSet(%p) ()", (const void *)script); return _handItemSet; } int KyraEngine_v2::o2_hideMouse(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_hideMouse(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_hideMouse(%p) ()", (const void *)script); _screen->hideMouse(); return 0; } int KyraEngine_v2::o2_addSpecialExit(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_addSpecialExit(%p) (%d, %d, %d, %d, %d)", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addSpecialExit(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); if (_specialExitCount < 5) { _specialExitTable[_specialExitCount+0] = stackPos(0); @@ -460,25 +460,25 @@ int KyraEngine_v2::o2_addSpecialExit(ScriptState *script) { } int KyraEngine_v2::o2_setMousePos(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); setMousePos(stackPos(0), stackPos(1)); return 0; } int KyraEngine_v2::o2_showMouse(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_showMouse(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showMouse(%p) ()", (const void *)script); _screen->showMouse(); return 0; } int KyraEngine_v2::o2_delaySecs(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_delaySecs(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delaySecs(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); delay(stackPos(0) * 1000, true); return 0; } int KyraEngine_v2::o2_delay(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_delay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); //if (stackPos(1)) // sub_27100(stackPos(0) * _tickLength); //else @@ -487,25 +487,25 @@ int KyraEngine_v2::o2_delay(ScriptState *script) { } int KyraEngine_v2::o2_setScaleTableItem(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setScaleTableItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setScaleTableItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); setScaleTableItem(stackPos(0), stackPos(1)); return 0; } int KyraEngine_v2::o2_setDrawLayerTableItem(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setDrawLayerTableItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setDrawLayerTableItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); setDrawLayerTableEntry(stackPos(0), stackPos(1)); return 0; } int KyraEngine_v2::o2_setCharPalEntry(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setCharPalEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharPalEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); setCharPalEntry(stackPos(0), stackPos(1)); return 0; } int KyraEngine_v2::o2_drawSceneShape(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_drawSceneShape(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_drawSceneShape(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); int shape = stackPos(0); @@ -530,7 +530,7 @@ int KyraEngine_v2::o2_drawSceneShape(ScriptState *script) { } int KyraEngine_v2::o2_drawSceneShapeOnPage(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_drawSceneShapeOnPage(%p) (%d, %d, %d, %d, %d)", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_drawSceneShapeOnPage(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); int shape = stackPos(0); int x = stackPos(1); @@ -543,19 +543,19 @@ int KyraEngine_v2::o2_drawSceneShapeOnPage(ScriptState *script) { } int KyraEngine_v2::o2_disableAnimObject(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_disableAnimObject(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_disableAnimObject(%p) (%d)", (const void *)script, stackPos(0)); _animObjects[stackPos(0)+1].enabled = false; return 0; } int KyraEngine_v2::o2_enableAnimObject(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_enableAnimObject(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_enableAnimObject(%p) (%d)", (const void *)script, stackPos(0)); _animObjects[stackPos(0)+1].enabled = true; return 0; } int KyraEngine_v2::o2_restoreBackBuffer(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_restoreBackBuffer(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_restoreBackBuffer(%p) (%d)", (const void *)script, stackPos(0)); int disable = stackPos(0); int oldState = 0; @@ -573,7 +573,7 @@ int KyraEngine_v2::o2_restoreBackBuffer(ScriptState *script) { } int KyraEngine_v2::o2_update(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_update(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_update(%p) (%d)", (const void *)script, stackPos(0)); int times = stackPos(0); while (times--) { @@ -587,13 +587,13 @@ int KyraEngine_v2::o2_update(ScriptState *script) { } int KyraEngine_v2::o2_fadeScenePal(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_fadeScenePal(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_fadeScenePal(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); fadeScenePal(stackPos(0), stackPos(1)); return 0; } int KyraEngine_v2::o2_enterNewSceneEx(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_enterNewSceneEx(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_enterNewSceneEx(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); int skipNpcScript = stackPos(3); @@ -613,7 +613,7 @@ int KyraEngine_v2::o2_enterNewSceneEx(ScriptState *script) { } int KyraEngine_v2::o2_switchScene(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_switchScene(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_switchScene(%p) (%d)", (const void *)script, stackPos(0)); setGameFlag(0x1EF); _mainCharX = _mainCharacter.x1; _mainCharY = _mainCharacter.y1; @@ -624,12 +624,12 @@ int KyraEngine_v2::o2_switchScene(ScriptState *script) { } int KyraEngine_v2::o2_getShapeFlag1(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getShapeFlag1(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getShapeFlag1(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); return _screen->getShapeFlag1(stackPos(0), stackPos(1)); } int KyraEngine_v2::o2_setLayerFlag(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setLayerFlag(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setLayerFlag(%p) (%d)", (const void *)script, stackPos(0)); int layer = stackPos(0); if (layer >= 1 && layer <= 16) _layerFlagTable[layer] = 1; @@ -637,7 +637,7 @@ int KyraEngine_v2::o2_setLayerFlag(ScriptState *script) { } int KyraEngine_v2::o2_setZanthiaPos(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setZanthiaPos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setZanthiaPos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); _mainCharX = stackPos(0); _mainCharY = stackPos(1); @@ -650,44 +650,44 @@ int KyraEngine_v2::o2_setZanthiaPos(ScriptState *script) { } int KyraEngine_v2::o2_loadMusicTrack(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_loadMusicTrack(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_loadMusicTrack(%p) (%d)", (const void *)script, stackPos(0)); snd_loadSoundFile(stackPos(0)); return 0; } int KyraEngine_v2::o2_playWanderScoreViaMap(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_playWanderScoreViaMap(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_playWanderScoreViaMap(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); snd_playWanderScoreViaMap(stackPos(0), stackPos(1)); return 0; } int KyraEngine_v2::o2_playSoundEffect(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0)); snd_playSoundEffect(stackPos(0)); return 0; } int KyraEngine_v2::o2_setCauldronState(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setCauldronState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCauldronState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); setCauldronState(stackPos(0), stackPos(1) != 0); clearCauldronTable(); return 0; } int KyraEngine_v2::o2_getRand(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getRand(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getRand(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); assert(stackPos(0) < stackPos(1)); return _rnd.getRandomNumberRng(stackPos(0), stackPos(1)); } int KyraEngine_v2::o2_setDrawNoShapeFlag(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setDrawNoShapeFlag(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setDrawNoShapeFlag(%p) (%d)", (const void *)script, stackPos(0)); _drawNoShapeFlag = (stackPos(0) != 0); return 0; } int KyraEngine_v2::o2_showLetter(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_showLetter(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showLetter(%p) (%d)", (const void *)script, stackPos(0)); const int letter = stackPos(0); char filename[16]; @@ -747,20 +747,20 @@ int KyraEngine_v2::o2_showLetter(ScriptState *script) { } int KyraEngine_v2::o2_fillRect(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_fillRect(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::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_v2::o2_encodeShape(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_encodeShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_encodeShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); _sceneShapeTable[stackPos(0)] = _screen->encodeShape(stackPos(1), stackPos(2), stackPos(3), stackPos(4), 2); return 0; } int KyraEngine_v2::o2_defineRoomEntrance(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_defineRoomEntrance(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineRoomEntrance(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); switch (stackPos(0)) { case 0: _sceneEnterX1 = stackPos(1); @@ -789,7 +789,7 @@ int KyraEngine_v2::o2_defineRoomEntrance(ScriptState *script) { } int KyraEngine_v2::o2_runTemporaryScript(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_runTemporaryScript(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_runTemporaryScript(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3)); runTemporaryScript(stackPosString(0), stackPos(3), stackPos(2) ? 1 : 0, stackPos(1), stackPos(2)); @@ -797,14 +797,14 @@ int KyraEngine_v2::o2_runTemporaryScript(ScriptState *script) { } int KyraEngine_v2::o2_setSpecialSceneScriptRunTime(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setSpecialSceneScriptRunTime(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSpecialSceneScriptRunTime(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); assert(stackPos(0) >= 0 && stackPos(0) < 10); _sceneSpecialScriptsTimer[stackPos(0)] = _system->getMillis() + stackPos(1) * _tickLength; return 0; } int KyraEngine_v2::o2_defineSceneAnim(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_defineSceneAnim(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineSceneAnim(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9), stackPos(10), stackPos(11), stackPosString(12)); int animId = stackPos(0); @@ -837,14 +837,14 @@ int KyraEngine_v2::o2_defineSceneAnim(ScriptState *script) { } int KyraEngine_v2::o2_updateSceneAnim(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_updateSceneAnim(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_updateSceneAnim(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); updateSceneAnim(stackPos(0), stackPos(1)); _specialSceneScriptRunFlag = false; return 0; } int KyraEngine_v2::o2_setSceneAnimPosAndUpdate(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setSceneAnimPosAndUpdate(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSceneAnimPosAndUpdate(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); const int anim = stackPos(0); _sceneAnims[anim].x2 = stackPos(1); _sceneAnims[anim].y2 = stackPos(2); @@ -876,30 +876,30 @@ int KyraEngine_v2::o2_useItemOnMainChar(ScriptState *script) { } int KyraEngine_v2::o2_startDialogue(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_startDialogue(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_startDialogue(%p) (%d)", (const void *)script, stackPos(0)); startDialogue(stackPos(0)); return 0; } int KyraEngine_v2::o2_zanthRandomChat(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_zanthRandomChat(%p)", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_zanthRandomChat(%p)", (const void *)script); zanthRandomChat(); return 0; } int KyraEngine_v2::o2_setupDialogue(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setupDialogue(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setupDialogue(%p) (%d)", (const void *)script, stackPos(0)); setNewDlgIndex(stackPos(0)); return 0; } int KyraEngine_v2::o2_getDlgIndex(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setNewDlgIndex(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setNewDlgIndex(%p) (%d)", (const void *)script, stackPos(0)); return _mainCharacter.dlgIndex; } int KyraEngine_v2::o2_defineRoom(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_defineRoom(%p) (%d, '%s', %d, %d, %d, %d, %d, %d)", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineRoom(%p) (%d, '%s', %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7)); SceneDesc *scene = &_sceneList[stackPos(0)]; strcpy(scene->filename, stackPosString(1)); @@ -921,24 +921,24 @@ int KyraEngine_v2::o2_defineRoom(ScriptState *script) { } int KyraEngine_v2::o2_addCauldronStateTableEntry(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_addCauldronStateTableEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addCauldronStateTableEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); return addToCauldronStateTable(stackPos(0), stackPos(1)) ? 1 : 0; } int KyraEngine_v2::o2_setCountDown(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setCountDown(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCountDown(%p) (%d)", (const void *)script, stackPos(0)); _scriptCountDown = _system->getMillis() + stackPos(0) * _tickLength; return 0; } int KyraEngine_v2::o2_getCountDown(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getCountDown(%p)", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCountDown(%p)", (const void *)script); uint32 time = _system->getMillis(); return (time > _scriptCountDown) ? 0 : (_scriptCountDown - time) / _tickLength; } int KyraEngine_v2::o2_pressColorKey(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_pressColorKey(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_pressColorKey(%p) (%d)", (const void *)script, stackPos(0)); for (int i = 6; i; i--) _inputColorCode[i] = _inputColorCode[i - 1]; _inputColorCode[0] = stackPos(0) & 0xff; @@ -950,7 +950,7 @@ int KyraEngine_v2::o2_pressColorKey(ScriptState *script) { } int KyraEngine_v2::o2_objectChat(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_objectChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_objectChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); if (_flags.isTalkie) warning("Unexpected call: o2_objectChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); else @@ -959,7 +959,7 @@ int KyraEngine_v2::o2_objectChat(ScriptState *script) { } int KyraEngine_v2::o2_chapterChange(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_chapterChange(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_chapterChange(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); const int chapter = stackPos(0); const int scene = stackPos(1); @@ -981,40 +981,40 @@ int KyraEngine_v2::o2_chapterChange(ScriptState *script) { } int KyraEngine_v2::o2_getColorCodeFlag1(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getColorCodeFlag1(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeFlag1(%p) ()", (const void *)script); return _colorCodeFlag1; } int KyraEngine_v2::o2_setColorCodeFlag1(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getColorCodeFlag1(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeFlag1(%p) (%d)", (const void *)script, stackPos(0)); _colorCodeFlag1 = stackPos(0); return 0; } int KyraEngine_v2::o2_getColorCodeFlag2(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getColorCodeFlag2(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeFlag2(%p) ()", (const void *)script); return _colorCodeFlag2; } int KyraEngine_v2::o2_setColorCodeFlag2(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getColorCodeFlag2(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeFlag2(%p) (%d)", (const void *)script, stackPos(0)); _colorCodeFlag2 = stackPos(0); return 0; } int KyraEngine_v2::o2_getColorCodeValue(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getColorCodeValue(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeValue(%p) (%d)", (const void *)script, stackPos(0)); return _presetColorCode[stackPos(0)]; } int KyraEngine_v2::o2_setColorCodeValue(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setColorCodeValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setColorCodeValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); _presetColorCode[stackPos(0)] = stackPos(1) & 0xff; return stackPos(1) & 0xff; } int KyraEngine_v2::o2_countItemInstances(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_countItemInstances(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_countItemInstances(%p) (%d)", (const void *)script, stackPos(0)); uint16 item = stackPos(0); int count = 0; @@ -1046,75 +1046,75 @@ int KyraEngine_v2::o2_countItemInstances(ScriptState *script) { } int KyraEngine_v2::o2_initObject(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_initObject(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_initObject(%p) (%d)", (const void *)script, stackPos(0)); initTalkObject(stackPos(0)); return 0; } int KyraEngine_v2::o2_npcChat(ScriptState *script) { if (_flags.isTalkie) { - debugC(3, kDebugLevelScriptFuncs, "o2_npcChat(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), _vocHigh, stackPos(2)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_npcChat(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), _vocHigh, stackPos(2)); npcChatSequence(stackPosString(0), stackPos(1), _vocHigh, stackPos(2)); } else { - debugC(3, kDebugLevelScriptFuncs, "o2_npcChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_npcChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); npcChatSequence(stackPosString(0), stackPos(1)); } return 0; } int KyraEngine_v2::o2_deinitObject(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_deinitObject(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_deinitObject(%p) (%d)", (const void *)script, stackPos(0)); deinitTalkObject(stackPos(0)); return 0; } int KyraEngine_v2::o2_playTimSequence(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_playTimSequence(%p) ('%s')", (const void *)script, stackPosString(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_playTimSequence(%p) ('%s')", (const void *)script, stackPosString(0)); tim_playFullSequence(stackPosString(0)); return 0; } int KyraEngine_v2::o2_makeBookOrCauldronAppear(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_makeBookOrCauldronAppear(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_makeBookOrCauldronAppear(%p) (%d)", (const void *)script, stackPos(0)); seq_makeBookOrCauldronAppear(stackPos(0)); return 0; } int KyraEngine_v2::o2_setSpecialSceneScriptState(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setSpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0)); _specialSceneScriptState[stackPos(0)] = 1; return 1; } int KyraEngine_v2::o2_clearSpecialSceneScriptState(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_clearSpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_clearSpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0)); _specialSceneScriptState[stackPos(0)] = 0; return 0; } int KyraEngine_v2::o2_querySpecialSceneScriptState(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_querySpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_querySpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0)); return _specialSceneScriptState[stackPos(0)]; } int KyraEngine_v2::o2_resetInputColorCode(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_resetInputColorCode(%p)", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_resetInputColorCode(%p)", (const void *)script); memset(_inputColorCode, 255, 7); return 0; } int KyraEngine_v2::o2_setHiddenItemsEntry(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setHiddenItemsEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setHiddenItemsEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); return (_hiddenItems[stackPos(0)] = stackPos(1)); } int KyraEngine_v2::o2_getHiddenItemsEntry(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getHiddenItemsEntry(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getHiddenItemsEntry(%p) (%d)", (const void *)script, stackPos(0)); return _hiddenItems[stackPos(0)]; } int KyraEngine_v2::o2_mushroomEffect(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_mushroomEffect(%p)", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_mushroomEffect(%p)", (const void *)script); memcpy(_screen->getPalette(1), _screen->_currentPalette, 768); for (int i = 1; i < 768; i += 3) @@ -1139,7 +1139,7 @@ int KyraEngine_v2::o2_mushroomEffect(ScriptState *script) { } int KyraEngine_v2::o2_customChat(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_customChat(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_customChat(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2)); strcpy((char*)_unkBuf500Bytes, stackPosString(0)); _chatText = (char*)_unkBuf500Bytes; _chatObject = stackPos(1); @@ -1151,7 +1151,7 @@ int KyraEngine_v2::o2_customChat(ScriptState *script) { } int KyraEngine_v2::o2_customChatFinish(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_customChatFinish(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_customChatFinish(%p) ()", (const void *)script); _text->restoreScreen(); _chatText = 0; _chatObject = -1; @@ -1159,7 +1159,7 @@ int KyraEngine_v2::o2_customChatFinish(ScriptState *script) { } int KyraEngine_v2::o2_setupSceneAnimation(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setupSceneAnimation(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')", (const void *)script, + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setupSceneAnimation(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9), stackPos(10), stackPos(11), stackPosString(12)); const int index = stackPos(0); const uint16 flags = stackPos(1); @@ -1230,7 +1230,7 @@ int KyraEngine_v2::o2_setupSceneAnimation(ScriptState *script) { } int KyraEngine_v2::o2_stopSceneAnimation(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_stopSceneAnimation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_stopSceneAnimation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); const int index = 1+stackPos(0); AnimObj &obj = _animObjects[index]; restorePage3(); @@ -1250,7 +1250,7 @@ int KyraEngine_v2::o2_stopSceneAnimation(ScriptState *script) { } int KyraEngine_v2::o2_processPaletteIndex(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_processPaletteIndex(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_processPaletteIndex(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); uint8 *palette = _screen->getPalette(0); const int index = stackPos(0); const bool updatePalette = (stackPos(4) != 0); @@ -1268,57 +1268,57 @@ int KyraEngine_v2::o2_processPaletteIndex(ScriptState *script) { } int KyraEngine_v2::o2_getBoolFromStack(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getBoolFromStack(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getBoolFromStack(%p) ()", (const void *)script); return stackPos(0) ? 1 : 0; } int KyraEngine_v2::o2_setVocHigh(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_setVocHigh(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setVocHigh(%p) (%d)", (const void *)script, stackPos(0)); _vocHigh = stackPos(0); return _vocHigh; } int KyraEngine_v2::o2_getVocHigh(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getVocHigh(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getVocHigh(%p) ()", (const void *)script); return _vocHigh; } int KyraEngine_v2::o2_zanthiaChat(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_zanthiaChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_zanthiaChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); objectChat(stackPosString(0), 0, _vocHigh, stackPos(1)); return 0; } int KyraEngine_v2::o2_isVoiceEnabled(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_isVoiceEnabled(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_isVoiceEnabled(%p) ()", (const void *)script); return speechEnabled() ? 1 : 0; } int KyraEngine_v2::o2_isVoicePlaying(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_isVoicePlaying(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_isVoicePlaying(%p) ()", (const void *)script); return (snd_voiceIsPlaying() && !skipFlag()) ? 1 : 0; } int KyraEngine_v2::o2_stopVoicePlaying(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_stopVoicePlaying(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_stopVoicePlaying(%p) ()", (const void *)script); snd_stopVoice(); return 0; } int KyraEngine_v2::o2_getGameLanguage(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_getGameLanguage(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getGameLanguage(%p) ()", (const void *)script); return _lang; } int KyraEngine_v2::o2_dummy(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_dummy(%p) ()", (const void *)script); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_dummy(%p) ()", (const void *)script); return 0; } #pragma mark - int KyraEngine_v2::o2t_defineNewShapes(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2t_defineNewShapes(%p) ('%s', %d, %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0), + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_defineNewShapes(%p) ('%s', %d, %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6)); strcpy(_newShapeFilename, stackPosString(0)); @@ -1333,7 +1333,7 @@ int KyraEngine_v2::o2t_defineNewShapes(ScriptState *script) { } int KyraEngine_v2::o2t_setCurrentFrame(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2t_setCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_setCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); _newShapeAnimFrame = stackPos(0); _newShapeDelay = stackPos(1); _temporaryScriptExecBit = true; @@ -1341,19 +1341,19 @@ int KyraEngine_v2::o2t_setCurrentFrame(ScriptState *script) { } int KyraEngine_v2::o2t_playSoundEffect(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2t_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0)); snd_playSoundEffect(stackPos(0)); return 0; } int KyraEngine_v2::o2t_fadeScenePal(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2t_fadeScenePal(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_fadeScenePal(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); fadeScenePal(stackPos(0), stackPos(1)); return 0; } int KyraEngine_v2::o2t_setShapeFlag(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2t_setShapeFlag(%p) (%d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_setShapeFlag(%p) (%d)", (const void *)script, stackPos(0)); if (_flags.isTalkie) _newShapeFlag = stackPos(0); return 0; -- cgit v1.2.3