diff options
| author | Nicola Mettifogo | 2007-04-09 07:50:52 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-04-09 07:50:52 +0000 |
| commit | 53bdc1e0cf1f1c688c2e9cd8c486ff1435733081 (patch) | |
| tree | 08962946683c5793d04424509b991ce3bb0c8ffa | |
| parent | 83841fda36dee30e69bf34c60785d08b3fbc8eff (diff) | |
| download | scummvm-rg350-53bdc1e0cf1f1c688c2e9cd8c486ff1435733081.tar.gz scummvm-rg350-53bdc1e0cf1f1c688c2e9cd8c486ff1435733081.tar.bz2 scummvm-rg350-53bdc1e0cf1f1c688c2e9cd8c486ff1435733081.zip | |
Fixed regression bug in dialogue code.
svn-id: r26422
| -rw-r--r-- | engines/parallaction/dialogue.cpp | 7 |
1 files 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"); |