mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'werdanith/searchfix'

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-03-15 16:54:29 +01:00
commit a7211d2a90
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwsound/soundmanager.cpp
View File

@ -136,7 +136,7 @@ namespace MWSound
max = std::max(min, max); max = std::max(min, max);
} }
return Files::FileListLocator(mSoundFiles, snd->sound, mFSStrict, true); return Files::FileListLocator(mSoundFiles, snd->sound, mFSStrict, false);
} }
// Add a sound to the list and play it // Add a sound to the list and play it

13
components/files/fileops.cpp
View File

@ -13,6 +13,14 @@ bool isFile(const char *name)
return boost::filesystem::exists(boost::filesystem::path(name)); return boost::filesystem::exists(boost::filesystem::path(name));
} }
// Returns true if the last part of the superset matches the subset
bool endingMatches(const std::string& superset, const std::string& subset)
{
if (subset.length() > superset.length())
return false;
return superset.substr(superset.length() - subset.length()) == subset;
}
// Makes a list of files from a directory // Makes a list of files from a directory
void FileLister( boost::filesystem::path currentPath, Files::PathContainer& list, bool recursive) void FileLister( boost::filesystem::path currentPath, Files::PathContainer& list, bool recursive)
{ {
@ -85,11 +93,14 @@ bool isFile(const char *name)
for (Files::PathContainer::const_iterator it = list.begin(); it != list.end(); ++it) for (Files::PathContainer::const_iterator it = list.begin(); it != list.end(); ++it)
{ {
fullPath = it->string(); fullPath = it->string();
if (ignoreExtensions)
fullPath.erase(fullPath.length() - it->extension().string().length());
if (!strict) if (!strict)
{ {
boost::algorithm::to_lower(fullPath); boost::algorithm::to_lower(fullPath);
} }
if(fullPath.find(toFindStr) != std::string::npos) if(endingMatches(fullPath, toFindStr))
{ {
result = *it; result = *it;
break; break;