libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 18:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't convert FSNode to a path when we don't have to

Browse Source 
svn-id: r25203
This commit is contained in:
Max Horn 2007-01-26 17:15:12 +00:00
parent 2e93a029b4
commit 7165d42c70
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/scumm/plugin.cpp
View File

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