Remove MachineType.None (dupe of NULL)

This commit is contained in:
Matt Nadareski
2020-08-24 13:53:53 -07:00
parent 85dc985c67
commit 77cdda1c6e
8 changed files with 13 additions and 16 deletions

View File

@@ -199,7 +199,7 @@ namespace SabreTools.Library.DatFiles
bool containsItems = false;
Machine machine = new Machine()
{
MachineType = (resource ? MachineType.Bios : MachineType.None),
MachineType = (resource ? MachineType.Bios : MachineType.NULL),
};
// If there's no subtree to the header, skip it

View File

@@ -150,7 +150,7 @@ namespace SabreTools.Library.DatFiles
bool containsItems = false;
Machine machine = new Machine()
{
MachineType = MachineType.None,
MachineType = MachineType.NULL,
};
// If there's no subtree to the header, skip it

View File

@@ -145,7 +145,7 @@ namespace SabreTools.Library.DatFiles
CloneOf = reader.GetAttribute("cloneof"),
RomOf = reader.GetAttribute("romof"),
SampleOf = reader.GetAttribute("sampleof"),
MachineType = (machineType == MachineType.NULL ? MachineType.None : machineType),
MachineType = (machineType == MachineType.NULL ? MachineType.NULL : machineType),
SourceFile = reader.GetAttribute("sourcefile"),
Runnable = reader.GetAttribute("runnable").AsRunnable(),

View File

@@ -321,7 +321,7 @@ namespace SabreTools.Library.DatFiles
RomOf = reader.GetAttribute("romof"),
SampleOf = reader.GetAttribute("sampleof"),
MachineType = (machineType == MachineType.NULL ? MachineType.None : machineType),
MachineType = (machineType == MachineType.NULL ? MachineType.NULL : machineType),
};
if (Header.Type == "SuperDAT" && !keep)

View File

@@ -149,7 +149,7 @@ namespace SabreTools.Library.DatFiles
SharedFeatures = new List<SoftwareListSharedFeature>(),
DipSwitches = new List<ListXmlDipSwitch>(),
MachineType = (machineType == MachineType.NULL ? MachineType.None : machineType),
MachineType = (machineType != MachineType.NULL ? machineType : MachineType.NULL),
};
while (!reader.EOF)