nes-fix bug in xml parsing which made games with multiple carts (unusual) not detect subsequent carts

This commit is contained in:
zeromus 2012-03-08 04:48:14 +00:00
parent 9a6d6a63bd
commit 1b91aa6bca
1 changed files with 9 additions and 10 deletions

View File

@ -375,16 +375,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
state = 1; state = 1;
} }
break; break;
case 1:
if (xmlreader.NodeType == XmlNodeType.Element && xmlreader.Name == "cartridge")
{
currCart = new CartInfo();
currCart.game = currGame;
currCart.system = xmlreader.GetAttribute("system");
currCart.sha1 = "sha1:" + xmlreader.GetAttribute("sha1");
state = 2;
}
break;
case 2: case 2:
if (xmlreader.NodeType == XmlNodeType.Element && xmlreader.Name == "board") if (xmlreader.NodeType == XmlNodeType.Element && xmlreader.Name == "board")
{ {
@ -438,6 +428,15 @@ namespace BizHawk.Emulation.Consoles.Nintendo
} }
break; break;
case 5: case 5:
case 1:
if (xmlreader.NodeType == XmlNodeType.Element && xmlreader.Name == "cartridge")
{
currCart = new CartInfo();
currCart.game = currGame;
currCart.system = xmlreader.GetAttribute("system");
currCart.sha1 = "sha1:" + xmlreader.GetAttribute("sha1");
state = 2;
}
if (xmlreader.NodeType == XmlNodeType.EndElement && xmlreader.Name == "game") if (xmlreader.NodeType == XmlNodeType.EndElement && xmlreader.Name == "game")
{ {
games.Add(currGame); games.Add(currGame);