diff --git a/cpp/src/tests/api/interface/plugin_interface_test.h b/cpp/src/tests/api/interface/plugin_interface_test.h index 8a87a64c..ed8da8ba 100644 --- a/cpp/src/tests/api/interface/plugin_interface_test.h +++ b/cpp/src/tests/api/interface/plugin_interface_test.h @@ -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()); diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs index 54661320..515e7553 100644 --- a/src/plugin/mod.rs +++ b/src/plugin/mod.rs @@ -170,7 +170,10 @@ impl Plugin { /// sometimes referred to as *master files* or simply *masters*, while the /// other meaning is always referenced in relation to another plugin. pub fn is_master(&self) -> bool { - if self.game_type == GameType::OpenMW { + if matches!( + self.game_type, + GameType::OpenMW | GameType::OblivionRemastered + ) { false } else { self.data @@ -541,7 +544,7 @@ mod tests { assert_eq!(plugin_name, plugin.name()); assert_eq!(expected_masters, plugin.masters().unwrap()); - if matches!(game_type, GameType::OpenMW) { + if matches!(game_type, GameType::OpenMW | GameType::OblivionRemastered) { assert!(!plugin.is_master()); } else { assert!(plugin.is_master()); @@ -618,7 +621,7 @@ mod tests { assert_eq!(plugin_name, plugin.name()); assert_eq!(expected_masters, plugin.masters().unwrap()); - if matches!(game_type, GameType::OpenMW) { + if matches!(game_type, GameType::OpenMW | GameType::OblivionRemastered) { assert!(!plugin.is_master()); } else { assert!(plugin.is_master());