diff options
| author | Nicola Mettifogo | 2008-12-13 03:37:43 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2008-12-13 03:37:43 +0000 |
| commit | b3475d81787b08178c7ea413717796d987f9061c (patch) | |
| tree | 41569a0662636f68ab4390ace32e7b16c9a4a5b8 /engines/parallaction/objects.h | |
| parent | 6724097f674c100c20a42a030bb597aa080ad339 (diff) | |
| download | scummvm-rg350-b3475d81787b08178c7ea413717796d987f9061c.tar.gz scummvm-rg350-b3475d81787b08178c7ea413717796d987f9061c.tar.bz2 scummvm-rg350-b3475d81787b08178c7ea413717796d987f9061c.zip | |
* Replaced char* with Common::String in the parser.
* Enforced const-correctness on related routines.
svn-id: r35326
Diffstat (limited to 'engines/parallaction/objects.h')
| -rw-r--r-- | engines/parallaction/objects.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index eee69383b6..1ed52dd9d0 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -162,22 +162,20 @@ typedef Common::List<CommandPtr> CommandList; #define NUM_ANSWERS 5 struct Answer { - char* _text; + Common::String _text; uint16 _mood; - union { - Question* _question; - char* _name; - } _following; + Question* _followingQuestion; + Common::String _followingName; + CommandList _commands; uint32 _noFlags; uint32 _yesFlags; Answer(); - ~Answer(); }; struct Question { - char* _text; + Common::String _text; uint16 _mood; Answer* _answers[NUM_ANSWERS]; @@ -215,11 +213,10 @@ struct SpeakData { }; struct ExamineData { GfxObj *_cnv; - char* _description; + Common::String _description; char* _filename; ExamineData() { - _description = NULL; _filename = NULL; _cnv = NULL; } |