mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_master_file' into 'master'

Browse Source 
Fix checking whether content file is master file

See merge request OpenMW/openmw!1980
This commit is contained in:
Alexei Kotov 2022-06-06 02:40:19 +00:00
commit ef978f080b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwworld/esmloader.cpp
View File

@ -34,7 +34,8 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loadin
mStore.load(*reader, listener, mDialogue); mStore.load(*reader, listener, mDialogue);
if (!mMasterFileFormat.has_value() && Misc::StringUtils::ciEndsWith(reader->getName(), ".esm") && !Misc::StringUtils::ciEndsWith(reader->getName(), ".omwgame")) if (!mMasterFileFormat.has_value() && (Misc::StringUtils::ciEndsWith(reader->getName(), ".esm")
|| Misc::StringUtils::ciEndsWith(reader->getName(), ".omwgame")))
mMasterFileFormat = reader->getFormat(); mMasterFileFormat = reader->getFormat();
} }