[Scummvm-cvs-logs] SF.net SVN: scummvm: [23558] scummvm/trunk/engines/sky
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Jul 22 16:51:06 CEST 2006
Revision: 23558
Author: lordhoto
Date: 2006-07-22 07:50:50 -0700 (Sat, 22 Jul 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23558&view=rev
Log Message:
-----------
Using FilesystemNode::name instead of FilesystemNode::displayName in all game detectors.
Modified Paths:
--------------
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/agi_v3.cpp
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/lure/lure.cpp
scummvm/trunk/engines/queen/queen.cpp
scummvm/trunk/engines/saga/game.cpp
scummvm/trunk/engines/scumm/plugin.cpp
scummvm/trunk/engines/simon/game.cpp
scummvm/trunk/engines/sky/sky.cpp
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/agi/agi.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -622,9 +622,9 @@
// Iterate over all files in the given directory
for (FSList::const_iterator file = fslist.begin();
file != fslist.end(); ++file) {
- const char *gameName = file->displayName().c_str();
+ const char *fileName = file->name().c_str();
- if (0 == scumm_stricmp(g->detectname, gameName)) {
+ if (0 == scumm_stricmp(g->detectname, fileName)) {
// Match found, add to list of candidates, then abort inner loop.
detectedGames.push_back(*g);
break;
Modified: scummvm/trunk/engines/agi/agi_v3.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi_v3.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/agi/agi_v3.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -67,7 +67,7 @@
for (FSList::const_iterator file = fslist.begin();
file != fslist.end() && !found; ++file) {
- Common::String f = file->displayName();
+ Common::String f = file->name();
f.toLowercase();
if (f.hasSuffix("vol.0")) {
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/cine/cine.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -99,9 +99,9 @@
// Iterate over all files in the given directory
for (FSList::const_iterator file = fslist.begin();
file != fslist.end(); ++file) {
- const char *gameName = file->displayName().c_str();
+ const char *fileName = file->name().c_str();
- if (0 == scumm_stricmp(g->detectname, gameName)) {
+ if (0 == scumm_stricmp(g->detectname, fileName)) {
// Match found, add to list of candidates, then abort inner loop.
detectedGames.push_back(*g);
break;
Modified: scummvm/trunk/engines/lure/lure.cpp
===================================================================
--- scummvm/trunk/engines/lure/lure.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/lure/lure.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -116,7 +116,7 @@
continue;
for (g = lure_games; g->gameid; g++) {
- if (scumm_stricmp(file->displayName().c_str(), g->checkFile) == 0)
+ if (scumm_stricmp(file->name().c_str(), g->checkFile) == 0)
isFound = true;
}
if (isFound)
Modified: scummvm/trunk/engines/queen/queen.cpp
===================================================================
--- scummvm/trunk/engines/queen/queen.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/queen/queen.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -92,16 +92,16 @@
// Iterate over all files in the given directory
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
if (!file->isDirectory()) {
- const char *gameName = file->displayName().c_str();
+ const char *fileName = file->name().c_str();
- if (0 == scumm_stricmp("queen.1", gameName) || 0 == scumm_stricmp("queen.1c", gameName)) {
+ if (0 == scumm_stricmp("queen.1", fileName) || 0 == scumm_stricmp("queen.1c", fileName)) {
Common::File dataFile;
- dataFile.open(file->path());
+ dataFile.open(*file);
assert(dataFile.isOpen());
- if (0 == scumm_stricmp("queen.1", gameName)) { //an unmodified file
+ if (0 == scumm_stricmp("queen.1", fileName)) { //an unmodified file
detectedGames.push_back(determineTarget(dataFile.size()));
- } else if (0 == scumm_stricmp("queen.1c", gameName)) { //oh joy, it's a rebuilt file
+ } else if (0 == scumm_stricmp("queen.1c", fileName)) { //oh joy, it's a rebuilt file
char header[9];
dataFile.read(header, 9);
if (0 == scumm_strnicmp("QTBL", header, 4)) { //check validity
Modified: scummvm/trunk/engines/saga/game.cpp
===================================================================
--- scummvm/trunk/engines/saga/game.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/saga/game.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -127,7 +127,7 @@
if (fslist != NULL) {
for (FSList::const_iterator file = fslist->begin(); file != fslist->end(); ++file) {
if (file->isDirectory()) continue;
- tstr = file->displayName();
+ tstr = file->name();
tstr.toLowercase();
if (!filesList.contains(tstr)) continue;
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/scumm/plugin.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -926,7 +926,7 @@
DetectorDesc d;
d.path = file->path();
d.md5Entry = 0;
- fileMD5Map[file->displayName()] = d;
+ fileMD5Map[file->name()] = d;
}
}
Modified: scummvm/trunk/engines/simon/game.cpp
===================================================================
--- scummvm/trunk/engines/simon/game.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/simon/game.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -1380,7 +1380,7 @@
if (fslist != NULL) {
for (FSList::const_iterator file = fslist->begin(); file != fslist->end(); ++file) {
if (file->isDirectory()) continue;
- tstr = file->displayName();
+ tstr = file->name();
tstr.toLowercase();
tstr2 = tstr + ".";
Modified: scummvm/trunk/engines/sky/sky.cpp
===================================================================
--- scummvm/trunk/engines/sky/sky.cpp 2006-07-22 14:39:54 UTC (rev 23557)
+++ scummvm/trunk/engines/sky/sky.cpp 2006-07-22 14:50:50 UTC (rev 23558)
@@ -95,7 +95,7 @@
// Iterate over all files in the given directory
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
if (!file->isDirectory()) {
- const char *fileName = file->displayName().c_str();
+ const char *fileName = file->name().c_str();
if (0 == scumm_stricmp("sky.dsk", fileName)) {
// Match found, add to list of candidates, then abort inner loop.
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