claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip away merge tag in more places

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-14 07:56:31 -04:00
parent 83958c76a3
commit 32ba06bb9e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SabreTools.DatFiles/DatFile.Splitting.cs
View File

@@ -599,6 +599,7 @@ namespace SabreTools.DatFiles
if (items.Values.Any(i => i.GetName()?.ToLowerInvariant() == datItem.GetName()?.ToLowerInvariant()) if (items.Values.Any(i => i.GetName()?.ToLowerInvariant() == datItem.GetName()?.ToLowerInvariant())
&& items.Values.Any(i => i == datItem)) && items.Values.Any(i => i == datItem))
{ {
datItem.RemoveField(Models.Metadata.Rom.MergeKey);
ItemsDB.AddItem(datItem, machine.Key, source.Key); ItemsDB.AddItem(datItem, machine.Key, source.Key);
} }
} }
@@ -698,6 +699,7 @@ namespace SabreTools.DatFiles
// Clone the item and then add it // Clone the item and then add it
DatItem datItem = (DatItem)item.Clone(); DatItem datItem = (DatItem)item.Clone();
datItem.CopyMachineInformation(copyFrom); datItem.CopyMachineInformation(copyFrom);
datItem.RemoveField(Models.Metadata.Rom.MergeKey);
AddItem(datItem, statsOnly: false); AddItem(datItem, statsOnly: false);
} }
} }
@@ -979,6 +981,7 @@ namespace SabreTools.DatFiles
{ {
DatItem datItem = (DatItem)item.Clone(); DatItem datItem = (DatItem)item.Clone();
datItem.CopyMachineInformation(copyFrom); datItem.CopyMachineInformation(copyFrom);
datItem.RemoveField(Models.Metadata.Rom.MergeKey);
if (!items.Exists(i => i.GetName() == datItem.GetName()) && !items.Contains(datItem)) if (!items.Exists(i => i.GetName() == datItem.GetName()) && !items.Contains(datItem))
AddItem(datItem, statsOnly: false); AddItem(datItem, statsOnly: false);
} }
@@ -1020,6 +1023,7 @@ namespace SabreTools.DatFiles
foreach (var item in parentItems) foreach (var item in parentItems)
{ {
DatItem datItem = (DatItem)item.Value.Clone(); DatItem datItem = (DatItem)item.Value.Clone();
datItem.RemoveField(Models.Metadata.Rom.MergeKey);
if (items.Any(i => i.Value.GetName() == datItem.GetName()) if (items.Any(i => i.Value.GetName() == datItem.GetName())
&& items.Any(i => i.Value == datItem)) && items.Any(i => i.Value == datItem))
{ {