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

[peres001 at users.sourceforge.net]

Revision: 26408
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26408&view=rev
Author:   peres001
Date:     2007-04-07 08:47:42 -0700 (Sat, 07 Apr 2007)

Log Message:
-----------
Fixed incomplete implementation of Command lists.

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

Modified: scummvm/trunk/engines/parallaction/commands.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/commands.cpp	2007-04-07 15:18:26 UTC (rev 26407)
+++ scummvm/trunk/engines/parallaction/commands.cpp	2007-04-07 15:47:42 UTC (rev 26408)
@@ -49,9 +49,6 @@
 void Parallaction::parseCommands(Script &script, CommandList& list) {
 //	printf("parseCommands()");
 
-	Node root;
-	memset(&root, 0, sizeof(root));
-
 	fillBuffers(script, true);
 
 	while (scumm_stricmp(_tokens[0], "ENDCOMMANDS") && scumm_stricmp(_tokens[0], "ENDZONE")) {
@@ -184,7 +181,7 @@
 
 		}
 
-		addNode(&root, cmd);
+		list.push_front(cmd);	// NOTE: command lists are written backwards in scripts
 		fillBuffers(script, true);
 
 	}

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2007-04-07 15:18:26 UTC (rev 26407)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2007-04-07 15:47:42 UTC (rev 26408)
@@ -384,7 +384,8 @@
 	}
 
 	exitDialogue();
-	runCommands(*cmdlist);
+	if (cmdlist)
+		runCommands(*cmdlist);
 
 	return;
 


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