krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Debug-b-gone

Browse source
This commit is contained in:
Alexander "Ace" Olofsson 2012-03-31 11:29:24 +02:00
parent 06a34b9e0d
commit 3b0dc408ae
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/bsa/bsa_archive.cpp
View file

@ -71,9 +71,6 @@ class DirArchive: public Ogre::FileSystemArchive
bool findFile(const String& filename, std::string& copy) const bool findFile(const String& filename, std::string& copy) const
{ {
if (filename.find(".tga") != std::string::npos)
return false;
{ {
String passed = filename; String passed = filename;
if(filename.at(filename.length() - 1) == '*' || filename.at(filename.length() - 1) == '?' || filename.at(filename.length() - 1) == '<' if(filename.at(filename.length() - 1) == '*' || filename.at(filename.length() - 1) == '?' || filename.at(filename.length() - 1) == '<'
@ -116,22 +113,14 @@ class DirArchive: public Ogre::FileSystemArchive
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";
if (copy != *find && !lexicographical_compare(copy, *find, boost::algorithm::is_iequal()))
std::cout << ", as different file " << *find;
std::cout << "." << std::endl;
copy = *find; copy = *find;
return true; return true;
} }
std::cout << " failed." << std::endl;
return false; return false;
} }