Removed the (useless, thanks to resTypeFromId) 'name' parameter from readResTypeList

svn-id: r25828

6 files changed, 34 insertions, 34 deletions

diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index 0b88969b3c..7ef3a412c6 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -214,7 +214,7 @@ public:
 	virtual void resetScumm();
 
 protected:
-	virtual void readResTypeList(int id, const char *name);
+	virtual void readResTypeList(int id);
 	virtual void readIndexFile();
 	virtual void loadCharset(int no);
 	virtual void resetRoomObjects();
@@ -246,7 +246,7 @@ public:
 	ScummEngine_v3old(OSystem *syst, const DetectorResult &dr);
 
 protected:
-	virtual void readResTypeList(int id, const char *name);
+	virtual void readResTypeList(int id);
 	virtual void readIndexFile();
 	virtual void setupRoomSubBlocks();
 	virtual void resetRoomSubBlocks();
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 8d008ad045..7659222754 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -367,7 +367,7 @@ void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 		break;
 
 	case MKID_BE('DRSC'):		// Used by: COMI
-		readResTypeList(rtRoomScripts, "room script");
+		readResTypeList(rtRoomScripts);
 		break;
 
 	default:
@@ -381,15 +381,15 @@ void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	int i;
 	switch (blocktype) {
 	case MKID_BE('DIRI'):
-		readResTypeList(rtRoomImage, "room image");
+		readResTypeList(rtRoomImage);
 		break;
 
 	case MKID_BE('DIRM'):
-		readResTypeList(rtImage, "images");
+		readResTypeList(rtImage);
 		break;
 
 	case MKID_BE('DIRT'):
-		readResTypeList(rtTalkie, "talkie");
+		readResTypeList(rtTalkie);
 		break;
 
 	case MKID_BE('DLFL'):
@@ -426,7 +426,7 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	switch (blocktype) {
 	case MKID_BE('DCHR'):
 	case MKID_BE('DIRF'):
-		readResTypeList(rtCharset, "charset");
+		readResTypeList(rtCharset);
 		break;
 
 	case MKID_BE('DOBJ'):
@@ -460,17 +460,17 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 
 	case MKID_BE('DROO'):
 	case MKID_BE('DIRR'):
-		readResTypeList(rtRoom, "room");
+		readResTypeList(rtRoom);
 		break;
 
 	case MKID_BE('DSCR'):
 	case MKID_BE('DIRS'):
-		readResTypeList(rtScript, "script");
+		readResTypeList(rtScript);
 		break;
 
 	case MKID_BE('DCOS'):
 	case MKID_BE('DIRC'):
-		readResTypeList(rtCostume, "costume");
+		readResTypeList(rtCostume);
 		break;
 
 	case MKID_BE('MAXS'):
@@ -480,7 +480,7 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 
 	case MKID_BE('DIRN'):
 	case MKID_BE('DSOU'):
-		readResTypeList(rtSound, "sound");
+		readResTypeList(rtSound);
 		break;
 
 	case MKID_BE('AARY'):
@@ -497,11 +497,11 @@ void ScummEngine::readArrayFromIndexFile() {
 	error("readArrayFromIndexFile() not supported in pre-V6 games");
 }
 
-void ScummEngine::readResTypeList(int id, const char *name) {
+void ScummEngine::readResTypeList(int id) {
 	int num;
 	int i;
 
-	debug(9, "readResTypeList(%s,%s)", resTypeFromId(id), name);
+	debug(9, "readResTypeList(%s)", resTypeFromId(id));
 
 	if (_game.version == 8)
 		num = _fileHandle->readUint32LE();
@@ -509,7 +509,7 @@ void ScummEngine::readResTypeList(int id, const char *name) {
 		num = _fileHandle->readUint16LE();
 
 	if (num != _res->num[id]) {
-		error("Invalid number of %ss (%d) in directory", name, num);
+		error("Invalid number of %ss (%d) in directory", resTypeFromId(id), num);
 	}
 
 	for (i = 0; i < num; i++) {
@@ -626,7 +626,7 @@ int ScummEngine::loadResource(int type, int idx) {
 	uint32 fileOffs;
 	uint32 size, tag;
 
-	debugC(DEBUG_RESOURCE, "loadResource(%s,%d)", resTypeFromId(type),idx);
+	debugC(DEBUG_RESOURCE, "loadResource(%s,%d)", resTypeFromId(type), idx);
 
 	if (type == rtCharset && (_game.features & GF_SMALL_HEADER)) {
 		loadCharset(idx);
diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp
index a503e1291d..e0cfdffbe7 100644
--- a/engines/scumm/resource_v2.cpp
+++ b/engines/scumm/resource_v2.cpp
@@ -144,10 +144,10 @@ void ScummEngine_v2::readEnhancedIndexFile() {
 
 	_fileHandle->readUint16LE(); /* version magic number */
 	readGlobalObjects();
-	readResTypeList(rtRoom, "room");
-	readResTypeList(rtCostume, "costume");
-	readResTypeList(rtScript, "script");
-	readResTypeList(rtSound, "sound");
+	readResTypeList(rtRoom);
+	readResTypeList(rtCostume);
+	readResTypeList(rtScript);
+	readResTypeList(rtSound);
 }
 
 void ScummEngine_v2::readGlobalObjects() {
diff --git a/engines/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp
index 3f1c1ead24..96227b696f 100644
--- a/engines/scumm/resource_v3.cpp
+++ b/engines/scumm/resource_v3.cpp
@@ -31,16 +31,16 @@ namespace Scumm {
 
 extern const char *resTypeFromId(int id);
 
-void ScummEngine_v3old::readResTypeList(int id, const char *name) {
+void ScummEngine_v3old::readResTypeList(int id) {
 	int num;
 	int i;
 
-	debug(9, "readResTypeList(%s,%s)", resTypeFromId(id), name);
+	debug(9, "readResTypeList(%s)", resTypeFromId(id));
 
 	num = _fileHandle->readByte();
 
 	if (num >= 0xFF) {
-		error("Too many %ss (%d) in directory", name, num);
+		error("Too many %ss (%d) in directory", resTypeFromId(id), num);
 	}
 
 	if (id == rtRoom) {
@@ -87,10 +87,10 @@ void ScummEngine_v3old::readIndexFile() {
 
 	_fileHandle->readUint16LE(); /* version magic number */
 	readGlobalObjects();
-	readResTypeList(rtRoom, "room");
-	readResTypeList(rtCostume, "costume");
-	readResTypeList(rtScript, "script");
-	readResTypeList(rtSound, "sound");
+	readResTypeList(rtRoom);
+	readResTypeList(rtCostume);
+	readResTypeList(rtScript);
+	readResTypeList(rtSound);
 
 	closeRoom();
 }
diff --git a/engines/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp
index c4dbc5039f..6b02494856 100644
--- a/engines/scumm/resource_v4.cpp
+++ b/engines/scumm/resource_v4.cpp
@@ -32,16 +32,16 @@ namespace Scumm {
 
 extern const char *resTypeFromId(int id);
 
-void ScummEngine_v4::readResTypeList(int id, const char *name) {
+void ScummEngine_v4::readResTypeList(int id) {
 	int num;
 	int i;
 
-	debug(9, "readResTypeList(%s,%s)", resTypeFromId(id), name);
+	debug(9, "readResTypeList(%s)", resTypeFromId(id));
 
 	num = _fileHandle->readUint16LE();
 
 	if (num != _res->num[id]) {
-		error("Invalid number of %ss (%d) in directory", name, num);
+		error("Invalid number of %ss (%d) in directory", resTypeFromId(id), num);
 	}
 
 	for (i = 0; i < num; i++) {
@@ -125,19 +125,19 @@ void ScummEngine_v4::readIndexFile() {
 			break;
 
 		case 0x5230:	// 'R0'
-			readResTypeList(rtRoom, "room");
+			readResTypeList(rtRoom);
 			break;
 
 		case 0x5330:	// 'S0'
-			readResTypeList(rtScript, "script");
+			readResTypeList(rtScript);
 			break;
 
 		case 0x4E30:	// 'N0'
-			readResTypeList(rtSound, "sound");
+			readResTypeList(rtSound);
 			break;
 
 		case 0x4330:	// 'C0'
-			readResTypeList(rtCostume, "costume");
+			readResTypeList(rtCostume);
 			break;
 
 		case 0x4F30:	// 'O0'
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 63786864e4..9b3429359a 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -737,7 +737,7 @@ protected:
 	bool openResourceFile(const Common::String &filename, byte encByte);	// TODO: Use Common::String
 
 	void loadPtrToResource(int type, int i, const byte *ptr);
-	virtual void readResTypeList(int id, const char *name);
+	virtual void readResTypeList(int id);
 //	void allocResTypeData(int id, uint32 tag, int num, const char *name, int mode);
 //	byte *createResource(int type, int index, uint32 size);
 	int loadResource(int type, int i);