[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.109,1.110 resource.cpp,1.41,1.42

[Max Horn]

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

Modified Files:
	scumm.h resource.cpp 
Log Message:
32 bit variables storage

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- scumm.h	26 Dec 2002 01:15:25 -0000	1.109
+++ scumm.h	26 Dec 2002 01:46:36 -0000	1.110
@@ -323,7 +323,7 @@
 	uint16 *_inventory;
 	byte *_arrays;
 	uint16 *_newNames;
-	int16 *_vars;
+	int32 *_vars;
 	int16 _varwatch;
 	byte *_bitVars;
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- resource.cpp	25 Dec 2002 19:06:31 -0000	1.41
+++ resource.cpp	26 Dec 2002 01:46:36 -0000	1.42
@@ -1638,7 +1638,7 @@
 	_inventory = (uint16 *)calloc(_numInventory, sizeof(uint16));
 	_verbs = (VerbSlot *)calloc(_numVerbs, sizeof(VerbSlot));
 	_objs = (ObjectData *)calloc(_numLocalObjects, sizeof(ObjectData));
-	_vars = (int16 *)calloc(_numVariables, sizeof(int16));
+	_vars = (int32 *)calloc(_numVariables, sizeof(int32));
 	_bitVars = (byte *)calloc(_numBitVariables >> 3, 1);
 
 	allocResTypeData(rtCostume, (_features & GF_NEW_COSTUMES) ? MKID('AKOS') : MKID('COST'),