Ticket #9191: 0002-always-check-dialogue-flags.txt

File 0002-always-check-dialogue-flags.txt, 863 bytes (added by fuzzie, 14 years ago)
Line 
1From 60eda3496d449f5b451e8c7eb0f7a0bc2b729b90 Mon Sep 17 00:00:00 2001
2From: Alyssa Milburn <fuzzie@fuzzie.org>
3Date: Sun, 23 May 2010 14:14:24 +0200
4Subject: [PATCH 2/5] always check dialogue flags
5
6---
7 engines/parallaction/dialogue.cpp | 9 +++++++--
8 1 files changed, 7 insertions(+), 2 deletions(-)
9
10diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
11index 7a28d18..df4f040 100644
12--- a/engines/parallaction/dialogue.cpp
13+++ b/engines/parallaction/dialogue.cpp
14@@ -252,8 +252,13 @@ void DialogueManager::nextAnswer() {
15 }
16
17 if (!_q->_answers[0]->_text.compareToIgnoreCase("NULL")) {
18- _answerId = 0;
19- _state = NEXT_QUESTION;
20+ addVisibleAnswers(_q);
21+ if (_numVisAnswers) {
22+ _answerId = _visAnswers[0]._index;
23+ _state = NEXT_QUESTION;
24+ } else {
25+ _state = DIALOGUE_OVER;
26+ }
27 return;
28 }
29
30--
311.6.3.3
32