[Scummvm-cvs-logs] CVS: scummvm/v3 resource.cpp,1.1,1.2

[Vincent Hamm]

Update of /cvsroot/scummvm/scummvm/v3
In directory usw-pr-cvs1:/tmp/cvs-serv3539/v3

Modified Files:
	resource.cpp 
Log Message:
Little clean up of the v3 specific readIndex

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/v3/resource.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** resource.cpp	25 Mar 2002 01:20:05 -0000	1.1
--- resource.cpp	25 Mar 2002 01:31:16 -0000	1.2
***************
*** 4,50 ****
  
  void Scumm_v3::readIndexFile() {
!        uint16 blocktype;
!        uint32 itemsize;
!        int numblock = 0;
!        int num, i;
!        byte* _oldClass; 
  
!        debug(9, "readIndexFile()");
  
!        openRoom(-1);
!        openRoom(0);
  
!        if (!(_features & GF_AFTER_V6)) {
!                while (!fileEof(_fileHandle)) {
!                        itemsize = fileReadDwordLE();
!                        blocktype = fileReadWordLE();
!                        if (fileReadFailed(_fileHandle))
!                                break;
  
!                        switch(blocktype) {
!                        case 0x4E52:
!                                fileReadWordLE();
!                                break;
!                        case 0x5230:
!                                _numRooms = fileReadWordLE();
!                                break;
!                        case 0x5330:
!                                _numScripts = fileReadWordLE();
!                                break;
!                        case 0x4E30:
!                                _numSounds = fileReadWordLE();
!                                break;
!                        case 0x4330:
!                                _numCostumes = fileReadWordLE();
!                                break;
!                        case 0x4F30:
!                                _numGlobalObjects = fileReadWordLE();
!                                break;
!                        }
!                        fileSeek(_fileHandle, itemsize-8,SEEK_CUR);
!                }
!                clearFileReadFailed(_fileHandle);
!                fileSeek(_fileHandle, 0, SEEK_SET);
!        }
  
         /* I'm not sure for those values yet, they will have to be rechecked */
--- 4,49 ----
  
  void Scumm_v3::readIndexFile() {
! 	uint16 blocktype;
! 	uint32 itemsize;
! 	int numblock = 0;
! 	int num, i;
! 	byte* _oldClass; 
  
! 	debug(9, "readIndexFile()");
  
! 	openRoom(-1);
! 	openRoom(0);
  
! 	while (!fileEof(_fileHandle)) {
! 		itemsize = fileReadDwordLE();
! 			blocktype = fileReadWordLE();
! 			if (fileReadFailed(_fileHandle))
! 				break;
  
! 			switch(blocktype) {
! 				case 0x4E52:
! 					fileReadWordLE();
! 					break;
! 				case 0x5230:
! 					_numRooms = fileReadWordLE();
! 					break;
! 				case 0x5330:
! 					_numScripts = fileReadWordLE();
! 					break;
! 				case 0x4E30:
! 					_numSounds = fileReadWordLE();
! 					break;
! 				case 0x4330:
! 					_numCostumes = fileReadWordLE();
! 					break;
! 				case 0x4F30:
! 					_numGlobalObjects = fileReadWordLE();
! 					break;
! 			}
! 		fileSeek(_fileHandle, itemsize-8,SEEK_CUR);
! 	}
! 	
! 	clearFileReadFailed(_fileHandle);
! 	fileSeek(_fileHandle, 0, SEEK_SET);
  
         /* I'm not sure for those values yet, they will have to be rechecked */