loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Check Oblivion Remastered plugins' master flag"

Browse Source 
This reverts commit d058d34bca.

Although it was reported that loading a master file after a non-master
that touched the same record can cause issues, forcing all masters to
load before non-masters is too restrictive and breaks the ability to
load any mod that uses a master file, since that would force it to load
before the official DLC plugins and so break the ability to load the
game.
This commit is contained in:
Oliver Hamlet
2025-05-28 19:51:40 +01:00
parent 20d583ba43
commit d7b69f1893
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/plugin.cpp
+2 -1
View File
@@ -222,7 +222,8 @@ std::unique_ptr<::Plugin, decltype(&esp_plugin_free)> MakeEspluginPtr() {
}
bool ShouldIgnoreMasterFlag(GameType gameType) {
return gameType == GameType::openmw;
return gameType == GameType::openmw ||
gameType == GameType::oblivionRemastered;
}
}
src/tests/api/interface/plugin_interface_test.h
+4 -2
View File
@@ -186,7 +186,8 @@ TEST_P(PluginInterfaceTest,
EXPECT_EQ(blankEsm, plugin->GetName());
EXPECT_TRUE(plugin->GetMasters().empty());
if (GetParam() == GameType::openmw) {
if (GetParam() == GameType::openmw ||
GetParam() == GameType::oblivionRemastered) {
EXPECT_FALSE(plugin->IsMaster());
} else {
EXPECT_TRUE(plugin->IsMaster());
@@ -211,7 +212,8 @@ TEST_P(PluginInterfaceTest, shouldBeAbleToGetAllDataFromFullyLoadedPlugin) {
EXPECT_EQ(blankEsm, plugin->GetName());
EXPECT_TRUE(plugin->GetMasters().empty());
if (GetParam() == GameType::openmw) {
if (GetParam() == GameType::openmw ||
GetParam() == GameType::oblivionRemastered) {
EXPECT_FALSE(plugin->IsMaster());
} else {
EXPECT_TRUE(plugin->IsMaster());