[Scummvm-cvs-logs] scummvm master -> 67ce244567c8962d2a7f2a799966ad997f7b7881

lordhoto lordhoto at gmail.com
Sat Nov 23 21:02:46 CET 2013


This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
29fae3914e WINTERMUTE: Remove unused variables.
9a78ac265d WINTERMUTE: Make BaseFileManager::registerPackages case agnostic.
5166fce2eb WINTERMUTE: Remove another unused variable.
7409f3eb54 WINTERMUTE: Slight interator usage cleanup.
67ce244567 WINTERMUTE: Use const_iterator in BaseFileManager::registerPackages.


Commit: 29fae3914eff2f4db830f2cc4ade5076d6e7e04f
    https://github.com/scummvm/scummvm/commit/29fae3914eff2f4db830f2cc4ade5076d6e7e04f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-23T11:45:13-08:00

Commit Message:
WINTERMUTE: Remove unused variables.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index ae4c891..3b7eabd 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -216,8 +216,6 @@ bool BaseFileManager::registerPackages() {
 			// Avoid registering all the language files
 			// TODO: Select based on the gameDesc.
 			if (_language != Common::UNK_LANG && (fileIt->getParent().getName() == "language" || fileIt->getParent().getName() == "languages")) {
-				Common::String parentName = fileIt->getParent().getName();
-				Common::String dcpName = fileIt->getName();
 				// English
 				if (_language == Common::EN_ANY && (fileIt->getName() != "english.dcp" && fileIt->getName() != "xlanguage_en.dcp")) {
 					continue;


Commit: 9a78ac265dfaf135183ac84a1fe91c8ef724d6cb
    https://github.com/scummvm/scummvm/commit/9a78ac265dfaf135183ac84a1fe91c8ef724d6cb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-23T12:00:33-08:00

Commit Message:
WINTERMUTE: Make BaseFileManager::registerPackages case agnostic.

The old version did only work as expected when all the filenames were all
lowercase. This seems to be the case for most (or even all?) WME games.
However, we are better safe than sorry and make the code case agnostic.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 3b7eabd..10b340c 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -204,44 +204,56 @@ bool BaseFileManager::registerPackages() {
 			warning("getChildren() failed for path: %s", (*it).getDisplayName().c_str());
 		}
 		for (Common::FSList::iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt) {
-			if (!fileIt->getName().hasSuffix(".dcp")) {
+			// To prevent any case sensitivity issues we make the filename
+			// all lowercase here. This makes the code slightly prettier
+			// than the equivalent of using equalsIgnoreCase.
+			Common::String fileName = fileIt->getName();
+			fileName.toLowercase();
+
+			if (!fileName.hasSuffix(".dcp")) {
 				continue;
 			}
 			// HACK: for Reversion1, avoid loading xlanguage_pt.dcp from the main folder:
 			if (_language != Common::PT_BRA && targetName.hasPrefix("reversion1")) {
-				if (fileIt->getName() == "xlanguage_pt.dcp") {
+				if (fileName == "xlanguage_pt.dcp") {
 					continue;
 				}
 			}
+
+			// Again, make the parent's name all lowercase to avoid any case
+			// issues.
+			Common::String parentName = fileIt->getParent().getName();
+			parentName.toLowercase();
+
 			// Avoid registering all the language files
 			// TODO: Select based on the gameDesc.
-			if (_language != Common::UNK_LANG && (fileIt->getParent().getName() == "language" || fileIt->getParent().getName() == "languages")) {
+			if (_language != Common::UNK_LANG && (parentName == "language" || parentName == "languages")) {
 				// English
-				if (_language == Common::EN_ANY && (fileIt->getName() != "english.dcp" && fileIt->getName() != "xlanguage_en.dcp")) {
+				if (_language == Common::EN_ANY && (fileName != "english.dcp" && fileName != "xlanguage_en.dcp")) {
 					continue;
 				// Chinese
-				} else if (_language == Common::ZH_CNA && (fileIt->getName() != "chinese.dcp" && fileIt->getName() != "xlanguage_nz.dcp")) {
+				} else if (_language == Common::ZH_CNA && (fileName != "chinese.dcp" && fileName != "xlanguage_nz.dcp")) {
 					continue;
 				// Czech
-				} else if (_language == Common::CZ_CZE && (fileIt->getName() != "czech.dcp" && fileIt->getName() != "xlanguage_cz.dcp")) {
+				} else if (_language == Common::CZ_CZE && (fileName != "czech.dcp" && fileName != "xlanguage_cz.dcp")) {
 					continue;
 				// French
-				} else if (_language == Common::FR_FRA && (fileIt->getName() != "french.dcp" && fileIt->getName() != "xlanguage_fr.dcp")) {
+				} else if (_language == Common::FR_FRA && (fileName != "french.dcp" && fileName != "xlanguage_fr.dcp")) {
 					continue;
 				// German
-				} else if (_language == Common::DE_DEU && (fileIt->getName() != "german.dcp" && fileIt->getName() != "xlanguage_de.dcp")) {
+				} else if (_language == Common::DE_DEU && (fileName != "german.dcp" && fileName != "xlanguage_de.dcp")) {
 					continue;
 				// Italian
-				} else if (_language == Common::IT_ITA && (fileIt->getName() != "italian.dcp" && fileIt->getName() != "xlanguage_it.dcp")) {
+				} else if (_language == Common::IT_ITA && (fileName != "italian.dcp" && fileName != "xlanguage_it.dcp")) {
 					continue;
 				// Polish
-				} else if (_language == Common::PL_POL && (fileIt->getName() != "polish.dcp" && fileIt->getName() != "xlanguage_po.dcp")) {
+				} else if (_language == Common::PL_POL && (fileName != "polish.dcp" && fileName != "xlanguage_po.dcp")) {
 					continue;
 				// Portuguese
-				} else if (_language == Common::PT_BRA && (fileIt->getName() != "portuguese.dcp" && fileIt->getName() != "xlanguage_pt.dcp")) {
+				} else if (_language == Common::PT_BRA && (fileName != "portuguese.dcp" && fileName != "xlanguage_pt.dcp")) {
 					continue;
 				// Russian
-				} else if (_language == Common::RU_RUS && (fileIt->getName() != "russian.dcp" && fileIt->getName() != "xlanguage_ru.dcp")) {
+				} else if (_language == Common::RU_RUS && (fileName != "russian.dcp" && fileName != "xlanguage_ru.dcp")) {
 					continue;
 				}
 			}


Commit: 5166fce2eb49a1f9b92471d27d7f7d03a920bc9c
    https://github.com/scummvm/scummvm/commit/5166fce2eb49a1f9b92471d27d7f7d03a920bc9c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-23T12:00:39-08:00

Commit Message:
WINTERMUTE: Remove another unused variable.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 10b340c..dbf7e24 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -291,8 +291,6 @@ Common::SeekableReadStream *BaseFileManager::openPkgFile(const Common::String &f
 	Common::String upcName = filename;
 	upcName.toUppercase();
 	Common::SeekableReadStream *file = nullptr;
-	char fileName[MAX_PATH_LENGTH];
-	Common::strlcpy(fileName, upcName.c_str(), MAX_PATH_LENGTH);
 
 	// correct slashes
 	for (uint32 i = 0; i < upcName.size(); i++) {


Commit: 7409f3eb54de2959d661acd890e1a7452c0e7edc
    https://github.com/scummvm/scummvm/commit/7409f3eb54de2959d661acd890e1a7452c0e7edc
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-23T12:00:39-08:00

Commit Message:
WINTERMUTE: Slight interator usage cleanup.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index dbf7e24..b97745b 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -178,10 +178,10 @@ bool BaseFileManager::initPaths() {
 
 bool BaseFileManager::registerPackages(const Common::FSList &fslist) {
 	for (Common::FSList::const_iterator it = fslist.begin(); it != fslist.end(); ++it) {
-		debugC(kWintermuteDebugFileAccess, "Adding %s", (*it).getName().c_str());
-		if ((*it).getName().contains(".dcp")) {
-			if (registerPackage((*it))) {
-				addPath(PATH_PACKAGE, (*it));
+		debugC(kWintermuteDebugFileAccess, "Adding %s", it->getName().c_str());
+		if (it->getName().contains(".dcp")) {
+			if (registerPackage(*it)) {
+				addPath(PATH_PACKAGE, *it);
 			}
 		}
 	}
@@ -199,9 +199,9 @@ bool BaseFileManager::registerPackages() {
 	// and that has to be like that to support the detection-scheme.
 	Common::FSList files;
 	for (Common::FSList::iterator it = _packagePaths.begin(); it != _packagePaths.end(); ++it) {
-		debugC(kWintermuteDebugFileAccess, "Should register folder: %s %s", (*it).getPath().c_str(), (*it).getName().c_str());
-		if (!(*it).getChildren(files, Common::FSNode::kListFilesOnly)) {
-			warning("getChildren() failed for path: %s", (*it).getDisplayName().c_str());
+		debugC(kWintermuteDebugFileAccess, "Should register folder: %s %s", it->getPath().c_str(), it->getName().c_str());
+		if (!it->getChildren(files, Common::FSNode::kListFilesOnly)) {
+			warning("getChildren() failed for path: %s", it->getDisplayName().c_str());
 		}
 		for (Common::FSList::iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt) {
 			// To prevent any case sensitivity issues we make the filename
@@ -257,7 +257,7 @@ bool BaseFileManager::registerPackages() {
 					continue;
 				}
 			}
-			debugC(kWintermuteDebugFileAccess, "Registering %s %s", (*fileIt).getPath().c_str(), (*fileIt).getName().c_str());
+			debugC(kWintermuteDebugFileAccess, "Registering %s %s", fileIt->getPath().c_str(), fileIt->getName().c_str());
 			registerPackage((*fileIt));
 		}
 	}


Commit: 67ce244567c8962d2a7f2a799966ad997f7b7881
    https://github.com/scummvm/scummvm/commit/67ce244567c8962d2a7f2a799966ad997f7b7881
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-23T12:01:39-08:00

Commit Message:
WINTERMUTE: Use const_iterator in BaseFileManager::registerPackages.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index b97745b..286f83d 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -198,12 +198,12 @@ bool BaseFileManager::registerPackages() {
 	// Register without using SearchMan, as otherwise the FSNode-based lookup in openPackage will fail
 	// and that has to be like that to support the detection-scheme.
 	Common::FSList files;
-	for (Common::FSList::iterator it = _packagePaths.begin(); it != _packagePaths.end(); ++it) {
+	for (Common::FSList::const_iterator it = _packagePaths.begin(); it != _packagePaths.end(); ++it) {
 		debugC(kWintermuteDebugFileAccess, "Should register folder: %s %s", it->getPath().c_str(), it->getName().c_str());
 		if (!it->getChildren(files, Common::FSNode::kListFilesOnly)) {
 			warning("getChildren() failed for path: %s", it->getDisplayName().c_str());
 		}
-		for (Common::FSList::iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt) {
+		for (Common::FSList::const_iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt) {
 			// To prevent any case sensitivity issues we make the filename
 			// all lowercase here. This makes the code slightly prettier
 			// than the equivalent of using equalsIgnoreCase.






More information about the Scummvm-git-logs mailing list