aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-01-26 17:15:12 +0000
committerMax Horn2007-01-26 17:15:12 +0000
commit7165d42c70c644a24c70e43a80301a8f38ddd8bc (patch)
treef832b5d2666ceeff48886c46303e42994e9d4a9a
parent2e93a029b4cbd4a97f293b957ea174b95b45e896 (diff)
downloadscummvm-rg350-7165d42c70c644a24c70e43a80301a8f38ddd8bc.tar.gz
scummvm-rg350-7165d42c70c644a24c70e43a80301a8f38ddd8bc.tar.bz2
scummvm-rg350-7165d42c70c644a24c70e43a80301a8f38ddd8bc.zip
Don't convert FSNode to a path when we don't have to
svn-id: r25203
-rw-r--r--engines/scumm/plugin.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index 14aa3f437c..c01a7793dc 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -965,7 +965,7 @@ static Common::String generateFilenameForDetection(const GameFilenamePattern &gf
}
struct DetectorDesc {
- Common::String path;
+ FilesystemNode node;
Common::String md5;
uint8 md5sum[16];
const MD5Table *md5Entry; // Entry of the md5 table corresponding to this file, if any.
@@ -983,7 +983,7 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
if (!file->isDirectory()) {
DetectorDesc d;
- d.path = file->path();
+ d.node = *file;
d.md5Entry = 0;
fileMD5Map[file->name()] = d;
}
@@ -1031,7 +1031,7 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu
DetectorDesc &d = fileMD5Map[file];
if (d.md5.empty()) {
uint8 md5sum[16];
- if (Common::md5_file(d.path.c_str(), md5sum, kMD5FileSizeLimit)) {
+ if (Common::md5_file(d.node, md5sum, kMD5FileSizeLimit)) {
char md5str[32+1];
for (int j = 0; j < 16; j++) {
sprintf(md5str + j*2, "%02x", (int)md5sum[j]);
@@ -1150,8 +1150,8 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com
// try to filter out some cases.
Common::File tmp;
- if (!tmp.open(d.path.c_str())) {
- warning("SCUMM detectGames: failed to open '%s' for read access", d.path.c_str());
+ if (!tmp.open(d.node)) {
+ warning("SCUMM detectGames: failed to open '%s' for read access", d.node.path().c_str());
return false;
}