[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.313,1.314

[kirben]

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

Modified Files:
	resource.cpp 
Log Message:

RNAM block is different in HE games.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- resource.cpp	10 Apr 2005 17:38:09 -0000	1.313
+++ resource.cpp	11 Apr 2005 05:54:39 -0000	1.314
@@ -348,13 +348,25 @@
 
 		case MKID('RNAM'):
 			// Names of rooms. Maybe we should put them into a table, for use by the debugger?
-			for (int room; (room = _fileHandle->readByte()); ) {
-				char buf[10];
-				_fileHandle->read(buf, 9);
-				buf[9] = 0;
-				for (i = 0; i < 9; i++)
-					buf[i] ^= 0xFF;
-				debug(5, "Room %d: '%s'\n", room, buf);
+			if (_heversion >= 80) {
+				for (int room; (room = _fileHandle->readUint16LE()); ) {
+					char buf[20];
+					i = 0;
+					for (byte s; (s = _fileHandle->readByte()); ) {
+						buf[i++] = s;
+					}
+					buf[i] = 0;
+					debug(5, "Room %d: '%s'", room, buf);
+				}
+			} else {
+				for (int room; (room = _fileHandle->readByte()); ) {
+					char buf[10];
+					_fileHandle->read(buf, 9);
+					buf[9] = 0;
+					for (i = 0; i < 9; i++)
+						buf[i] ^= 0xFF;
+					debug(5, "Room %d: '%s'", room, buf);
+				}
 			}
 			break;