libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-17 23:44:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Got rid of the 'tag' parameter for readResTypeList()

Browse Source 
svn-id: r20864
This commit is contained in:
Max Horn 2006-02-25 02:22:17 +00:00
parent 6914121f61
commit 87fd6957ac
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/scumm/intern.h
View File

@ -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();

22
engines/scumm/resource.cpp
View File

@ -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();

8
engines/scumm/resource_v2.cpp
View File

@ -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() {

12
engines/scumm/resource_v3.cpp
View File

@ -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();
}

8
engines/scumm/resource_v4.cpp
View File

@ -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'

2
engines/scumm/scumm.h
View File

@ -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);