diff options
| author | Johannes Schickel | 2013-11-23 20:59:01 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2013-11-23 21:00:39 +0100 |
| commit | 7409f3eb54de2959d661acd890e1a7452c0e7edc (patch) | |
| tree | 5fcc5064e7f3610c5645cecdeca54e9d2f406691 | |
| parent | 5166fce2eb49a1f9b92471d27d7f7d03a920bc9c (diff) | |
| download | scummvm-rg350-7409f3eb54de2959d661acd890e1a7452c0e7edc.tar.gz scummvm-rg350-7409f3eb54de2959d661acd890e1a7452c0e7edc.tar.bz2 scummvm-rg350-7409f3eb54de2959d661acd890e1a7452c0e7edc.zip | |
WINTERMUTE: Slight interator usage cleanup.
| -rw-r--r-- | engines/wintermute/base/base_file_manager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index dbf7e24927..b97745b5ad 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)); } } |