diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs index 571ba4af..fad59dbd 100644 --- a/DATabase/DATabase.cs +++ b/DATabase/DATabase.cs @@ -1583,7 +1583,7 @@ Make a selection: } } - MergeDiff md = new MergeDiff(newInputs, name, desc, cat, version, author, diff, dedup, bare, forceunpack, old, superdat, cascade, logger); + MergeDiff md = new MergeDiff(newInputs, name, desc, cat, version, author, diff, dedup, bare, forceunpack, old, superdat, cascade, false /*inplace */, logger); md.Process(); } diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs index b431c91d..d38a635f 100644 --- a/DATabase/MergeDiff.cs +++ b/DATabase/MergeDiff.cs @@ -20,6 +20,7 @@ namespace SabreTools private bool _old; private bool _superdat; private bool _cascade; + private bool _inplace; // User specified strings private string _name; @@ -49,9 +50,10 @@ namespace SabreTools /// True if a old-style DAT should be output, false otherwise /// True if DATs should be parsed into SuperDAT format, false otherwise /// True if the outputted diffs should be cascaded, false otherwise + /// True if cascaded diffs overwrite the source files, false otherwise /// Logger object for console and file output public MergeDiff(List inputs, string name, string desc, string cat, string version, string author, - bool diff, bool dedup, bool bare, bool forceunpack, bool old, bool superdat, bool cascade, Logger logger) + bool diff, bool dedup, bool bare, bool forceunpack, bool old, bool superdat, bool cascade, bool inplace, Logger logger) { _inputs = inputs; _name = name; @@ -66,6 +68,7 @@ namespace SabreTools _old = old; _superdat = superdat; _cascade = cascade; + _inplace = inplace; _logger = logger; }