claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ListXML write

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-25 22:13:49 -07:00
parent d8b8f53821
commit 0fa843a587
4 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SabreTools.Library/DatFiles/Listxml.cs
View File

@@ -1003,7 +1003,7 @@ namespace SabreTools.Library.DatFiles
// If we have a different game and we're not at the start of the list, output the end of last item
if (lastgame != null && lastgame.ToLowerInvariant() != rom.Machine.Name.ToLowerInvariant())
WriteEndGame(xtw);
WriteEndGame(xtw, rom);
// If we have a new game, output the beginning of the new item
if (lastgame == null || lastgame.ToLowerInvariant() != rom.Machine.Name.ToLowerInvariant())
@@ -1107,9 +1107,9 @@ namespace SabreTools.Library.DatFiles
xtw.WriteOptionalElementString("description", datItem.Machine.Description);
xtw.WriteOptionalElementString("year", datItem.Machine.Year);
xtw.WriteOptionalElementString("publisher", datItem.Machine.Publisher);
xtw.WriteOptionalElementString("category", datItem.Machine.Category);
xtw.WriteOptionalElementString("manufacturer", datItem.Machine.Manufacturer);
// TODO: These should go *after* the datitems
if (datItem.Machine.DeviceReferences != null)
{
foreach (var deviceReference in datItem.Machine.DeviceReferences)
@@ -1230,17 +1230,17 @@ namespace SabreTools.Library.DatFiles
}
if (datItem.Machine.DipSwitches != null)
{
foreach (var dipSwitches in datItem.Machine.DipSwitches)
foreach (var dipSwitch in datItem.Machine.DipSwitches)
{
xtw.WriteStartElement("dipswitch");
xtw.WriteOptionalAttributeString("name", dipSwitches.Name);
xtw.WriteOptionalAttributeString("tag", dipSwitches.Tag);
xtw.WriteOptionalAttributeString("mask", dipSwitches.Mask);
xtw.WriteOptionalAttributeString("name", dipSwitch.Name);
xtw.WriteOptionalAttributeString("tag", dipSwitch.Tag);
xtw.WriteOptionalAttributeString("mask", dipSwitch.Mask);
if (dipSwitches.Locations != null)
if (dipSwitch.Locations != null)
{
foreach (var location in dipSwitches.Locations)
foreach (var location in dipSwitch.Locations)
{
xtw.WriteStartElement("diplocation");
@@ -1252,9 +1252,9 @@ namespace SabreTools.Library.DatFiles
xtw.WriteEndElement();
}
}
if (dipSwitches.Values != null)
if (dipSwitch.Values != null)
{
foreach (var value in dipSwitches.Values)
foreach (var value in dipSwitch.Values)
{
xtw.WriteStartElement("dipvalue");
@@ -1508,8 +1508,9 @@ namespace SabreTools.Library.DatFiles
/// Write out Game start using the supplied StreamWriter
/// </summary>
/// <param name="xtw">XmlTextWriter to output to</param>
/// <param name="datItem">DatItem object to be output</param>
/// <returns>True if the data was written, false on error</returns>
private bool WriteEndGame(XmlTextWriter xtw)
private bool WriteEndGame(XmlTextWriter xtw, DatItem datItem)
{
try
{

6
SabreTools.Library/DatFiles/Logiqx.cs
View File

@@ -620,7 +620,7 @@ namespace SabreTools.Library.DatFiles
break;
case "crc":
machine.HasCrc = reader.ReadElementContentAsString().AsYesNo();
machine.Crc = reader.ReadElementContentAsString().AsYesNo();
break;
case "source":
@@ -873,7 +873,7 @@ namespace SabreTools.Library.DatFiles
|| datItem.Machine.Ratings != null
|| datItem.Machine.Score != null
|| datItem.Machine.Enabled != null
|| datItem.Machine.HasCrc != null
|| datItem.Machine.Crc != null
|| datItem.Machine.RelatedTo != null)
{
xtw.WriteStartElement("trurip");
@@ -889,7 +889,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteOptionalElementString("players", datItem.Machine.Players);
xtw.WriteOptionalElementString("enabled", datItem.Machine.Enabled);
xtw.WriteOptionalElementString("titleid", datItem.Machine.TitleID);
xtw.WriteOptionalElementString("crc", datItem.Machine.HasCrc.FromYesNo());
xtw.WriteOptionalElementString("crc", datItem.Machine.Crc.FromYesNo());
xtw.WriteOptionalElementString("source", datItem.Machine.SourceFile);
xtw.WriteOptionalElementString("cloneof", datItem.Machine.CloneOf);
xtw.WriteOptionalElementString("relatedto", datItem.Machine.RelatedTo);