[Scummvm-cvs-logs] SF.net SVN: scummvm: [25828] scummvm/trunk/engines/scumm
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Feb 24 20:29:40 CET 2007
Revision: 25828
http://scummvm.svn.sourceforge.net/scummvm/?rev=25828&view=rev
Author: fingolfin
Date: 2007-02-24 11:29:40 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
Removed the (useless, thanks to resTypeFromId) 'name' parameter from 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 2007-02-24 19:20:15 UTC (rev 25827)
+++ scummvm/trunk/engines/scumm/intern.h 2007-02-24 19:29:40 UTC (rev 25828)
@@ -214,7 +214,7 @@
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 @@
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();
Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp 2007-02-24 19:20:15 UTC (rev 25827)
+++ scummvm/trunk/engines/scumm/resource.cpp 2007-02-24 19:29:40 UTC (rev 25828)
@@ -367,7 +367,7 @@
break;
case MKID_BE('DRSC'): // Used by: COMI
- readResTypeList(rtRoomScripts, "room script");
+ readResTypeList(rtRoomScripts);
break;
default:
@@ -381,15 +381,15 @@
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 @@
switch (blocktype) {
case MKID_BE('DCHR'):
case MKID_BE('DIRF'):
- readResTypeList(rtCharset, "charset");
+ readResTypeList(rtCharset);
break;
case MKID_BE('DOBJ'):
@@ -460,17 +460,17 @@
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 @@
case MKID_BE('DIRN'):
case MKID_BE('DSOU'):
- readResTypeList(rtSound, "sound");
+ readResTypeList(rtSound);
break;
case MKID_BE('AARY'):
@@ -497,11 +497,11 @@
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 @@
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 @@
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);
Modified: scummvm/trunk/engines/scumm/resource_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v2.cpp 2007-02-24 19:20:15 UTC (rev 25827)
+++ scummvm/trunk/engines/scumm/resource_v2.cpp 2007-02-24 19:29:40 UTC (rev 25828)
@@ -144,10 +144,10 @@
_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() {
Modified: scummvm/trunk/engines/scumm/resource_v3.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v3.cpp 2007-02-24 19:20:15 UTC (rev 25827)
+++ scummvm/trunk/engines/scumm/resource_v3.cpp 2007-02-24 19:29:40 UTC (rev 25828)
@@ -31,16 +31,16 @@
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 @@
_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();
}
Modified: scummvm/trunk/engines/scumm/resource_v4.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v4.cpp 2007-02-24 19:20:15 UTC (rev 25827)
+++ scummvm/trunk/engines/scumm/resource_v4.cpp 2007-02-24 19:29:40 UTC (rev 25828)
@@ -32,16 +32,16 @@
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 @@
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'
Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h 2007-02-24 19:20:15 UTC (rev 25827)
+++ scummvm/trunk/engines/scumm/scumm.h 2007-02-24 19:29:40 UTC (rev 25828)
@@ -737,7 +737,7 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list