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

[lordhoto at users.sourceforge.net]

Revision: 31582
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31582&view=rev
Author:   lordhoto
Date:     2008-04-19 15:25:22 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
Fixed Zanthia chat script selection.

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

Modified: scummvm/trunk/engines/kyra/text_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_v2.cpp	2008-04-19 22:22:00 UTC (rev 31581)
+++ scummvm/trunk/engines/kyra/text_v2.cpp	2008-04-19 22:25:22 UTC (rev 31582)
@@ -180,7 +180,11 @@
 	objectChatInit(str, object, vocHigh, vocLow);
 	_chatText = str;
 	_chatObject = object;
-	_chatIsNote = (chatGetType(str) == -1);
+	int chatType = chatGetType(str);
+	if (chatType == -1) {
+		_chatIsNote = true;
+		chatType = 0;
+	}
 
 	if (_mainCharacter.facing > 7)
 		_mainCharacter.facing = 5;
@@ -197,7 +201,7 @@
 	};
 
 	assert(_mainCharacter.facing * 3 + object < ARRAYSIZE(talkScriptTable));
-	int script = talkScriptTable[_mainCharacter.facing * 3 + object];
+	int script = talkScriptTable[_mainCharacter.facing * 3 + chatType];
 
 	static const char *chatScriptFilenames[] = {
 		"_Z1FSTMT.EMC",


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