Remove logic to get a clean start. Keep flags

This commit is contained in:
Matt Nadareski
2016-04-22 14:30:16 -07:00
parent 2d5bf0145b
commit bb75c6ee3a

View File

@@ -82,7 +82,6 @@ namespace SabreTools
}
List<RomData> A = new List<RomData>();
List<RomData> X = new List<RomData>();
foreach (string input in _inputs)
{
@@ -96,56 +95,6 @@ namespace SabreTools
{
A.AddRange(B);
}
// If we're in all-diff mode, get a master merged DAT to compare against
if (_ad)
{
X.AddRange(B);
}
}
// If we're in all diff mode, diff against every DAT and output accordingly
if (_ad)
{
foreach (string input in _inputs)
{
List<RomData> B = RomManipulation.Parse(input, 0, 0, _logger);
List<RomData> C = RomManipulation.DiffOnlyInA(B, X);
List<RomData> D = RomManipulation.DiffInAB(B, X);
if (_dedup)
{
C = RomManipulation.Merge(C);
D = RomManipulation.Merge(D);
}
if (_name == "")
{
_name = (_diff ? "diffdat" : "mergedat") + (_dedup ? "-merged" : "");
}
if (_desc == "")
{
_desc = (_diff ? "diffdat" : "mergedat") + (_dedup ? "-merged" : "");
if (!_bare)
{
_desc += " (" + _date + ")";
}
}
if (_cat == "" && _diff)
{
_cat = "DiffDAT";
}
if (_author == "")
{
_author = "SabreTools";
}
string realname = Path.GetFileNameWithoutExtension(input);
// Now write the files out
Output.WriteToDat(_name + "-" + realname + "-inall", _desc + "-" + realname + "-inall", _version, _date, _cat, _author, _forceunpack, _old, "", C, _logger);
Output.WriteToDat(_name + "-" + realname + "-only", _desc + "-" + realname + "-only", _version, _date, _cat, _author, _forceunpack, _old, "", D, _logger);
}
}
// If we want a merged list, send it for merging before outputting