ScummVM

Revision: 29209
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29209&view=rev
Author:   vinterstum
Date:     2007-10-13 11:53:02 -0700 (Sat, 13 Oct 2007)

Log Message:
-----------
Forgot to rename a variable

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2007-10-13 18:47:52 UTC (rev 29208)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2007-10-13 18:53:02 UTC (rev 29209)
@@ -93,10 +93,10 @@
 int KyraEngine_v2::o2_setCharacterAnimFrame(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "o2_setCharacterAnimFrame(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2));
 	int animFrame = stackPos(1);
-	int skipRefresh = stackPos(2);
+	int updateAnim = stackPos(2);
 	
 	_mainCharacter.animFrame = animFrame;
-	if (skipRefresh)
+	if (updateAnim)
 		updateCharacterAnim(0);
 
 	return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30904
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30904&view=rev
Author:   athrxx
Date:     2008-02-18 15:22:22 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
the script countdown needs to be divided by _ticklength

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-02-18 23:04:37 UTC (rev 30903)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-02-18 23:22:22 UTC (rev 30904)
@@ -689,7 +689,7 @@
 int KyraEngine_v2::o2_getCountDown(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "o2_getCountDown(%p)", (const void *)script);
 	uint32 time = _system->getMillis();
-	return (time > _scriptCountDown) ? 0 : _scriptCountDown - time;
+	return (time > _scriptCountDown) ? 0 : (_scriptCountDown - time) / _tickLength;
 }
 
 int KyraEngine_v2::o2_objectChat(ScriptState *script) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30915
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30915&view=rev
Author:   athrxx
Date:     2008-02-21 23:00:12 -0800 (Thu, 21 Feb 2008)

Log Message:
-----------
palette bug fix (inventory turned blue when leaving the scene after eating the mushroom)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-02-22 00:33:56 UTC (rev 30914)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-02-22 07:00:12 UTC (rev 30915)
@@ -846,7 +846,9 @@
 	}
 	snd_playSoundEffect(106);
 	_screen->fadePalette(_screen->_currentPalette, 90, &_updateFunctor);
-	_screen->fadePalette(_screen->getPalette(1), 30, &_updateFunctor);	
+	
+	memcpy(_screen->_currentPalette, _screen->getPalette(1), 768);
+	_screen->fadePalette(_screen->_currentPalette, 30, &_updateFunctor);	
 
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31126
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31126&view=rev
Author:   lordhoto
Date:     2008-03-15 03:55:32 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
Fixed bug in o2_countItemInInventory.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-15 09:57:41 UTC (rev 31125)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-15 10:55:32 UTC (rev 31126)
@@ -274,8 +274,8 @@
 }
 
 int KyraEngine_v2::o2_countItemInInventory(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "o2_countItemInInventory(%p) (%d)", (const void *)script, stackPos(0));
-	uint16 item = stackPos(0);
+	debugC(3, kDebugLevelScriptFuncs, "o2_countItemInInventory(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+	uint16 item = stackPos(1);
 	int count = 0;
 
 	for (int i = 0; i < 20; ++i) {
@@ -283,7 +283,7 @@
 			++count;
 	}
 
-	if (_itemInHand == int16(item))
+	if ((stackPos(0) == 0) && _itemInHand == int16(item))
 		++count;
 
 	return count;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31135
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31135&view=rev
Author:   eriktorbjorn
Date:     2008-03-15 14:33:01 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
Fixed warning about unused variable.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-15 21:11:22 UTC (rev 31134)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-15 21:33:01 UTC (rev 31135)
@@ -335,7 +335,7 @@
 	debugC(3, kDebugLevelScriptFuncs, "o2_removeItemFromInventory(%p) (%d)", (const void *)script, stackPos(0));
 	uint16 item = stackPos(0);
 	int slot = -1;
-	while ((slot = getInventoryItemSlot(stackPos(0))) != -1)
+	while ((slot = getInventoryItemSlot(item)) != -1)
 		removeItemFromInventory(slot);
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31150
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31150&view=rev
Author:   lordhoto
Date:     2008-03-16 11:42:29 -0700 (Sun, 16 Mar 2008)

Log Message:
-----------
Changed Kyra2 script debug printfs to be consistent with Kyra1 ones.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-16 18:24:45 UTC (rev 31149)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-16 18:42:29 UTC (rev 31150)
@@ -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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31181
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31181&view=rev
Author:   lordhoto
Date:     2008-03-18 07:27:22 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Fixed bug in o2_setupSceneAnimation. (should fix some lockups)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-18 13:51:16 UTC (rev 31180)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-18 14:27:22 UTC (rev 31181)
@@ -1256,6 +1256,8 @@
 	const int index = stackPos(0);
 	const uint16 flags = stackPos(1);
 
+	restorePage3();
+
 	SceneAnim &anim = _sceneAnims[index];
 	anim.x = stackPos(2);
 	anim.y = stackPos(3);
@@ -1315,6 +1317,11 @@
 	obj->height = anim.height;
 	obj->width2 = obj->height2 = anim.specialSize;
 
+	// be sure we don't have an the object allready in the anim list
+	// else we get look ups in some places, the original doesn't do this
+	// though
+	_animList = deleteAnimListEntry(_animList, obj);
+
 	_animList = addToAnimListSorted(_animList, obj);
 	obj->needRefresh = 1;
 	obj->unk8 = 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31199
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31199&view=rev
Author:   lordhoto
Date:     2008-03-20 04:32:06 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------
Possible fix for graphics glitches when showing letters.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-20 10:27:39 UTC (rev 31198)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-20 11:32:06 UTC (rev 31199)
@@ -935,7 +935,7 @@
 		bookPrintText(2, letterBuffer, 0xC, 0xA, 0x20);
 	}
 
-	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0);
+	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->fadePalette(_screen->getPalette(0), 0x14);
 	_screen->setMouseCursor(0, 0, getShapePtr(0));
 	setMousePos(280, 160);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31245
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31245&view=rev
Author:   lordhoto
Date:     2008-03-26 12:58:33 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
Added a simple hack which adds delay between animation frames of some scene animations, this prevents some animations from running too fast. See for example bug #1923638 "HoF: Marco missing animation frames".

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-26 19:29:33 UTC (rev 31244)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-26 19:58:33 UTC (rev 31245)
@@ -1087,6 +1087,19 @@
 int KyraEngine_v2::o2_updateSceneAnim(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_updateSceneAnim(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	updateSceneAnim(stackPos(0), stackPos(1));
+
+	// HACK: Some animations are really too fast because of missing delay times.
+	// Notice that the delay time is purely subjective set here, it could look
+	// slower or maybe faster in the original, but at least this looks OK for
+	// LordHoto.
+	//
+	// We know currently of two different animations where this happens.
+	// - One is where Marco is dangling from the flesh-eating plant (see bug #1923638 "HoF: Marco missing animation frames").
+	// - The other one is after giving the ticket to the captain. He would move very fast (barely noticeable) onto the ship
+	//   without this delay.
+	if ((stackPos(0) == 2 && _mainCharacter.sceneId == 3) || (stackPos(0) == 3 && _mainCharacter.sceneId == 33))
+		_sceneSpecialScriptsTimer[_lastProcessedSceneScript] = _system->getMillis() + _tickLength * 2;
+
 	_specialSceneScriptRunFlag = false;
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31250
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31250&view=rev
Author:   lordhoto
Date:     2008-03-26 14:24:22 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
Possible fix for part 1 of bug #1926547 "HoF: Right mouse button messes up gameplay".

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-26 21:17:07 UTC (rev 31249)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-26 21:24:22 UTC (rev 31250)
@@ -278,9 +278,9 @@
 
 	_screen->hideMouse();
 	int curTime = 0;
-	while (curTime < maxTimes && !skipFlag()) {
+	while (curTime < maxTimes) {
 		if (startFrame < endFrame) {
-			for (int i = startFrame; i <= endFrame && !skipFlag(); ++i) {
+			for (int i = startFrame; i <= endFrame; ++i) {
 				uint32 endTime = _system->getMillis() + waitTime * _tickLength;
 				_wsaSlots[slot]->displayFrame(i, 0xC000 | copyFlags, 0, 0);
 				_screen->updateScreen();
@@ -288,12 +288,12 @@
 				do {
 					update();
 
-					if (endTime - _system->getMillis() >= 10)
+					if (endTime - _system->getMillis() >= 10 && !skipFlag())
 						delay(10);
-				} while (_system->getMillis() < endTime);
+				} while (_system->getMillis() < endTime && !skipFlag());
 			}
 		} else {
-			for (int i = startFrame; i >= endFrame && !skipFlag(); --i) {
+			for (int i = startFrame; i >= endFrame; --i) {
 				uint32 endTime = _system->getMillis() + waitTime * _tickLength;
 				_wsaSlots[slot]->displayFrame(i, 0xC000 | copyFlags, 0, 0);
 				_screen->updateScreen();
@@ -301,9 +301,9 @@
 				do {
 					update();
 
-					if (endTime - _system->getMillis() >= 10)
+					if (endTime - _system->getMillis() >= 10 && !skipFlag())
 						delay(10);
-				} while (_system->getMillis() < endTime);
+				} while (_system->getMillis() < endTime && !skipFlag());
 			}
 		}
 
@@ -336,7 +336,7 @@
 	
 	_screen->hideMouse();
 
-	while (currentFrame <= lastFrame && !skipFlag()) {	
+	while (currentFrame <= lastFrame) {	
 		uint32 endTime = _system->getMillis() + frameDelay;
 		_wsaSlots[index]->displayFrame(currentFrame++, copyParam, 0, 0);
 		_screen->updateScreen();
@@ -366,7 +366,7 @@
 	int currentFrame = 0;
 	const int lastFrame = _wsaSlots[index]->frames();
 
-	while (currentFrame <= lastFrame && !skipFlag()) {	
+	while (currentFrame <= lastFrame) {	
 		uint32 endTime = _system->getMillis() + frameDelay;
 		_wsaSlots[index]->displayFrame(currentFrame++, copyParam, 0, 0);
 		if (doUpdate)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31251
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31251&view=rev
Author:   lordhoto
Date:     2008-03-26 14:28:26 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
Set delay time for the hack in o2_updateSceneAnim to the value Raziel^ suggests.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-26 21:24:22 UTC (rev 31250)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-26 21:28:26 UTC (rev 31251)
@@ -1091,14 +1091,14 @@
 	// HACK: Some animations are really too fast because of missing delay times.
 	// Notice that the delay time is purely subjective set here, it could look
 	// slower or maybe faster in the original, but at least this looks OK for
-	// LordHoto.
+	// Raziel^.
 	//
 	// We know currently of two different animations where this happens.
 	// - One is where Marco is dangling from the flesh-eating plant (see bug #1923638 "HoF: Marco missing animation frames").
 	// - The other one is after giving the ticket to the captain. He would move very fast (barely noticeable) onto the ship
 	//   without this delay.
 	if ((stackPos(0) == 2 && _mainCharacter.sceneId == 3) || (stackPos(0) == 3 && _mainCharacter.sceneId == 33))
-		_sceneSpecialScriptsTimer[_lastProcessedSceneScript] = _system->getMillis() + _tickLength * 2;
+		_sceneSpecialScriptsTimer[_lastProcessedSceneScript] = _system->getMillis() + _tickLength * 6;
 
 	_specialSceneScriptRunFlag = false;
 	return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31262
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31262&view=rev
Author:   lordhoto
Date:     2008-03-27 07:51:33 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------
Fix for bug #1926838 "HoF: Animation plays too fast".

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-27 11:06:29 UTC (rev 31261)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-27 14:51:33 UTC (rev 31262)
@@ -1103,11 +1103,13 @@
 	// slower or maybe faster in the original, but at least this looks OK for
 	// Raziel^.
 	//
-	// We know currently of two different animations where this happens.
+	// We know currently of some different animations where this happens.
 	// - One is where Marco is dangling from the flesh-eating plant (see bug #1923638 "HoF: Marco missing animation frames").
 	// - The other one is after giving the ticket to the captain. He would move very fast (barely noticeable) onto the ship
 	//   without this delay.
-	if ((stackPos(0) == 2 && _mainCharacter.sceneId == 3) || (stackPos(0) == 3 && _mainCharacter.sceneId == 33))
+	// - The scene after giving the sandwitch to the guards in the city.
+	if ((stackPos(0) == 2 && _mainCharacter.sceneId == 3) || (stackPos(0) == 3 && _mainCharacter.sceneId == 33) ||
+		((stackPos(0) == 1 || stackPos(0) == 2) && _mainCharacter.sceneId == 19))
 		_sceneSpecialScriptsTimer[_lastProcessedSceneScript] = _system->getMillis() + _tickLength * 6;
 
 	_specialSceneScriptRunFlag = false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31263
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31263&view=rev
Author:   lordhoto
Date:     2008-03-27 07:55:52 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------
Update hack comment in o2_updateSceneAnim.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-27 14:51:33 UTC (rev 31262)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-27 14:55:52 UTC (rev 31263)
@@ -1104,10 +1104,12 @@
 	// Raziel^.
 	//
 	// We know currently of some different animations where this happens.
-	// - One is where Marco is dangling from the flesh-eating plant (see bug #1923638 "HoF: Marco missing animation frames").
-	// - The other one is after giving the ticket to the captain. He would move very fast (barely noticeable) onto the ship
+	// - Where Marco is dangling from the flesh-eating plant (see bug #1923638 "HoF: Marco missing animation frames").
+	// - After giving the ticket to the captain. He would move very fast (barely noticeable) onto the ship
 	//   without this delay.
-	// - The scene after giving the sandwitch to the guards in the city.
+	// - The scene after giving the sandwitch to the guards in the city. (see bug #1926838 "HoF: Animation plays too fast")
+	//   This scene script calls o2_delay though, but since this updates the scene animation scripts again there is no delay
+	//   for the animation.
 	if ((stackPos(0) == 2 && _mainCharacter.sceneId == 3) || (stackPos(0) == 3 && _mainCharacter.sceneId == 33) ||
 		((stackPos(0) == 1 || stackPos(0) == 2) && _mainCharacter.sceneId == 19))
 		_sceneSpecialScriptsTimer[_lastProcessedSceneScript] = _system->getMillis() + _tickLength * 6;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31283
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31283&view=rev
Author:   lordhoto
Date:     2008-03-27 18:07:16 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------
Oops fixed wrong o2_delaySecs.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-28 01:03:54 UTC (rev 31282)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-28 01:07:16 UTC (rev 31283)
@@ -614,13 +614,8 @@
 }
 
 int KyraEngine_v2::o2_delaySecs(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delaySecs(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	if (stackPos(1))
-		warning("unimplemented o2_delaySecs subfunction");
-	//if (stackPos(1))
-	//	sub_27100(stackPos(0) * _tickLength);
-	//else
-		delay(stackPos(0) * 1000, true);
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delaySecs(%p) (%d)", (const void *)script, stackPos(0));
+	delay(stackPos(0) * 1000, true);
 	return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31284
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31284&view=rev
Author:   lordhoto
Date:     2008-03-27 18:10:58 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------
Finished o2_delay implementation.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-28 01:07:16 UTC (rev 31283)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-28 01:10:58 UTC (rev 31284)
@@ -621,12 +621,24 @@
 
 int KyraEngine_v2::o2_delay(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	if (stackPos(1))
-		warning("unimplemented o2_delay subfunction");
-	//if (stackPos(1))
-	//	sub_27100(stackPos(0) * _tickLength);
-	//else
+	if (stackPos(1)) {
+		uint32 maxWaitTime = _system->getMillis() + stackPos(0) * _tickLength;
+		while (_system->getMillis() < maxWaitTime) {
+			int inputFlag = checkInput(0);
+			removeInputTop();
+
+			if (inputFlag == 198 || inputFlag == 199)
+				return 1;
+
+			if (_chatText)
+				updateWithText();
+			else
+				update();
+			_system->delayMillis(10);
+		}
+	} else {
 		delay(stackPos(0) * _tickLength, true);
+	}
 	return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31427
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31427&view=rev
Author:   lordhoto
Date:     2008-04-06 07:16:27 -0700 (Sun, 06 Apr 2008)

Log Message:
-----------
Set opcode 31 (o2_limitMouseRrange) to o2_dummy for now.
Also added a comment about that.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-04-06 14:13:14 UTC (rev 31426)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-04-06 14:16:27 UTC (rev 31427)
@@ -1843,7 +1843,8 @@
 		Opcode(o2_addItemToInventory),
 		Opcode(o2_drawShape),
 		Opcode(o2_addItemToCurScene),
-		OpcodeUnImpl(),
+		Opcode(o2_dummy),	// the original used this opcode to limit the mouse range temporary,
+							// since that is of no use and not really important we just use a dummy here
 		// 0x20
 		Opcode(o2_checkForItem),
 		Opcode(o2_loadSoundFile),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.