mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 19:20:49 +00:00
Merge branch 'fix_master_file' into 'master'
Fix checking whether content file is master file See merge request OpenMW/openmw!1980
This commit is contained in:
commit
ef978f080b
@ -34,7 +34,8 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loadin
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user