diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index 200c4473..b7c4eca5 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -524,7 +524,7 @@ namespace SabreTools.Library.DatFiles } // Data specific to the Miss DAT type - public bool UseGame + public bool UseRomName { get { @@ -533,7 +533,7 @@ namespace SabreTools.Library.DatFiles _datHeader = new DatHeader(); } - return _datHeader.UseGame; + return _datHeader.UseRomName; } set { @@ -542,7 +542,7 @@ namespace SabreTools.Library.DatFiles _datHeader = new DatHeader(); } - _datHeader.UseGame = value; + _datHeader.UseRomName = value; } } public string Prefix diff --git a/SabreTools.Library/DatFiles/DatHeader.cs b/SabreTools.Library/DatFiles/DatHeader.cs index abc145e1..28534ca8 100644 --- a/SabreTools.Library/DatFiles/DatHeader.cs +++ b/SabreTools.Library/DatFiles/DatHeader.cs @@ -37,7 +37,7 @@ namespace SabreTools.Library.DatFiles private Hash _stripHash; // Data specific to the Miss DAT type - private bool _useGame; + private bool _useRomName; private string _prefix; private string _postfix; private bool _quotes; @@ -164,10 +164,10 @@ namespace SabreTools.Library.DatFiles } // Data specific to the Miss DAT type - public bool UseGame + public bool UseRomName { - get { return _useGame; } - set { _useGame = value; } + get { return _useRomName; } + set { _useRomName = value; } } public string Prefix { @@ -247,7 +247,7 @@ namespace SabreTools.Library.DatFiles _dedupeRoms = this._dedupeRoms, _stripHash = this._stripHash, - _useGame = this._useGame, + _useRomName = this._useRomName, _prefix = this._prefix, _postfix = this._postfix, _quotes = this._quotes, diff --git a/SabreTools.Library/DatFiles/Missfile.cs b/SabreTools.Library/DatFiles/Missfile.cs index f913d17e..3f175803 100644 --- a/SabreTools.Library/DatFiles/Missfile.cs +++ b/SabreTools.Library/DatFiles/Missfile.cs @@ -265,7 +265,7 @@ namespace SabreTools.Library.DatFiles // Otherwise, use any flags else { - name = (UseGame ? rom.MachineName : rom.Name); + name = (UseRomName ? rom.Name : rom.MachineName); if (!String.IsNullOrWhiteSpace(ReplaceExtension) || RemoveExtension) { if (RemoveExtension) @@ -281,17 +281,17 @@ namespace SabreTools.Library.DatFiles { name += AddExtension; } - if (!UseGame && GameName) + if (UseRomName && GameName) { name = Path.Combine(rom.MachineName, name); } - if (UseGame && rom.MachineName != lastgame) + if (!UseRomName && rom.MachineName != lastgame) { state += pre + name + post + "\n"; lastgame = rom.MachineName; } - else if (!UseGame) + else if (UseRomName) { state += pre + name + post + "\n"; } diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs index cc42037a..0a55ae5d 100644 --- a/SabreTools/SabreTools.cs +++ b/SabreTools/SabreTools.cs @@ -381,7 +381,7 @@ namespace SabreTools quickScan = true; break; case "roms": - datHeader.UseGame = false; + datHeader.UseRomName = true; break; case "reverse-base-name": updateMode |= UpdateMode.ReverseBaseReplace;