[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.69,1.70

[Max Horn]

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

Modified Files:
	resource.cpp 
Log Message:
cleanup

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- resource.cpp	1 May 2003 21:04:38 -0000	1.69
+++ resource.cpp	1 May 2003 22:19:10 -0000	1.70
@@ -483,20 +483,24 @@
 			for (i = 0; i < num; i++)
 				res.roomno[id][i] = _fileHandle.readByte();
 		}
-		for (i = 0; i < num; i++)
+		for (i = 0; i < num; i++) {
 			res.roomoffs[id][i] = _fileHandle.readUint16LE();
+			if (roomoffs[id][i] == 0xFFFF)
+				roomoffs[id][i] = 0xFFFFFFFF;
+		}
+
 	} else if (_features & GF_SMALL_HEADER) {
 		for (i = 0; i < num; i++) {
 			res.roomno[id][i] = _fileHandle.readByte();
 			res.roomoffs[id][i] = _fileHandle.readUint32LE();
 		}
 	} else {
-		_fileHandle.read(res.roomno[id], num * sizeof(uint8));
-		_fileHandle.read(res.roomoffs[id], num * sizeof(uint32));
-#if defined(SCUMM_BIG_ENDIAN)
-		for (i = 0; i < num; i++)
-			res.roomoffs[id][i] = FROM_LE_32(res.roomoffs[id][i]);
-#endif
+		for (i = 0; i < num; i++) {
+			res.roomno[id][i] = _fileHandle.readByte();
+		}
+		for (i = 0; i < num; i++) {
+			res.roomoffs[id][i] = _fileHandle.readUint32LE();
+		}
 	}
 }