mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 14:15:34 +00:00
Code Issues Releases Wiki Activity

Files::Collections: prefer files from highest priority folders

Browse source
This commit is contained in:
Alexei Kotov 2023-02-11 01:25:00 +03:00
parent 5eba755174
commit 536370c76d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -34,6 +34,7 @@
Bug #7054: Quests aren't sorted by name Bug #7054: Quests aren't sorted by name
Bug #7084: Resurrecting an actor doesn't take into account base record changes Bug #7084: Resurrecting an actor doesn't take into account base record changes
Bug #7088: Deleting last save game of last character doesn't clear character name/details Bug #7088: Deleting last save game of last character doesn't clear character name/details
Bug #7092: BSA archives from higher priority directories don't take priority
Bug #7122: Teleportation to underwater should cancel active water walking effect Bug #7122: Teleportation to underwater should cancel active water walking effect
Bug #7172: Current music playlist continues playing indefinitely if next playlist is empty Bug #7172: Current music playlist continues playing indefinitely if next playlist is empty
Feature #5492: Let rain and snow collide with statics Feature #5492: Let rain and snow collide with statics

8
components/files/collections.cpp
View file

@ -37,9 +37,9 @@ namespace Files
std::filesystem::path Collections::getPath(const std::string& file) const std::filesystem::path Collections::getPath(const std::string& file) const
{ {
for (const auto& mDirectorie : mDirectories) for (auto iter = mDirectories.rbegin(); iter != mDirectories.rend(); iter++)
{ {
for (const auto& iter2 : std::filesystem::directory_iterator(mDirectorie)) for (const auto& iter2 : std::filesystem::directory_iterator(*iter))
{ {
const auto& path = iter2.path(); const auto& path = iter2.path();
const auto str = Files::pathToUnicodeString(path.filename()); const auto str = Files::pathToUnicodeString(path.filename());
@ -59,9 +59,9 @@ namespace Files
bool Collections::doesExist(const std::string& file) const bool Collections::doesExist(const std::string& file) const
{ {
for (const auto& mDirectorie : mDirectories) for (auto iter = mDirectories.rbegin(); iter != mDirectories.rend(); iter++)
{ {
for (const auto& iter2 : std::filesystem::directory_iterator(mDirectorie)) for (const auto& iter2 : std::filesystem::directory_iterator(*iter))
{ {
const auto& path = iter2.path(); const auto& path = iter2.path();
const auto str = Files::pathToUnicodeString(path.filename()); const auto str = Files::pathToUnicodeString(path.filename());