From 9c137c25cb6551e965410a2bb2e7acb2fbdcd90f Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Sat, 17 Mar 2007 13:18:03 +0000
Subject: oops forgot to commit changes for Command

svn-id: r26165
---
 engines/parallaction/commands.cpp | 6 +++---
 engines/parallaction/commands.h   | 4 ++--
 engines/parallaction/location.cpp | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/parallaction/commands.cpp b/engines/parallaction/commands.cpp
index 52ce068a63..7c4b1ed105 100644
--- a/engines/parallaction/commands.cpp
+++ b/engines/parallaction/commands.cpp
@@ -184,7 +184,7 @@ Command *parseCommands(Script &script) {
 
 		}
 
-		addNode(&root, &cmd->_node);
+		addNode(&root, cmd);
 		fillBuffers(script, true);
 
 	}
@@ -198,7 +198,7 @@ void freeCommands(Command *list) {
 	Command *cmd = list;
 
 	while (cmd) {
-		Command *v4 = (Command*)cmd->_node._next;
+		Command *v4 = (Command*)cmd->_next;
 
 		if (cmd->_id == 6) free(cmd->u._zone);	// open
 		free(cmd);
@@ -215,7 +215,7 @@ void runCommands(Command *list, Zone *z) {
 	debugC(1, kDebugLocation, "runCommands");
 
 	Command *cmd = list;
-	for ( ; cmd; cmd = (Command*)cmd->_node._next) {
+	for ( ; cmd; cmd = (Command*)cmd->_next) {
 		CommandData *u = &cmd->u;
 		uint32 v8 = _localFlags[_vm->_currentLocationIndex];
 
diff --git a/engines/parallaction/commands.h b/engines/parallaction/commands.h
index 57a6ab53dc..3e38f8bfe8 100644
--- a/engines/parallaction/commands.h
+++ b/engines/parallaction/commands.h
@@ -47,8 +47,8 @@ union CommandData {
 	} _move;
 };
 
-struct Command {
-	Node			_node;
+struct Command : public Node {
+//	Node			_node;
 
 	uint16			_id;
 	CommandData 	u;
diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp
index ff0f13c943..edd7b319cb 100644
--- a/engines/parallaction/location.cpp
+++ b/engines/parallaction/location.cpp
@@ -213,13 +213,13 @@ void freeLocation() {
 	debugC(7, kDebugLocation, "freeLocation: comments freed");
 
 	if (_vm->_location._commands) {
-		freeNodeList(&_vm->_location._commands->_node);
+		freeNodeList(_vm->_location._commands);
 	}
 	_vm->_location._commands = NULL;
 	debugC(7, kDebugLocation, "freeLocation: commands freed");
 
 	if (_vm->_location._aCommands) {
-		freeNodeList(&_vm->_location._aCommands->_node);
+		freeNodeList(_vm->_location._aCommands);
 	}
 	_vm->_location._aCommands = NULL;
 	debugC(7, kDebugLocation, "freeLocation: acommands freed");
-- 
cgit v1.2.3