diff --git a/src/api/sorting/plugin_sort.cpp b/src/api/sorting/plugin_sort.cpp index 75400aa4..4a105ad3 100644 --- a/src/api/sorting/plugin_sort.cpp +++ b/src/api/sorting/plugin_sort.cpp @@ -32,7 +32,6 @@ namespace loot { std::vector GetPluginsSortingData( - const GameType gameType, const DatabaseInterface& db, const std::vector loadedPluginInterfaces, const std::vector& loadOrder) { @@ -57,12 +56,8 @@ std::vector GetPluginsSortingData( const auto userMetadata = db.GetPluginUserMetadata(plugin->GetName(), true) .value_or(PluginMetadata(plugin->GetName())); - const auto pluginSortingData = PluginSortingData(plugin, - masterlistMetadata, - userMetadata, - loadOrder, - gameType, - loadedPluginInterfaces); + const auto pluginSortingData = + PluginSortingData(plugin, masterlistMetadata, userMetadata, loadOrder); pluginsSortingData.push_back(pluginSortingData); } @@ -274,7 +269,7 @@ std::vector SortPlugins( Game& game, const std::vector& loadOrder) { auto pluginsSortingData = GetPluginsSortingData( - game.GetType(), game.GetDatabase(), game.GetLoadedPlugins(), loadOrder); + game.GetDatabase(), game.GetLoadedPlugins(), loadOrder); const auto logger = getLogger(); if (logger) { diff --git a/src/api/sorting/plugin_sort.h b/src/api/sorting/plugin_sort.h index 424c759b..1d87562c 100644 --- a/src/api/sorting/plugin_sort.h +++ b/src/api/sorting/plugin_sort.h @@ -36,7 +36,7 @@ std::vector SortPlugins( std::vector&& pluginsSortingData, const std::vector masterlistGroups, const std::vector userGroups, - const std::vector& implicitlyActivePlugins); + const std::vector& earlyLoadingPlugins); std::vector SortPlugins(Game& game, const std::vector& loadOrder); diff --git a/src/api/sorting/plugin_sorting_data.cpp b/src/api/sorting/plugin_sorting_data.cpp index 0a718751..9b2c0327 100644 --- a/src/api/sorting/plugin_sorting_data.cpp +++ b/src/api/sorting/plugin_sorting_data.cpp @@ -53,9 +53,7 @@ PluginSortingData::PluginSortingData( const PluginSortingInterface* plugin, const PluginMetadata& masterlistMetadata, const PluginMetadata& userMetadata, - const std::vector& loadOrder, - const GameType gameType, - const std::vector& loadedPlugins) : + const std::vector& loadOrder) : plugin_(plugin), group_(userMetadata.GetGroup().value_or( masterlistMetadata.GetGroup().value_or(Group::DEFAULT_NAME))), diff --git a/src/api/sorting/plugin_sorting_data.h b/src/api/sorting/plugin_sorting_data.h index d998ede3..66e31db2 100644 --- a/src/api/sorting/plugin_sorting_data.h +++ b/src/api/sorting/plugin_sorting_data.h @@ -44,9 +44,7 @@ public: const PluginSortingInterface* plugin, const PluginMetadata& masterlistMetadata, const PluginMetadata& userMetadata, - const std::vector& loadOrder, - const GameType gameType, - const std::vector& loadedPlugins); + const std::vector& loadOrder); std::string GetName() const; bool IsMaster() const; diff --git a/src/tests/api/internals/sorting/plugin_graph_test.h b/src/tests/api/internals/sorting/plugin_graph_test.h index 7044aa82..d546b193 100644 --- a/src/tests/api/internals/sorting/plugin_graph_test.h +++ b/src/tests/api/internals/sorting/plugin_graph_test.h @@ -156,7 +156,7 @@ protected: const auto plugin = GetPlugin(name); return PluginSortingData( - plugin, PluginMetadata(), PluginMetadata(), {}, GameType::tes4, {}); + plugin, PluginMetadata(), PluginMetadata(), {}); } PluginSortingData CreatePluginSortingData(const std::string& name, @@ -174,7 +174,7 @@ protected: } return PluginSortingData( - plugin, masterlistMetadata, userMetadata, {}, GameType::tes4, {}); + plugin, masterlistMetadata, userMetadata, {}); } plugingraph::TestPlugin* GetPlugin(const std::string& name) { diff --git a/src/tests/api/internals/sorting/plugin_sort_test.h b/src/tests/api/internals/sorting/plugin_sort_test.h index 1f6d4d5b..13e5b9b8 100644 --- a/src/tests/api/internals/sorting/plugin_sort_test.h +++ b/src/tests/api/internals/sorting/plugin_sort_test.h @@ -99,9 +99,7 @@ protected: return PluginSortingData(plugin, PluginMetadata(), PluginMetadata(), - loadOrder, - GameType::tes4, - {}); + loadOrder); } plugingraph::TestPlugin* GetPlugin(const std::string& name) { diff --git a/src/tests/api/internals/sorting/plugin_sorting_data_test.h b/src/tests/api/internals/sorting/plugin_sorting_data_test.h index 5d288698..06d4d1e5 100644 --- a/src/tests/api/internals/sorting/plugin_sorting_data_test.h +++ b/src/tests/api/internals/sorting/plugin_sorting_data_test.h @@ -101,18 +101,14 @@ TEST_P(PluginSortingDataTest, lightFlaggedEspFilesShouldNotBeTreatedAsMasters) { dynamic_cast(game_.GetPlugin(blankEsp)), PluginMetadata(), PluginMetadata(), - getLoadOrder(), - game_.GetType(), - loadedPlugins); + getLoadOrder()); EXPECT_FALSE(esp.IsMaster()); auto master = PluginSortingData( dynamic_cast(game_.GetPlugin(blankEsm)), PluginMetadata(), PluginMetadata(), - getLoadOrder(), - game_.GetType(), - loadedPlugins); + getLoadOrder()); EXPECT_TRUE(master.IsMaster()); if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) { @@ -120,9 +116,7 @@ TEST_P(PluginSortingDataTest, lightFlaggedEspFilesShouldNotBeTreatedAsMasters) { dynamic_cast(game_.GetPlugin(blankEsl)), PluginMetadata(), PluginMetadata(), - getLoadOrder(), - game_.GetType(), - loadedPlugins); + getLoadOrder()); EXPECT_TRUE(lightMaster.IsMaster()); auto lightPlugin = @@ -130,9 +124,7 @@ TEST_P(PluginSortingDataTest, lightFlaggedEspFilesShouldNotBeTreatedAsMasters) { game_.GetPlugin(blankEslEsp)), PluginMetadata(), PluginMetadata(), - getLoadOrder(), - game_.GetType(), - loadedPlugins); + getLoadOrder()); EXPECT_FALSE(lightPlugin.IsMaster()); } } @@ -145,9 +137,7 @@ TEST_P(PluginSortingDataTest, dynamic_cast(game_.GetPlugin(blankMasterDependentEsm)), PluginMetadata(), PluginMetadata(), - getLoadOrder(), - game_.GetType(), - getLoadedPlugins()); + getLoadOrder()); EXPECT_EQ(4, plugin.GetOverrideRecordCount()); } }