mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-15 18:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Better (less) debug output

Browse Source
This commit is contained in:
Alexander "Ace" Olofsson 2012-03-31 00:54:49 +02:00
parent 8d9100c77b
commit 8e07b7e050
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/bsa/bsa_archive.cpp
View File

@ -101,37 +101,34 @@ class DirArchive: public Ogre::FileSystemArchive
delimiter = lastSlash+1; delimiter = lastSlash+1;
} }
std::cout << "Finding: " << copy;
std::vector<std::string> current; std::vector<std::string> current;
{ {
std::map<std::string,std::vector<std::string>,ciLessBoost>::const_iterator found = m.find(folder); std::map<std::string,std::vector<std::string>,ciLessBoost>::const_iterator found = m.find(folder);
if (found == m.end()) if (found == m.end())
{ {
std::cout << " failed, couldn't find folder." << std::endl;
return false; return false;
} }
else else
current = found->second; current = found->second;
} }
std::cout << "Finding: " << copy;
pathComparer comp(delimiter, copy.size() - delimiter-1); pathComparer comp(delimiter, copy.size() - delimiter-1);
std::vector<std::string>::iterator find = std::lower_bound(current.begin(), current.end(), copy, comp); std::vector<std::string>::iterator find = std::lower_bound(current.begin(), current.end(), copy, comp);
if (find != current.end() && !comp(copy, current.front())) if (find != current.end() && !comp(copy, current.front()))
{ {
std::cout << " found"; std::cout << " found";
if (copy != *find) if (copy != *find && !lexicographical_compare(copy, *find, boost::algorithm::is_iless()))
if (lexicographical_compare(copy, *find, boost::algorithm::is_iless())) std::cout << ", as different file " << *find;
std::cout << " case folded to " << *find << std::endl;
else
std::cout << " as different file " << *find << std::endl;
std::cout << "." << std::endl;
copy = *find; copy = *find;
return true; return true;
} }
std::cout << " failed, couldn't find file." << std::endl; std::cout << " failed." << std::endl;
return false; return false;
} }