[Scummvm-cvs-logs] SF.net SVN: scummvm: [26165] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 26165
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26165&view=rev
Author:   peres001
Date:     2007-03-17 06:18:03 -0700 (Sat, 17 Mar 2007)

Log Message:
-----------
oops forgot to commit changes for Command

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/commands.cpp
    scummvm/trunk/engines/parallaction/commands.h
    scummvm/trunk/engines/parallaction/location.cpp

Modified: scummvm/trunk/engines/parallaction/commands.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/commands.cpp	2007-03-17 13:14:50 UTC (rev 26164)
+++ scummvm/trunk/engines/parallaction/commands.cpp	2007-03-17 13:18:03 UTC (rev 26165)
@@ -184,7 +184,7 @@
 
 		}
 
-		addNode(&root, &cmd->_node);
+		addNode(&root, cmd);
 		fillBuffers(script, true);
 
 	}
@@ -198,7 +198,7 @@
 	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 @@
 	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];
 

Modified: scummvm/trunk/engines/parallaction/commands.h
===================================================================
--- scummvm/trunk/engines/parallaction/commands.h	2007-03-17 13:14:50 UTC (rev 26164)
+++ scummvm/trunk/engines/parallaction/commands.h	2007-03-17 13:18:03 UTC (rev 26165)
@@ -47,8 +47,8 @@
 	} _move;
 };
 
-struct Command {
-	Node			_node;
+struct Command : public Node {
+//	Node			_node;
 
 	uint16			_id;
 	CommandData 	u;

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-03-17 13:14:50 UTC (rev 26164)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-03-17 13:18:03 UTC (rev 26165)
@@ -213,13 +213,13 @@
 	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");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.