diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs index 73be4a55..47a2988d 100644 --- a/SabreTools.DatItems/DatItem.cs +++ b/SabreTools.DatItems/DatItem.cs @@ -222,11 +222,11 @@ namespace SabreTools.DatItems // If the item and machine names match if (lastMachineName == selfMachineName && lastItem.GetName() == GetName()) - output = DupeType.Internal | DupeType.All; + output |= DupeType.All; // Otherwise, hash match is assumed else - output = DupeType.Internal | DupeType.Hash; + output |= DupeType.Hash; return output; } @@ -271,11 +271,11 @@ namespace SabreTools.DatItems // If the item and machine names match if (lastMachineName == selfMachineName && lastItem.GetName() == GetName()) - output = DupeType.Internal | DupeType.All; + output |= DupeType.All; // Otherwise, hash match is assumed else - output = DupeType.Internal | DupeType.Hash; + output |= DupeType.Hash; return output; } diff --git a/SabreTools.Test/DatTools/ParserTests.cs b/SabreTools.Test/DatTools/ParserTests.cs index 5ffcb4a8..f63cfb57 100644 --- a/SabreTools.Test/DatTools/ParserTests.cs +++ b/SabreTools.Test/DatTools/ParserTests.cs @@ -41,7 +41,7 @@ namespace SabreTools.Test.DatTools if (filename != null) filename = Path.Combine(Environment.CurrentDirectory, "TestData", filename); - var datFile = SabreTools.DatTools.Parser.CreateAndParse(filename, throwOnError: true); + var datFile = Parser.CreateAndParse(filename, throwOnError: true); Assert.Equal(datFormat, datFile.Header.GetFieldValue(DatHeader.DatFormatKey)); Assert.Equal(totalCount, datFile.Items.DatStatistics.TotalCount); Assert.Equal(totalCount, datFile.ItemsDB.DatStatistics.TotalCount); diff --git a/SabreTools.Test/Filtering/ReplacerTests.cs b/SabreTools.Test/Filtering/ReplacerTests.cs index ea0094ea..d4d356f4 100644 --- a/SabreTools.Test/Filtering/ReplacerTests.cs +++ b/SabreTools.Test/Filtering/ReplacerTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; +using SabreTools.DatFiles; using SabreTools.DatItems; using SabreTools.DatItems.Formats; -using SabreTools.DatTools; using Xunit; namespace SabreTools.Test.Filtering