diff options
Diffstat (limited to 'engines/parallaction/objects.h')
| -rw-r--r-- | engines/parallaction/objects.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index 7cee0460c1..9842d7985b 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -112,13 +112,12 @@ struct Command { bool _valid; Command(); - ~Command(); // Common fields uint32 _flags; ZonePtr _zone; Common::String _zoneName; - char* _string; + Common::String _string; uint16 _callable; uint16 _object; Common::Point _move; @@ -132,7 +131,7 @@ struct Command { int _zeta1; int _zeta2; int _characterId; - char* _string2; + Common::String _string2; int _musicCommand; int _musicParm; }; @@ -428,14 +427,12 @@ struct Instruction { // BRA specific byte _colors[3]; ScriptVar _opC; - char *_text; - char *_text2; + Common::String _text; + Common::String _text2; int _y; uint32 _endif; Instruction(); - ~Instruction(); - }; enum { @@ -474,7 +471,7 @@ protected: public: GfxObj *gfxobj; - char *_scriptName; + Common::String _scriptName; Animation(); virtual ~Animation(); |