[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.339.2.9,1.339.2.10 resource_v7he.cpp,1.46.2.5,1.46.2.6

[kirben]

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

Modified Files:
      Tag: branch-0-8-0
	resource.cpp resource_v7he.cpp 
Log Message:

Backport debug msg changes, to help track HE versions.
Remove invalid index block.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.339.2.9
retrieving revision 1.339.2.10
diff -u -d -r1.339.2.9 -r1.339.2.10
--- resource.cpp	18 Jan 2006 18:07:32 -0000	1.339.2.9
+++ resource.cpp	26 Jan 2006 11:04:47 -0000	1.339.2.10
@@ -553,11 +553,6 @@
 		readArrayFromIndexFile();
 		break;
 
-	case MKID('LECF'):
-		_fileHandle->seek(itemsize - 8, SEEK_CUR);
-		debug(2, "LECF index block not yet handled, skipping");
-		break;
-
 	default:
 		error("Bad ID %04X('%s') found in index file directory!", blocktype,
 				tag2str(blocktype));
@@ -1103,7 +1098,7 @@
 }
 
 void ScummEngine_v5::readMAXS(int blockSize) {
-	debug(9, "readMAXS: MAXS has blocksize %d", blockSize);
+	debug(9, "ScummEngine_v5 readMAXS: MAXS has blocksize %d", blockSize);
 
 	_numVariables = _fileHandle->readUint16LE();      // 800
 	_fileHandle->readUint16LE();                      // 16
@@ -1133,7 +1128,7 @@
 
 #ifndef DISABLE_SCUMM_7_8
 void ScummEngine_v8::readMAXS(int blockSize) {
-	debug(9, "readMAXS: MAXS has blocksize %d", blockSize);
+	debug(9, "ScummEngine_v8 readMAXS: MAXS has blocksize %d", blockSize);
 
 	_fileHandle->seek(50, SEEK_CUR);                 // Skip over SCUMM engine version
 	_fileHandle->seek(50, SEEK_CUR);                 // Skip over data file version
@@ -1163,7 +1158,7 @@
 }
 
 void ScummEngine_v7::readMAXS(int blockSize) {
-	debug(9, "readMAXS: MAXS has blocksize %d", blockSize);
+	debug(9, "ScummEngine_v7 readMAXS: MAXS has blocksize %d", blockSize);
 
 	_fileHandle->seek(50, SEEK_CUR);                 // Skip over SCUMM engine version
 	_fileHandle->seek(50, SEEK_CUR);                 // Skip over data file version
@@ -1197,7 +1192,7 @@
 #endif
 
 void ScummEngine_v6::readMAXS(int blockSize) {
-	debug(0, "readMAXS: MAXS has blocksize %d", blockSize);
+	debug(0, "ScummEngine_v6 readMAXS: MAXS has blocksize %d", blockSize);
 
 	_numVariables = _fileHandle->readUint16LE();
 	_fileHandle->readUint16LE();
@@ -1567,6 +1562,8 @@
 		return "Image";
 	case rtTalkie:
 		return "Talkie";
+	case rtSpoolBuffer:
+		return "SpoolBuffer";
 	case rtNumTypes:
 		return "NumTypes";
 	default:

Index: resource_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.cpp,v
retrieving revision 1.46.2.5
retrieving revision 1.46.2.6
diff -u -d -r1.46.2.5 -r1.46.2.6
--- resource_v7he.cpp	18 Jan 2006 18:07:32 -0000	1.46.2.5
+++ resource_v7he.cpp	26 Jan 2006 11:04:47 -0000	1.46.2.6
@@ -106,7 +106,7 @@
 	}
 
 	if (_vm->_system->hasFeature(OSystem::kFeatureCursorHasPalette) && cc->palette)
-			_vm->_system->setCursorPalette(cc->palette, 0, cc->palSize);
+		_vm->_system->setCursorPalette(cc->palette, 0, cc->palSize);
 
 	_vm->setCursorHotspot(cc->hotspot_x, cc->hotspot_y);
 	_vm->setCursorFromBuffer(cc->bitmap, cc->w, cc->h, cc->w);
@@ -1661,7 +1661,7 @@
 }
 
 void ScummEngine_v99he::readMAXS(int blockSize) {
-	debug(0, "readMAXS: MAXS has blocksize %d", blockSize);
+	debug(0, "ScummEngine_v99he readMAXS: MAXS has blocksize %d", blockSize);
 
 	_numVariables = _fileHandle->readUint16LE();
 	_fileHandle->readUint16LE();
@@ -1689,12 +1689,10 @@
 
 	_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
 	_numGlobalScripts = 2048;
-
-	_shadowPalette = (byte *)calloc(65536, 1);
 }
 
 void ScummEngine_v90he::readMAXS(int blockSize) {
-	debug(0, "readMAXS: MAXS has blocksize %d", blockSize);
+	debug(0, "ScummEngine_v90he readMAXS: MAXS has blocksize %d", blockSize);
 
 	_numVariables = _fileHandle->readUint16LE();
 	_fileHandle->readUint16LE();
@@ -1723,13 +1721,10 @@
 	else
 		_numGlobalScripts = 200;
 
-	if (_heversion >= 95) {
-		_shadowPalette = (byte *)calloc(65536, 1);
-	}
 }
 
 void ScummEngine_v72he::readMAXS(int blockSize) {
-	debug(0, "readMAXS: MAXS has blocksize %d", blockSize);
+	debug(0, "ScummEngine_v72he readMAXS: MAXS has blocksize %d", blockSize);
 
 	_numVariables = _fileHandle->readUint16LE();
 	_fileHandle->readUint16LE();
@@ -1785,12 +1780,7 @@
 				error("getSoundResourceSize: Not a valid WAV file");
 			}
 		} else {
-			if (READ_UINT32(ptr) == MKID('HSHD')) {
-				ptr += READ_BE_UINT32(ptr + 4);
-			} else {
-				ptr += 8 + READ_BE_UINT32(ptr + 12);
-			}
-
+			ptr += 8 + READ_BE_UINT32(ptr + 12);
 			if (READ_UINT32(ptr) == MKID('SBNG')) {
 				ptr += READ_BE_UINT32(ptr + 4);
 			}