[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.112,1.113 resource.cpp,1.94,1.95 script.cpp,1.105,1.106 scumm.h,1.230,1.231 scummvm.cpp,2.193,2.194

[Max Horn]

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

Modified Files:
	object.cpp resource.cpp script.cpp scumm.h scummvm.cpp 
Log Message:
cleanup

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- object.cpp	30 May 2003 20:13:29 -0000	1.112
+++ object.cpp	31 May 2003 11:57:17 -0000	1.113
@@ -888,21 +888,6 @@
 	if (obj < _numActors)
 		return derefActor(obj, "getObjOrActorName")->getActorName();
 
-	if (_features & GF_SMALL_HEADER) {
-		byte offset = 0;
-
-		objptr = getOBCDFromObject(obj);
-		if (objptr) {
-			if (_features & GF_AFTER_V2)
-				offset = *(objptr + 14);
-			else if (_features & GF_OLD_BUNDLE)
-				offset = *(objptr + 16);
-			else
-				offset = READ_LE_UINT16(objptr + 18);
-		}
-		return (objptr + offset);
-	}
-
 	if (_features & GF_AFTER_V6) {
 		for (i = 0; i < _numNewNames; i++) {
 			if (_newNames[i] == obj) {
@@ -916,6 +901,19 @@
 	objptr = getOBCDFromObject(obj);
 	if (objptr == NULL)
 		return NULL;
+
+	if (_features & GF_SMALL_HEADER) {
+		byte offset = 0;
+
+		if (_features & GF_AFTER_V2)
+			offset = *(objptr + 14);
+		else if (_features & GF_OLD_BUNDLE)
+			offset = *(objptr + 16);
+		else
+			offset = READ_LE_UINT16(objptr + 18);
+
+		return (objptr + offset);
+	}
 
 #if 0
 	return findResourceData(MKID('OBNA'), objptr);

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- resource.cpp	30 May 2003 20:13:29 -0000	1.94
+++ resource.cpp	31 May 2003 11:57:17 -0000	1.95
@@ -1753,7 +1753,6 @@
 	_objectOwnerTable = (byte *)calloc(_numGlobalObjects, 1);
 	_objectStateTable = (byte *)calloc(_numGlobalObjects, 1);
 	_classData = (uint32 *)calloc(_numGlobalObjects, sizeof(uint32));
-	_arrays = (byte *)calloc(_numArray, 1);
 	_newNames = (uint16 *)calloc(_numNewNames, sizeof(uint16));
 
 	_inventory = (uint16 *)calloc(_numInventory, sizeof(uint16));

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- script.cpp	29 May 2003 10:14:53 -0000	1.105
+++ script.cpp	31 May 2003 11:57:17 -0000	1.106
@@ -969,7 +969,6 @@
 
 	if (_features & GF_AFTER_V8) {
 		if (array & 0x40000000) {
-			_arrays[id] = (char)vm.slot[_currentScript].number;
 		}
 	
 		if (array & 0x80000000) {
@@ -979,7 +978,6 @@
 		size = (type == 5) ? 32 : 8;
 	} else {
 		if (array & 0x4000) {
-			_arrays[id] = (char)vm.slot[_currentScript].number;
 		}
 	
 		if (array & 0x8000) {
@@ -1011,7 +1009,6 @@
 
 	if (data)
 		nukeResource(rtString, data);
-	_arrays[data] = 0;
 
 	writeVar(a, 0);
 }

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- scumm.h	30 May 2003 23:24:29 -0000	1.230
+++ scumm.h	31 May 2003 11:57:17 -0000	1.231
@@ -384,7 +384,6 @@
 	Actor *_actors;	// Has _numActors elements
 	
 	uint16 *_inventory;
-	byte *_arrays;
 	uint16 *_newNames;
 public:
 	// VAR is a wrapper around scummVar, which attempts to include additional

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.193
retrieving revision 2.194
diff -u -d -r2.193 -r2.194
--- scummvm.cpp	30 May 2003 23:24:29 -0000	2.193
+++ scummvm.cpp	31 May 2003 11:57:18 -0000	2.194
@@ -220,7 +220,6 @@
 	memset(&gdi,0,sizeof(Gdi));
 	_actors = NULL;
 	_inventory = NULL;
-	_arrays = NULL;
 	_newNames = NULL;
 	_scummVars = NULL;
 	_varwatch = 0;
@@ -1948,7 +1947,6 @@
 	free(_objectRoomTable);
 	free(_objectOwnerTable);
 	free(_inventory);
-	free(_arrays);
 	free(_verbs);
 	free(_objs);
 	free(_scummVars);