From d058d34bcaa0fbe5b63a2c15fa18d8aeec96661f Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 12 May 2025 17:23:43 +0100 Subject: [PATCH] Check Oblivion Remastered plugins' master flag Although the game doesn't require master files to load before non-master files, if they load after that can apparently cause issues, so make LOOT sort master files first. --- src/api/plugin.cpp | 3 +-- src/tests/api/interface/plugin_interface_test.h | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/api/plugin.cpp b/src/api/plugin.cpp index 3428df24..ebab979b 100644 --- a/src/api/plugin.cpp +++ b/src/api/plugin.cpp @@ -222,8 +222,7 @@ std::unique_ptr<::Plugin, decltype(&esp_plugin_free)> MakeEspluginPtr() { } bool ShouldIgnoreMasterFlag(GameType gameType) { - return gameType == GameType::openmw || - gameType == GameType::oblivionRemastered; + return gameType == GameType::openmw; } } diff --git a/src/tests/api/interface/plugin_interface_test.h b/src/tests/api/interface/plugin_interface_test.h index ed8da8ba..8a87a64c 100644 --- a/src/tests/api/interface/plugin_interface_test.h +++ b/src/tests/api/interface/plugin_interface_test.h @@ -186,8 +186,7 @@ TEST_P(PluginInterfaceTest, EXPECT_EQ(blankEsm, plugin->GetName()); EXPECT_TRUE(plugin->GetMasters().empty()); - if (GetParam() == GameType::openmw || - GetParam() == GameType::oblivionRemastered) { + if (GetParam() == GameType::openmw) { EXPECT_FALSE(plugin->IsMaster()); } else { EXPECT_TRUE(plugin->IsMaster()); @@ -212,8 +211,7 @@ TEST_P(PluginInterfaceTest, shouldBeAbleToGetAllDataFromFullyLoadedPlugin) { EXPECT_EQ(blankEsm, plugin->GetName()); EXPECT_TRUE(plugin->GetMasters().empty()); - if (GetParam() == GameType::openmw || - GetParam() == GameType::oblivionRemastered) { + if (GetParam() == GameType::openmw) { EXPECT_FALSE(plugin->IsMaster()); } else { EXPECT_TRUE(plugin->IsMaster());