aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/objects.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/parallaction/objects.h')
-rw-r--r--engines/parallaction/objects.h29
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;