Ticket #9192: 0004-always-execute-next-dialog-state-immediately-if-prev.txt

From 6ce35697d7c94ed36615de718f434d358bd7941e Mon Sep 17 00:00:00 2001
From: Alyssa Milburn <fuzzie@fuzzie.org>
Date: Mon, 24 May 2010 16:47:24 +0200
Subject: [PATCH 4/5] always execute next dialog state immediately if previous string was null

---
 engines/parallaction/dialogue.cpp |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index df4f040..858be87 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -135,6 +135,10 @@ void DialogueManager::start() {
        assert(_dialogue);
        _q = _dialogue->_questions[0];
        _state = displayQuestion() ? RUN_QUESTION : NEXT_ANSWER;
+       if (_state == NEXT_ANSWER) {
+               // was "null", continue onward immediately
+               nextAnswer();
+       }
 }
 
 
@@ -256,6 +260,8 @@ void DialogueManager::nextAnswer() {
                if (_numVisAnswers) {
                        _answerId = _visAnswers[0]._index;
                        _state = NEXT_QUESTION;
+                       // was "null", continue onward immediately
+                       nextQuestion();
                } else {
                        _state = DIALOGUE_OVER;
                }
@@ -284,6 +290,10 @@ void DialogueManager::nextQuestion() {
                _state = DIALOGUE_OVER;
        } else {
                _state = displayQuestion() ? RUN_QUESTION : NEXT_ANSWER;
+               if (_state == NEXT_ANSWER) {
+                       // was "null", continue onward immediately
+                       nextAnswer();
+               }
        }
 }
 
-- 
1.6.3.3