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

[DatFile] Disks are special flowers :D

Browse Source
This commit is contained in:
Matt Nadareski
2017-02-07 11:34:41 -08:00
parent 051a4e8fc7
commit 0ad0636254
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SabreTools.Helper/Dats/Partials/DatFile.Bucketing.cs
View File

@@ -809,27 +809,21 @@ namespace SabreTools.Helper.Dats
List<DatItem> items = this[game]; List<DatItem> items = this[game];
foreach (DatItem item in items) foreach (DatItem item in items)
{ {
// If the item doesn't have a valid merge tag OR the merged file doesn't exist in the parent, then add it // If the disk doesn't have a valid merge tag OR the merged file doesn't exist in the parent, then add it
if (item.MergeTag == null || !this[parent].Select(i => i.Name).Contains(item.MergeTag)) if (item.Type == ItemType.Disk && (item.MergeTag == null || !this[parent].Select(i => i.Name).Contains(item.MergeTag)))
{ {
// TODO: Remove hack for just disks at a later date item.Machine = parentMachine;
item.Name = (item.Type != ItemType.Disk ? item.Machine.Name + "\\" : "") + item.Name; this[parent].Add(item);
}
// Otherwise, if the parent doesn't already contain the non-disk, add it
else if (item.Type != ItemType.Disk && !this[parent].Contains(item))
{
item.Name = item.Machine.Name + "\\" + item.Name;
item.Machine = parentMachine; item.Machine = parentMachine;
this[parent].Add(item); this[parent].Add(item);
} }
/*
// If the parent doesn't already contain the item, add it
if (!this[parent].Contains(item))
{
// TODO: Remove hack for just disks at a later date
item.Name = (item.Type != ItemType.Disk ? item.Machine.Name + "\\" : "") + item.Name;
item.Machine = parentMachine;
this[parent].Add(item);
}
*/
} }
// Then, remove the old game so it's not picked up by the writer // Then, remove the old game so it's not picked up by the writer