Using FilesystemNode::name instead of FilesystemNode::displayName in all game detectors.

svn-id: r23558

9 files changed, 15 insertions, 15 deletions

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 2bac87a1de..c4b6f59ca1 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -622,9 +622,9 @@ DetectedGameList Engine_AGI_detectGames(const FSList &fslist) {
 		// 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;
diff --git a/engines/agi/agi_v3.cpp b/engines/agi/agi_v3.cpp
index 70ca92e868..e207ad88bc 100644
--- a/engines/agi/agi_v3.cpp
+++ b/engines/agi/agi_v3.cpp
@@ -67,7 +67,7 @@ int agi_v3_detect_game() {
 
 	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")) {
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 2245afa227..57f16e7002 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -99,9 +99,9 @@ DetectedGameList Engine_CINE_detectGames(const FSList &fslist) {
 		// 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;
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 4bf673551a..195d90b86e 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -116,7 +116,7 @@ DetectedGameList Engine_LURE_detectGames(const FSList &fslist) {
 			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)
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 2077fd1922..fd46351370 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -92,16 +92,16 @@ DetectedGameList Engine_QUEEN_detectGames(const FSList &fslist) {
 	// 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
diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp
index 4ce00761c7..5b917ea833 100644
--- a/engines/saga/game.cpp
+++ b/engines/saga/game.cpp
@@ -127,7 +127,7 @@ static int detectGame(const FSList *fslist, Common::Language language, Common::P
 	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;
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index ffb19d7650..ddfc436ffe 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -926,7 +926,7 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu
 			DetectorDesc d;
 			d.path = file->path();
 			d.md5Entry = 0;
-			fileMD5Map[file->displayName()] = d;
+			fileMD5Map[file->name()] = d;
 		}
 	}
 
diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp
index e6e4f74cb2..75f5d33799 100644
--- a/engines/simon/game.cpp
+++ b/engines/simon/game.cpp
@@ -1380,7 +1380,7 @@ static int detectGame(const FSList *fslist, Common::Language language, Common::P
 	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 + ".";
 
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 9e589bf498..c04af74794 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -95,7 +95,7 @@ DetectedGameList Engine_SKY_detectGames(const FSList &fslist) {
 	// 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.