From cb1b006d91b9b055ba8b78632b529ebcd3550883 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 25 Jul 2016 16:34:32 -0700 Subject: [PATCH] [DatTools, Output] Dat cleanup --- SabreTools.Helper/Tools/DatTools.cs | 10 ++-------- SabreTools.Helper/Tools/Output.cs | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/SabreTools.Helper/Tools/DatTools.cs b/SabreTools.Helper/Tools/DatTools.cs index 77bb2a03..7a0dee82 100644 --- a/SabreTools.Helper/Tools/DatTools.cs +++ b/SabreTools.Helper/Tools/DatTools.cs @@ -80,16 +80,10 @@ namespace SabreTools.Helper public static Dat Parse(string filename, int sysid, int srcid, Dat datdata, Logger logger, bool keep = false, bool clean = false, bool softlist = false) { // If the output filename isn't set already, get the internal filename - if (String.IsNullOrEmpty(datdata.FileName)) - { - datdata.FileName = Path.GetFileNameWithoutExtension(filename); - } + datdata.FileName = (String.IsNullOrEmpty(datdata.FileName) ? Path.GetFileNameWithoutExtension(filename) : datdata.FileName); // If the output type isn't set already, get the internal output type - if (datdata.OutputFormat == OutputFormat.None) - { - datdata.OutputFormat = GetOutputFormat(filename); - } + datdata.OutputFormat = (datdata.OutputFormat == OutputFormat.None ? GetOutputFormat(filename) : datdata.OutputFormat); // Make sure there's a dictionary to read to if (datdata.Roms == null) diff --git a/SabreTools.Helper/Tools/Output.cs b/SabreTools.Helper/Tools/Output.cs index 4e486159..24ee062d 100644 --- a/SabreTools.Helper/Tools/Output.cs +++ b/SabreTools.Helper/Tools/Output.cs @@ -147,7 +147,6 @@ namespace SabreTools.Helper header = "clrmamepro (\n" + "\tname \"" + datdata.Name + "\"\n" + "\tdescription \"" + datdata.Description + "\"\n" + - "\trootdir \"" + datdata.RootDir + "\"\n" + "\tcategory \"" + datdata.Category + "\"\n" + "\tversion \"" + datdata.Version + "\"\n" + "\tdate \"" + datdata.Date + "\"\n" +