[Scummvm-cvs-logs] SF.net SVN: scummvm: [30899] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 30899
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30899&view=rev
Author:   athrxx
Date:     2008-02-17 13:58:46 -0800 (Sun, 17 Feb 2008)

Log Message:
-----------
scripting bug fix (npc scene startup scripts were executed twice)

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

Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h	2008-02-17 20:25:07 UTC (rev 30898)
+++ scummvm/trunk/engines/kyra/kyra_v2.h	2008-02-17 21:58:46 UTC (rev 30899)
@@ -666,7 +666,6 @@
 	int _npcTalkDlgIndex;
 	uint8 _newSceneDlgState[32];
 	int8 **_conversationState;
-	uint8 _npcTalkUNK;
 	uint8 *_dlgBuffer;
 
 	// tim sequence

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-02-17 20:25:07 UTC (rev 30898)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-02-17 21:58:46 UTC (rev 30899)
@@ -455,9 +455,10 @@
 	debugC(3, kDebugLevelScriptFuncs, "o2_enterNewSceneEx(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0),
 		stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 
-	enterNewScene(stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	int skipNpcScript = stackPos(3);
+	enterNewScene(stackPos(0), stackPos(1), stackPos(2), skipNpcScript, stackPos(4));
 
-	if (!stackPos(3))
+	if (!skipNpcScript)
 		runSceneScript4(0);
 
 	_unk5 = 1;

Modified: scummvm/trunk/engines/kyra/text_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_v2.cpp	2008-02-17 20:25:07 UTC (rev 30898)
+++ scummvm/trunk/engines/kyra/text_v2.cpp	2008-02-17 21:58:46 UTC (rev 30899)
@@ -642,7 +642,7 @@
 	memset(_newSceneDlgState, 0, 32);
 	for (int i = 0; i < 19; i++)
 		memset(_conversationState[i], -1, 14);
-	_npcTalkUNK = 0;
+	_unkFlag1 = false;
 	_mainCharacter.dlgIndex = dlgIndex;
 }
 


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