From 53bdc1e0cf1f1c688c2e9cd8c486ff1435733081 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 9 Apr 2007 07:50:52 +0000
Subject: Fixed regression bug in dialogue code.

svn-id: r26422
---
 engines/parallaction/dialogue.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index aeaa9f0579..1206b25d4c 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -354,25 +354,26 @@ void Parallaction::runDialogue(SpeakData *data) {
 	Cnv *face = isNpc ? _disk->loadTalk(data->_name) : _char._talk;
 
 	_askPassword = false;
-	uint16 answer = 0;
 	CommandList *cmdlist = NULL;
 
+	uint16 answer;
 	Dialogue *q = data->_dialogue;
 	while (q) {
 
+		answer = 0;
+
 		displayQuestion(q, face);
 		if (q->_answers[0] == NULL) break;
 
 		_answerBalloonY[0] = 10;
 
 		if (scumm_stricmp(q->_answers[0]->_text, "NULL")) {
-
 			if (!displayAnswers(q)) break;
 			answer = getDialogueAnswer(q, _char._talk);
 			cmdlist = &q->_answers[answer]->_commands;
 		}
 
-		q = (Dialogue*)q->_answers[answer]->_following._question;
+		q = q->_answers[answer]->_following._question;
 	}
 
 	debugC(1, kDebugDialogue, "runDialogue: out of dialogue loop");
-- 
cgit v1.2.3