# HG changeset patch # User IBBoard # Date 1249162853 0 # Node ID bd2aaa9a61df0c83d887d2173a9ac1ca93e9582d # Parent cb3759c3ea19b0a21db3b9f821e040532fa7bca1 Re #50: Complete loading of core XML file * Fix remaining bugs from trying to load UnitEquipmentItem values from wrong element * Add type cast to fix infinite loop diff -r cb3759c3ea19 -r bd2aaa9a61df api/Factories/Xml/WarFoundryXmlRaceFactory.cs --- a/api/Factories/Xml/WarFoundryXmlRaceFactory.cs Sat Aug 01 20:04:13 2009 +0000 +++ b/api/Factories/Xml/WarFoundryXmlRaceFactory.cs Sat Aug 01 21:40:53 2009 +0000 @@ -157,8 +157,8 @@ if (equipItem!=null) { UnitEquipmentItem unitEquipItem = new UnitEquipmentItem(equipItem); - unitEquipItem.MutexGroup = elem.GetAttribute("exclusivityGroup"); - unitEquipItem.RoundNumberUp = elem.GetAttribute("roundDirection").Equals("up"); + unitEquipItem.MutexGroup = equip.GetAttribute("exclusivityGroup"); + unitEquipItem.RoundNumberUp = equip.GetAttribute("roundDirection").Equals("up"); try diff -r cb3759c3ea19 -r bd2aaa9a61df api/Objects/Unit.cs --- a/api/Objects/Unit.cs Sat Aug 01 20:04:13 2009 +0000 +++ b/api/Objects/Unit.cs Sat Aug 01 21:40:53 2009 +0000 @@ -273,7 +273,7 @@ amount = 0; } - SetEquipmentAmount(equip, amount); + SetEquipmentAmount(equip, (double)amount); } public void SetEquipmentRatio(UnitEquipmentItem equip, double ratio)