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

Minor change to be fully compatible with SuperDAT output

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-19 13:14:17 -07:00
parent d8200433e0
commit 8b43e2ec79
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DATabase/MergeDiff.cs
View File

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