diff options
| author | Nicola Mettifogo | 2009-03-29 10:18:09 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2009-03-29 10:18:09 +0000 |
| commit | 28465d73bbb7a5f7e23f4baa3fa34db097c80a03 (patch) | |
| tree | 66a60f37893f009064b23d026ae79ba69c2b144e /engines/parallaction/objects.h | |
| parent | cda1bf5ca91f178e9e156c4b0246c55a4264f7c3 (diff) | |
| download | scummvm-rg350-28465d73bbb7a5f7e23f4baa3fa34db097c80a03.tar.gz scummvm-rg350-28465d73bbb7a5f7e23f4baa3fa34db097c80a03.tar.bz2 scummvm-rg350-28465d73bbb7a5f7e23f4baa3fa34db097c80a03.zip | |
Merged CommandData into Command.
svn-id: r39732
Diffstat (limited to 'engines/parallaction/objects.h')
| -rw-r--r-- | engines/parallaction/objects.h | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index 393913edeb..52f3d62a59 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -108,8 +108,15 @@ enum CommandFlags { kFlagsTestTrue = 2 }; +struct Command { + uint16 _id; + uint32 _flagsOn; + uint32 _flagsOff; -struct CommandData { + Command(); + ~Command(); + + // Common fields uint32 _flags; ZonePtr _zone; char* _string; @@ -129,26 +136,6 @@ struct CommandData { char* _string2; int _musicCommand; int _musicParm; - - - CommandData() { - memset(this, 0, sizeof(CommandData)); - } - - ~CommandData() { - free(_string); - free(_string2); - } -}; - -struct Command { - uint16 _id; - CommandData u; - uint32 _flagsOn; - uint32 _flagsOff; - - Command(); - ~Command(); }; typedef Common::SharedPtr<Command> CommandPtr; |