[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.146,1.147 script_v6.cpp,1.266,1.267

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv6433/scumm

Modified Files:
	script.cpp script_v6.cpp 
Log Message:

Add correct fix for puttputt


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- script.cpp	11 Jan 2004 01:01:27 -0000	1.146
+++ script.cpp	15 Jan 2004 06:25:57 -0000	1.147
@@ -664,10 +664,11 @@
 	if (_version <= 2) {
 		redrawV2Inventory();
 	} else {
-		int tmp[16];
-		tmp[0] = i;
+		int args[16];
+		memset(args, 0, sizeof(args));
+		args[0] = i;
 		if (VAR(VAR_INVENTORY_SCRIPT)) {
-			runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, tmp);
+			runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, args);
 		}
 	}
 }

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- script_v6.cpp	15 Jan 2004 04:47:55 -0000	1.266
+++ script_v6.cpp	15 Jan 2004 06:25:57 -0000	1.267
@@ -1930,10 +1930,6 @@
 	case 139:		// SO_VERB_IMAGE_IN_ROOM
 		b = pop();
 		a = pop();
-		// HACK Prevent puttmoon from loading non existant objects
-		if ((_gameId == GID_PUTTPUTT) && (a > 900))
-			break;
-
 		if (slot && a != vs->imgindex) {
 			setVerbObject(b, a, slot);
 			vs->type = kImageVerbType;