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

Consolidate RemoveItemsFromRomOfChild invocation

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-13 14:34:15 -05:00
parent 2d277607cf
commit 73b4d9650a
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,12 +79,14 @@ namespace SabreTools.DatFiles
/// <summary> /// <summary>
/// Use romof tags to remove bios items from children /// Use romof tags to remove bios items from children
/// </summary> /// </summary>
/// <param name="bios">True if only child Bios sets are touched, false for non-bios sets</param>
/// <remarks>Assumes items are bucketed by <see cref="ItemKey.Machine"/></remarks> /// <remarks>Assumes items are bucketed by <see cref="ItemKey.Machine"/></remarks>
public void RemoveItemsFromRomOfChild(bool bios) public void RemoveItemsFromRomOfChild()
{ {
RemoveItemsFromRomOfChildImpl(bios); // TODO: Figure out why the bios flag is needed
RemoveItemsFromRomOfChildImplDB(bios); RemoveItemsFromRomOfChildImpl(false);
RemoveItemsFromRomOfChildImplDB(false);
RemoveItemsFromRomOfChildImpl(true);
RemoveItemsFromRomOfChildImplDB(true);
} }
/// <summary> /// <summary>

12
SabreTools.DatTools/MergeSplit.cs
View File

@@ -127,8 +127,7 @@ namespace SabreTools.DatTools
datFile.AddItemsFromChildren(true, false); datFile.AddItemsFromChildren(true, false);
// Now that we have looped through the cloneof tags, we loop through the romof tags // Now that we have looped through the cloneof tags, we loop through the romof tags
datFile.RemoveItemsFromRomOfChild(false); datFile.RemoveItemsFromRomOfChild();
datFile.RemoveItemsFromRomOfChild(true);
// Finally, remove the romof and cloneof tags so it's not picked up by the manager // Finally, remove the romof and cloneof tags so it's not picked up by the manager
datFile.RemoveMachineRelationshipTags(); datFile.RemoveMachineRelationshipTags();
@@ -172,8 +171,7 @@ namespace SabreTools.DatTools
datFile.AddItemsFromChildren(true, true); datFile.AddItemsFromChildren(true, true);
// Now that we have looped through the cloneof tags, we loop through the romof tags // Now that we have looped through the cloneof tags, we loop through the romof tags
datFile.RemoveItemsFromRomOfChild(false); datFile.RemoveItemsFromRomOfChild();
datFile.RemoveItemsFromRomOfChild(true);
// Finally, remove the romof and cloneof tags so it's not picked up by the manager // Finally, remove the romof and cloneof tags so it's not picked up by the manager
datFile.RemoveMachineRelationshipTags(); datFile.RemoveMachineRelationshipTags();
@@ -194,8 +192,7 @@ namespace SabreTools.DatTools
datFile.AddItemsFromCloneOfParent(); datFile.AddItemsFromCloneOfParent();
// Now that we have looped through the cloneof tags, we loop through the romof tags // Now that we have looped through the cloneof tags, we loop through the romof tags
datFile.RemoveItemsFromRomOfChild(false); datFile.RemoveItemsFromRomOfChild();
datFile.RemoveItemsFromRomOfChild(true);
// Finally, remove the romof and cloneof tags so it's not picked up by the manager // Finally, remove the romof and cloneof tags so it's not picked up by the manager
datFile.RemoveMachineRelationshipTags(); datFile.RemoveMachineRelationshipTags();
@@ -216,8 +213,7 @@ namespace SabreTools.DatTools
datFile.RemoveItemsFromCloneOfChild(); datFile.RemoveItemsFromCloneOfChild();
// Now that we have looped through the cloneof tags, we loop through the romof tags // Now that we have looped through the cloneof tags, we loop through the romof tags
datFile.RemoveItemsFromRomOfChild(false); datFile.RemoveItemsFromRomOfChild();
datFile.RemoveItemsFromRomOfChild(true);
// Finally, remove the romof and cloneof tags so it's not picked up by the manager // Finally, remove the romof and cloneof tags so it's not picked up by the manager
datFile.RemoveMachineRelationshipTags(); datFile.RemoveMachineRelationshipTags();