[Scummvm-cvs-logs] SF.net SVN: scummvm:[55591] scummvm/trunk/engines/parallaction/dialogue.cpp
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Fri Jan 28 15:19:40 CET 2011
Revision: 55591
http://scummvm.svn.sourceforge.net/scummvm/?rev=55591&view=rev
Author: peres001
Date: 2011-01-28 14:19:39 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
PARALLACTION: Flexible monologues in BRA (patch #3021740 by fuzzie)
Some dialogue answers are set to the literal 'null', which is used in NS to
simulate a fixed monologue ('null' instructs the engine to jump to the first
entry in the list of available questions, which is always made of a single
item in this case).
BRA has flexible monologues that depend on the game state, so this patch goes
and checks all the available branches before picking the correct one.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/dialogue.cpp
Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp 2011-01-28 13:24:32 UTC (rev 55590)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp 2011-01-28 14:19:39 UTC (rev 55591)
@@ -252,8 +252,13 @@
}
if (!_q->_answers[0]->_text.compareToIgnoreCase("NULL")) {
- _answerId = 0;
- _state = NEXT_QUESTION;
+ addVisibleAnswers(_q);
+ if (_numVisAnswers) {
+ _answerId = _visAnswers[0]._index;
+ _state = NEXT_QUESTION;
+ } else {
+ _state = DIALOGUE_OVER;
+ }
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list