[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.246,1.247 scumm.h,1.448,1.449

[Travis Howell]

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

Modified Files:
	resource.cpp scumm.h 
Log Message:

Resource corrections


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- resource.cpp	23 Aug 2004 11:47:51 -0000	1.246
+++ resource.cpp	24 Aug 2004 02:02:55 -0000	1.247
@@ -568,8 +568,7 @@
 			break;
 
 		case MKID('DIRM'):
-			_fileHandle.seek(itemsize - 8, SEEK_CUR);
-			debug(9, "found DIRM block, skipping");
+			readResTypeList(rtImage, MKID('AWIZ'), "images");
 			break;
 			
 		case MKID('DISK'):
@@ -577,11 +576,8 @@
 			warning("DISK index block not yet handled, skipping");
 			break;
 
-		case MKID('DIRI'): // Images?
-//			readResTypeList(rtImage, MKID('AWIZ'), "images");
-			num = _fileHandle.readUint16LE();
-			_fileHandle.seek(num + (8 * num), SEEK_CUR);
-			debug(9, "found DIRI block, skipping");
+		case MKID('DIRI'):
+			readResTypeList(rtRoom, MKID('RMIM'), "room image");
 			break;
 
 		case MKID('ANAM'):
@@ -2427,6 +2423,7 @@
 	allocResTypeData(rtFlObject, MKID('NONE'), _numFlObject, "flobject", 0);
 	allocResTypeData(rtMatrix, MKID('NONE'), 10, "boxes", 0);
 	allocResTypeData(rtImage, MKID('AWIZ'), _numImages, "images", 1);
+	allocResTypeData(rtRoomImage, MKID('RMIM'), _numRooms, "room image", 1);
 }
 
 void ScummEngine::dumpResource(const char *tag, int idx, const byte *ptr, int length) {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -d -r1.448 -r1.449
--- scumm.h	23 Aug 2004 08:37:55 -0000	1.448
+++ scumm.h	24 Aug 2004 02:02:56 -0000	1.449
@@ -214,6 +214,7 @@
 	rtRoomScripts = 17,
 	rtRoomStart = 17,
 	rtLast = 17,
+	rtRoomImage = 18,
 	rtImage = 19,
 	rtNumTypes = 20
 };