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.cpp | |
| 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.cpp')
| -rw-r--r-- | engines/parallaction/objects.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp index a75620e26e..59e2fb0868 100644 --- a/engines/parallaction/objects.cpp +++ b/engines/parallaction/objects.cpp @@ -173,7 +173,7 @@ Zone::~Zone() { switch (_type & 0xFFFF) { case kZoneExamine: free(u.examine->_filename); - free(u.examine->_description); + u.examine->_description.clear(); delete u.examine->_cnv; delete u.examine; break; @@ -201,7 +201,7 @@ Zone::~Zone() { case kZoneMerge: delete u.merge; break; - + case kZonePath: delete u.path; break; @@ -240,19 +240,13 @@ Dialogue::~Dialogue() { } Answer::Answer() { - _text = NULL; _mood = 0; - _following._question = NULL; + _followingQuestion = NULL; _noFlags = 0; _yesFlags = 0; } -Answer::~Answer() { - free(_text); -} - Question::Question() { - _text = NULL; _mood = 0; for (uint32 i = 0; i < NUM_ANSWERS; i++) @@ -261,12 +255,9 @@ Question::Question() { } Question::~Question() { - for (uint32 i = 0; i < NUM_ANSWERS; i++) { delete _answers[i]; } - - free(_text); } Instruction::Instruction() { |