[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.271,1.272

[Max Horn]

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

Modified Files:
	resource.cpp 
Log Message:
removed _heV7RoomIntOffsets

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- resource.cpp	18 Sep 2004 22:42:43 -0000	1.271
+++ resource.cpp	18 Sep 2004 22:45:53 -0000	1.272
@@ -699,9 +699,6 @@
 		}
 		for (i = 0; i < num; i++) {
 			res.roomoffs[id][i] = _fileHandle.readUint32LE();
-
-			if (id == rtRoom && _heversion >= 70)
-				_heV7RoomIntOffsets[i] = res.roomoffs[id][i];
 		}
 
 		if (_heversion >= 70) {
@@ -733,9 +730,6 @@
 
 	if (_heversion >= 70) {
 		res.globsize[id] = (uint32 *)calloc(num, sizeof(uint32));
-
-		if (id == rtRoom)
-			_heV7RoomIntOffsets = (uint32 *)calloc(num, sizeof(uint32));
 	}
 }
 
@@ -832,7 +826,7 @@
 		if (_version == 8)
 			fileOffs = 8;
 		else if (_heversion >= 70)
-			fileOffs = _heV7RoomIntOffsets[idx];
+			fileOffs = res.roomoffs[type][idx];
 		else
 			fileOffs = 0;
 	} else {
@@ -2186,7 +2180,6 @@
 			free(res.globsize[i]);
 	}
 	if (_heversion >= 70) {
-		free(_heV7RoomIntOffsets);
 		free(_heV7RoomOffsets);
 	}
 }