Renamed _mouseButStat -> _mouseAndKeyboardStat (that's what it really is); moved _audioNames to class IMuseDigital

svn-id: r17723

1 files changed, 17 insertions, 7 deletions

diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 9b96557b13..060f3f83b8 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -341,6 +341,23 @@ void ScummEngine::readIndexFile() {
 	closeRoom();
 }
 
+void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) {
+	int num;
+	char *ptr;
+	switch (blocktype) {
+	case MKID('ANAM'):		// Used by: The Dig, FT
+		debug(9, "found ANAM block, reading audio names");
+		num = _fileHandle->readUint16LE();
+		ptr = (char*)malloc(num * 9);
+		_fileHandle->read(ptr, num * 9);
+		_imuseDigital->setAudioNames(num, ptr);
+		break;
+
+	default:
+		ScummEngine::readIndexBlock(blocktype, itemsize);
+	}
+}
+
 void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	int i;
 	switch (blocktype) {
@@ -421,13 +438,6 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 		readResTypeList(rtRoomImage, MKID('RMIM'), "room image");
 		break;
 
-	case MKID('ANAM'):		// Used by: The Dig, FT
-		debug(9, "found ANAM block, reading audio names");
-		_numAudioNames = _fileHandle->readUint16LE();
-		_audioNames = (char*)malloc(_numAudioNames * 9);
-		_fileHandle->read(_audioNames, _numAudioNames * 9);
-		break;
-
 	case MKID('DIRR'):
 	case MKID('DROO'):
 		readResTypeList(rtRoom, MKID('ROOM'), "room");