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 35c053bf87.
This commit is contained in:
Oliver Hamlet
2025-06-08 09:23:43 +01:00
parent b578a47cb5
commit 4fcc36aaee
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/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());
src/plugin/mod.rs
+6 -3
View File
@@ -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());