[Scummvm-cvs-logs] SF.net SVN: scummvm: [20864] scummvm/trunk/engines/scumm
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Feb 24 18:23:04 CET 2006
Revision: 20864
Author: fingolfin
Date: 2006-02-24 18:22:17 -0800 (Fri, 24 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20864&view=rev
Log Message:
-----------
Got rid of the 'tag' parameter for readResTypeList()
Modified Paths:
--------------
scummvm/trunk/engines/scumm/intern.h
scummvm/trunk/engines/scumm/resource.cpp
scummvm/trunk/engines/scumm/resource_v2.cpp
scummvm/trunk/engines/scumm/resource_v3.cpp
scummvm/trunk/engines/scumm/resource_v4.cpp
scummvm/trunk/engines/scumm/scumm.h
Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h 2006-02-25 02:15:46 UTC (rev 20863)
+++ scummvm/trunk/engines/scumm/intern.h 2006-02-25 02:22:17 UTC (rev 20864)
@@ -225,7 +225,7 @@
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();
Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp 2006-02-25 02:15:46 UTC (rev 20863)
+++ scummvm/trunk/engines/scumm/resource.cpp 2006-02-25 02:22:17 UTC (rev 20864)
@@ -450,7 +450,7 @@
break;
case MKID_BE('DRSC'): // Used by: COMI
- readResTypeList(rtRoomScripts, MKID('RMSC'), "room script");
+ readResTypeList(rtRoomScripts, "room script");
break;
default:
@@ -464,15 +464,15 @@
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 @@
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 @@
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 @@
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 @@
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();
Modified: scummvm/trunk/engines/scumm/resource_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v2.cpp 2006-02-25 02:15:46 UTC (rev 20863)
+++ scummvm/trunk/engines/scumm/resource_v2.cpp 2006-02-25 02:22:17 UTC (rev 20864)
@@ -144,10 +144,10 @@
_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() {
Modified: scummvm/trunk/engines/scumm/resource_v3.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v3.cpp 2006-02-25 02:15:46 UTC (rev 20863)
+++ scummvm/trunk/engines/scumm/resource_v3.cpp 2006-02-25 02:22:17 UTC (rev 20864)
@@ -30,11 +30,11 @@
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 @@
_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();
}
Modified: scummvm/trunk/engines/scumm/resource_v4.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v4.cpp 2006-02-25 02:15:46 UTC (rev 20863)
+++ scummvm/trunk/engines/scumm/resource_v4.cpp 2006-02-25 02:22:17 UTC (rev 20864)
@@ -100,19 +100,19 @@
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'
Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h 2006-02-25 02:15:46 UTC (rev 20863)
+++ scummvm/trunk/engines/scumm/scumm.h 2006-02-25 02:22:17 UTC (rev 20864)
@@ -745,7 +745,7 @@
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);
More information about the Scummvm-git-logs
mailing list