[Scummvm-cvs-logs] CVS: scummvm/queen resource.cpp,1.44,1.45
Max Horn
fingolfin at users.sourceforge.net
Sun Jun 27 15:15:15 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.56,1.57
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.65,1.66 script_v6he.cpp,2.69,2.70 resource.cpp,1.224,1.225 debugger.cpp,1.123,1.124
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19289/queen
Modified Files:
resource.cpp
Log Message:
Reversed param order of File::open() -- this allowed me to get rid of a few more getGameDataPath() calls
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- resource.cpp 17 Mar 2004 14:10:51 -0000 1.44
+++ resource.cpp 27 Jun 2004 22:14:33 -0000 1.45
@@ -143,7 +143,7 @@
}
bool Resource::findNormalVersion() {
- _resourceFile->open("queen.1", _datafilePath);
+ _resourceFile->open("queen.1");
if (!_resourceFile->isOpen()) {
return false;
}
@@ -170,7 +170,7 @@
}
bool Resource::findCompressedVersion() {
- _resourceFile->open("queen.1c", _datafilePath);
+ _resourceFile->open("queen.1c");
if (!_resourceFile->isOpen()) {
return false;
}
@@ -215,9 +215,9 @@
bool Resource::readTableFile(const GameVersion *gameVersion) {
File tableFile;
- tableFile.open(_tableFilename, _datafilePath);
+ tableFile.open(_tableFilename);
if (!tableFile.isOpen())
- tableFile.open(_tableFilename, ""); // try current directory
+ tableFile.open(_tableFilename, File::kFileReadMode, ""); // try current directory
if (tableFile.isOpen() && tableFile.readUint32BE() == 'QTBL') {
if (tableFile.readUint32BE() != CURRENT_TBL_VERSION)
warning("Incorrect version of queen.tbl, please update it");
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.56,1.57
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.65,1.66 script_v6he.cpp,2.69,2.70 resource.cpp,1.224,1.225 debugger.cpp,1.123,1.124
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list