diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs index dab2e2fe..afc23ae5 100644 --- a/DATabase/MergeDiff.cs +++ b/DATabase/MergeDiff.cs @@ -114,11 +114,11 @@ namespace SabreTools Date = _date, Category = _cat, Author = _author, + Type = (_superdat ? "SuperDAT" : ""), ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), MergeRoms = _dedup, Roms = new Dictionary>(), - Type = (_superdat ? "SuperDAT" : ""), }; foreach (string input in _inputs) { @@ -142,6 +142,7 @@ namespace SabreTools Date = _date, Category = _cat, Author = _author, + Type = (_superdat ? "SuperDAT" : ""), ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), MergeRoms = _dedup, @@ -186,6 +187,7 @@ namespace SabreTools Date = _date, Category = _cat, Author = _author, + Type = (_superdat ? "SuperDAT" : ""), ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), MergeRoms = _dedup, @@ -225,6 +227,7 @@ namespace SabreTools Date = _date, Category = _cat, Author = _author, + Type = (_superdat ? "SuperDAT" : ""), ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), MergeRoms = _dedup, @@ -270,6 +273,7 @@ namespace SabreTools Date = _date, Category = _cat, Author = _author, + Type = (_superdat ? "SuperDAT" : ""), ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), MergeRoms = _dedup, @@ -282,7 +286,7 @@ namespace SabreTools List oldroms = RomManipulation.Merge(userData.Roms[key]); List newroms = new List(); - foreach (RomData rom in oldroms) + foreach (RomData rom in userData.Roms[key]) { if (rom.SystemID == j) {