[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.262,1.263 scumm.cpp,1.175,1.176 scumm.h,1.472,1.473

[Travis Howell]

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

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

Load talkie block


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- resource.cpp	7 Sep 2004 12:54:41 -0000	1.262
+++ resource.cpp	7 Sep 2004 13:23:25 -0000	1.263
@@ -573,8 +573,7 @@
 			break;
 			
 		case MKID('DIRT'):
-			_fileHandle.seek(itemsize - 8, SEEK_CUR);
-			warning("DIRT index block not yet handled, skipping");
+			readResTypeList(rtTalkie, MKID('TLKE'), "talkie");
 			break;
 
 		case MKID('SVER'):
@@ -2321,7 +2320,7 @@
 		_fileHandle.readUint16LE(); // unknown
 		_fileHandle.readUint16LE(); // unknown
 		_fileHandle.readUint16LE(); // unknown
-		_fileHandle.readUint16LE(); // _numTalkie
+		_numTalkie = _fileHandle.readUint16LE();
 
 		/* TODO check these values */
 
@@ -2491,6 +2490,8 @@
 	allocResTypeData(rtMatrix, MKID('NONE'), 10, "boxes", 0);
 	allocResTypeData(rtImage, MKID('AWIZ'), _numImages, "images", 1);
 	allocResTypeData(rtRoomImage, MKID('RMIM'), _numRooms, "room image", 1);
+	allocResTypeData(rtTalkie, MKID('TLKE'), _numTalkie, "talkie", 1);
+
 }
 
 void ScummEngine::dumpResource(const char *tag, int idx, const byte *ptr, int length) {
@@ -2718,6 +2719,8 @@
 		return "RoomImage";
 	case rtImage:
 		return "Image";
+	case rtTalkie:
+		return "Talkie";
 	case rtNumTypes:
 		return "NumTypes";
 	default:

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- scumm.cpp	7 Sep 2004 13:20:54 -0000	1.175
+++ scumm.cpp	7 Sep 2004 13:23:25 -0000	1.176
@@ -520,6 +520,7 @@
 	_numActors = 0;
 	_numCostumes = 0;
 	_numImages = 0;
+	_numTalkie = 0;
 	_audioNames = NULL;
 	_numAudioNames = 0;
 	_curActor = 0;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -d -r1.472 -r1.473
--- scumm.h	6 Sep 2004 05:50:32 -0000	1.472
+++ scumm.h	7 Sep 2004 13:23:26 -0000	1.473
@@ -214,8 +214,9 @@
 	rtRoomScripts = 17,
 	rtRoomImage = 18,
 	rtImage = 19,
-	rtLast = 19,
-	rtNumTypes = 20
+	rtTalkie = 20,
+	rtLast = 20,
+	rtNumTypes = 21
 };
 
 enum {
@@ -480,6 +481,7 @@
 	int _numInventory;
 	int _numNewNames, _numGlobalScripts;
 	int _numActors, _numRoomVariables;
+	int _numTalkie;
 public:
 	int _numImages, _numRooms, _numScripts, _numSounds;	// Used by VARS in HE games
 	int _numCostumes;	// FIXME - should be protected, used by Actor::remapActorPalette