[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.234,1.235 script.cpp,1.165,1.166 script_v6.cpp,1.367,1.368

[Travis Howell]

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

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

Should have limited that to HE games only.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- resource.cpp	1 Aug 2004 13:57:00 -0000	1.234
+++ resource.cpp	2 Aug 2004 05:09:53 -0000	1.235
@@ -2406,7 +2406,8 @@
 	_scummVars = (int32 *)calloc(_numVariables, sizeof(int32));
 	_bitVars = (byte *)calloc(_numBitVariables >> 3, 1);
 	_images = (uint16 *)calloc(_numImages, sizeof(uint16));
-	_arraySlot = (byte *)calloc(_numArray, 1);
+	if (_features & GF_HUMONGOUS)
+		_arraySlot = (byte *)calloc(_numArray, 1);
 
 	allocResTypeData(rtCostume, (_features & GF_NEW_COSTUMES) ? MKID('AKOS') : MKID('COST'),
 								_numCostumes, "costume", 1);

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- script.cpp	1 Aug 2004 13:57:00 -0000	1.165
+++ script.cpp	2 Aug 2004 05:09:53 -0000	1.166
@@ -349,7 +349,7 @@
 void ScummEngine::nukeArrays(int script) {
 	int i;
 
-	if (!_heversion || !script)
+	if (!(_features & GF_HUMONGOUS) || !script)
 		return;
 
 	for (i = 1; i < _numArray; i++) {

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- script_v6.cpp	1 Aug 2004 13:57:00 -0000	1.367
+++ script_v6.cpp	2 Aug 2004 05:09:53 -0000	1.368
@@ -465,7 +465,8 @@
 
 	if (data)
 		nukeResource(rtString, data);
-	_arraySlot[a] = 0;
+	if (_features & GF_HUMONGOUS)
+		_arraySlot[a] = 0;
 
 	writeVar(a, 0);
 }