[Scummvm-cvs-logs] SF.net SVN: scummvm:[41174] scummvm/trunk/engines/sci/engine

[fingolfin at users.sourceforge.net]

Revision: 41174
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41174&view=rev
Author:   fingolfin
Date:     2009-06-04 20:51:24 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
SCI: Slightly modified kAddAfter so that it does not modify its arguments needlessly

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/klists.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-06-04 20:51:09 UTC (rev 41173)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-06-04 20:51:24 UTC (rev 41174)
@@ -769,7 +769,7 @@
 	return 0;
 }
 
-reg_t kCanBeHere(EngineState *s, int funct_nr, int argc, reg_t * argv) {
+reg_t kCanBeHere(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	reg_t obj = argv[0];
 	reg_t cliplist_ref = KP_ALT(1, NULL_REG);
 	List *cliplist = NULL;

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2009-06-04 20:51:09 UTC (rev 41173)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2009-06-04 20:51:24 UTC (rev 41174)
@@ -310,7 +310,7 @@
 }
 
 reg_t kAddAfter(EngineState *s, int funct_nr, int argc, reg_t *argv) {
-	List *l =lookup_list(s, argv[0]);
+	List *l = lookup_list(s, argv[0]);
 	Node *firstnode = argv[1].isNull() ? NULL : lookup_node(s, argv[1]);
 	Node *newnode = lookup_node(s, argv[2]);
 
@@ -341,12 +341,11 @@
 		else
 			lookup_node(s, oldnext)->pred = argv[2];
 
-		return s->r_acc;
 	} else { // !firstnode
-		// Prepare call to AddToFront...
-		argv[1] = argv[0];
-		return kAddToFront(s, funct_nr, 2, argv + 1); // Set as initial list node
+		_k_add_to_front(s, argv[0], argv[2]); // Set as initial list node
 	}
+
+	return s->r_acc;
 }
 
 reg_t kAddToEnd(EngineState *s, int funct_nr, int argc, reg_t *argv) {


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