diff options
author | Nicola Mettifogo | 2009-03-24 08:20:08 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2009-03-24 08:20:08 +0000 |
commit | 76c0d0820059d5e9e4addeb40de35adbd99e061a (patch) | |
tree | 9802e26544fa790393aefb22044dd022449b986c /engines/parallaction/objects.h | |
parent | e9b4124f1d82f0bfcafdbbb40797c7d767e16c91 (diff) | |
download | scummvm-rg350-76c0d0820059d5e9e4addeb40de35adbd99e061a.tar.gz scummvm-rg350-76c0d0820059d5e9e4addeb40de35adbd99e061a.tar.bz2 scummvm-rg350-76c0d0820059d5e9e4addeb40de35adbd99e061a.zip |
* Pushed evaluation of 'following question' from dialogue parsing to dialogue execution.
* Removed all the question forwards declaration code
svn-id: r39654
Diffstat (limited to 'engines/parallaction/objects.h')
-rw-r--r-- | engines/parallaction/objects.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index bf8daa173e..4eabf08720 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -160,9 +160,8 @@ typedef Common::List<CommandPtr> CommandList; struct Answer { Common::String _text; - uint16 _mood; - Question* _followingQuestion; - Common::String _followingName; + uint16 _mood; + Common::String _followingName; CommandList _commands; uint32 _noFlags; @@ -178,16 +177,21 @@ struct Answer { }; struct Question { + Common::String _name; Common::String _text; - uint16 _mood; - Answer* _answers[NUM_ANSWERS]; + uint16 _mood; + Answer* _answers[NUM_ANSWERS]; - Question(); + Question(const Common::String &name); ~Question(); }; struct Dialogue { Question *_questions[NUM_QUESTIONS]; + uint _numQuestions; + + Question *findQuestion(const Common::String &name) const; + void addQuestion(Question *q); Dialogue(); ~Dialogue(); |