[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.184,1.185 script_v6he.cpp,2.97,2.98 scumm.cpp,1.155,1.156 scumm.h,1.457,1.458

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29311/scumm

Modified Files:
	script.cpp script_v6he.cpp scumm.cpp scumm.h 
Log Message:

Limit nukeArrays to only location thats requires it for now.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- script.cpp	28 Aug 2004 03:18:52 -0000	1.184
+++ script.cpp	28 Aug 2004 04:14:31 -0000	1.185
@@ -349,12 +349,14 @@
 
 /* Nuke arrays based on script */
 void ScummEngine::nukeArrays(int script) {
-	//FIXME
-	return;
-
 	int i;
 
-	if (!(_features & GF_HUMONGOUS) || !script)
+	if (!script)
+		return;
+
+	//FIXME Should be used all the time
+	// Limited to only location in puttmoon that requires it
+	if (!(_gameId == GID_PUTTMOON && _roomResource == 22))
 		return;
 
 	for (i = 1; i < _numArray; i++) {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.97
retrieving revision 2.98
diff -u -d -r2.97 -r2.98
--- script_v6he.cpp	27 Aug 2004 12:56:01 -0000	2.97
+++ script_v6he.cpp	28 Aug 2004 04:14:32 -0000	2.98
@@ -1138,7 +1138,7 @@
 	int slot = pop();
 
 	if (slot < _numArray) {
-		_arraySlot[slot] = _currentScript;
+		_arraySlot[slot] = vm.slot[_currentScript].number;
 	} else {
 		warning("o6_localizeArray(%d): array slot out of range", slot);
 	}

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- scumm.cpp	28 Aug 2004 03:18:52 -0000	1.155
+++ scumm.cpp	28 Aug 2004 04:14:32 -0000	1.156
@@ -214,7 +214,7 @@
 	  GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_MULTIPLE_VERSIONS, 0, 0},
 	{"moondemo", "Putt-Putt Goes To The Moon (Demo)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
-	{"puttmoon", "Putt-Putt Goes To The Moon", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
+	{"puttmoon", "Putt-Putt Goes To The Moon", GID_PUTTMOON, 6, 60, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
 	{"funpack", "Putt-Putt's Fun Pack", GID_FUNPACK, 6, 60, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -d -r1.457 -r1.458
--- scumm.h	28 Aug 2004 03:18:52 -0000	1.457
+++ scumm.h	28 Aug 2004 04:14:33 -0000	1.458
@@ -255,6 +255,7 @@
 	GID_MONKEY_SEGA,
 	GID_HEGAME,      // Generic name for all HE games with default behaviour
 	GID_PUTTDEMO,
+	GID_PUTTMOON,
 	GID_FBEAR,
 	GID_FUNPACK,
 	GID_PAJAMA,