aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/scumm/intern.h2
-rw-r--r--engines/scumm/resource.cpp22
-rw-r--r--engines/scumm/resource_v2.cpp8
-rw-r--r--engines/scumm/resource_v3.cpp12
-rw-r--r--engines/scumm/resource_v4.cpp8
-rw-r--r--engines/scumm/scumm.h2
6 files changed, 27 insertions, 27 deletions
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index fae915a037..3ba63cbd3f 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -225,7 +225,7 @@ public:
ScummEngine_v3old(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
protected:
- virtual void readResTypeList(int id, uint32 tag, const char *name);
+ virtual void readResTypeList(int id, const char *name);
virtual void readIndexFile();
virtual void loadRoomSubBlocks();
virtual void initRoomSubBlocks();
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 2d088f5abd..fe41d6eed8 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -450,7 +450,7 @@ void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) {
break;
case MKID_BE('DRSC'): // Used by: COMI
- readResTypeList(rtRoomScripts, MKID('RMSC'), "room script");
+ readResTypeList(rtRoomScripts, "room script");
break;
default:
@@ -464,15 +464,15 @@ void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) {
int i;
switch (blocktype) {
case MKID_BE('DIRI'):
- readResTypeList(rtRoomImage, MKID('RMIM'), "room image");
+ readResTypeList(rtRoomImage, "room image");
break;
case MKID_BE('DIRM'):
- readResTypeList(rtImage, MKID('AWIZ'), "images");
+ readResTypeList(rtImage, "images");
break;
case MKID_BE('DIRT'):
- readResTypeList(rtTalkie, MKID('TLKE'), "talkie");
+ readResTypeList(rtTalkie, "talkie");
break;
case MKID_BE('DLFL'):
@@ -509,7 +509,7 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
switch (blocktype) {
case MKID_BE('DCHR'):
case MKID_BE('DIRF'):
- readResTypeList(rtCharset, MKID('CHAR'), "charset");
+ readResTypeList(rtCharset, "charset");
break;
case MKID_BE('DOBJ'):
@@ -543,17 +543,17 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
case MKID_BE('DROO'):
case MKID_BE('DIRR'):
- readResTypeList(rtRoom, MKID('ROOM'), "room");
+ readResTypeList(rtRoom, "room");
break;
case MKID_BE('DSCR'):
case MKID_BE('DIRS'):
- readResTypeList(rtScript, MKID('SCRP'), "script");
+ readResTypeList(rtScript, "script");
break;
case MKID_BE('DCOS'):
case MKID_BE('DIRC'):
- readResTypeList(rtCostume, MKID('COST'), "costume");
+ readResTypeList(rtCostume, "costume");
break;
case MKID_BE('MAXS'):
@@ -563,7 +563,7 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
case MKID_BE('DIRN'):
case MKID_BE('DSOU'):
- readResTypeList(rtSound, MKID('SOUN'), "sound");
+ readResTypeList(rtSound, "sound");
break;
case MKID_BE('AARY'):
@@ -580,11 +580,11 @@ void ScummEngine::readArrayFromIndexFile() {
error("readArrayFromIndexFile() not supported in pre-V6 games");
}
-void ScummEngine::readResTypeList(int id, uint32 tag, const char *name) {
+void ScummEngine::readResTypeList(int id, const char *name) {
int num;
int i;
- debug(9, "readResTypeList(%s,%s,%s)", resTypeFromId(id), tag2str(TO_BE_32(tag)), name);
+ debug(9, "readResTypeList(%s,%s)", resTypeFromId(id), name);
if (_game.version == 8)
num = _fileHandle->readUint32LE();
diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp
index 7d951d2408..01abe07944 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, MKID('ROOM'), "room");
- readResTypeList(rtCostume, MKID('COST'), "costume");
- readResTypeList(rtScript, MKID('SCRP'), "script");
- readResTypeList(rtSound, MKID('SOUN'), "sound");
+ readResTypeList(rtRoom, "room");
+ readResTypeList(rtCostume, "costume");
+ readResTypeList(rtScript, "script");
+ readResTypeList(rtSound, "sound");
}
void ScummEngine_v2::readGlobalObjects() {
diff --git a/engines/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp
index 510f106550..21c42b0137 100644
--- a/engines/scumm/resource_v3.cpp
+++ b/engines/scumm/resource_v3.cpp
@@ -30,11 +30,11 @@ namespace Scumm {
extern const char *resTypeFromId(int id);
-void ScummEngine_v3old::readResTypeList(int id, uint32 tag, const char *name) {
+void ScummEngine_v3old::readResTypeList(int id, const char *name) {
int num;
int i;
- debug(9, "readResTypeList(%s,%s,%s)", resTypeFromId(id), tag2str(TO_BE_32(tag)), name);
+ debug(9, "readResTypeList(%s,%s)", resTypeFromId(id), name);
num = _fileHandle->readByte();
@@ -86,10 +86,10 @@ void ScummEngine_v3old::readIndexFile() {
_fileHandle->readUint16LE(); /* version magic number */
readGlobalObjects();
- readResTypeList(rtRoom, MKID('ROOM'), "room");
- readResTypeList(rtCostume, MKID('COST'), "costume");
- readResTypeList(rtScript, MKID('SCRP'), "script");
- readResTypeList(rtSound, MKID('SOUN'), "sound");
+ readResTypeList(rtRoom, "room");
+ readResTypeList(rtCostume, "costume");
+ readResTypeList(rtScript, "script");
+ readResTypeList(rtSound, "sound");
closeRoom();
}
diff --git a/engines/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp
index b99cfe209b..24b13c1b60 100644
--- a/engines/scumm/resource_v4.cpp
+++ b/engines/scumm/resource_v4.cpp
@@ -100,19 +100,19 @@ void ScummEngine_v4::readIndexFile() {
break;
case 0x5230: // 'R0'
- readResTypeList(rtRoom, MKID('ROOM'), "room");
+ readResTypeList(rtRoom, "room");
break;
case 0x5330: // 'S0'
- readResTypeList(rtScript, MKID('SCRP'), "script");
+ readResTypeList(rtScript, "script");
break;
case 0x4E30: // 'N0'
- readResTypeList(rtSound, MKID('SOUN'), "sound");
+ readResTypeList(rtSound, "sound");
break;
case 0x4330: // 'C0'
- readResTypeList(rtCostume, MKID('COST'), "costume");
+ readResTypeList(rtCostume, "costume");
break;
case 0x4F30: // 'O0'
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 9dd0135d1a..0a26d0689a 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -745,7 +745,7 @@ protected:
bool openResourceFile(const char *filename, byte encByte);
void loadPtrToResource(int type, int i, const byte *ptr);
- virtual void readResTypeList(int id, uint32 tag, const char *name);
+ virtual void readResTypeList(int id, const char *name);
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 23:26:33 +0000