[Scummvm-cvs-logs] SF.net SVN: scummvm:[39774] scummvm/trunk/engines/parallaction/dialogue.cpp

[peres001 at users.sourceforge.net]

Revision: 39774
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39774&view=rev
Author:   peres001
Date:     2009-03-31 17:00:36 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
Fixed dialogue balloon appearing in the wrong position after commit 39772.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/dialogue.cpp

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2009-03-31 15:45:44 UTC (rev 39773)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2009-03-31 17:00:36 UTC (rev 39774)
@@ -105,6 +105,8 @@
 	DialogueManager(Parallaction *vm, ZonePtr z);
 	virtual ~DialogueManager();
 
+	void start();
+
 	bool isOver() {
 		return _state == DIALOGUE_OVER;
 	}
@@ -176,14 +178,18 @@
 	_answerer = _vm->_char._talk;
 
 	_askPassword = false;
-	_q = _dialogue->_questions[0];
 
 	_cmdList = 0;
 	_answerId = 0;
+}
 
+void DialogueManager::start() {
+	assert(_dialogue);
+	_q = _dialogue->_questions[0];
 	_state = displayQuestion() ? RUN_QUESTION : NEXT_ANSWER;
 }
 
+
 DialogueManager::~DialogueManager() {
 	if (isNpc) {
 		delete _questioner;
@@ -428,6 +434,8 @@
 void Parallaction::enterDialogueMode(ZonePtr z) {
 	debugC(1, kDebugDialogue, "Parallaction::enterDialogueMode(%s)", z->u._filename.c_str());
 	_dialogueMan = _vm->createDialogueManager(z);
+	assert(_dialogueMan);
+	_dialogueMan->start();
 	_input->_inputMode = Input::kInputModeDialogue;
 }
 


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