# HG changeset patch # User IBBoard # Date 1314302795 -3600 # Node ID 204e6de932323137988625091855b4e420d62ece # Parent dee3dcb72acf6766cf35d77ed3921f6fec48532c# Parent 5733e3b957cc41b9983113aa1b5e37782e7bded2 Re #341:Default army size 0 * Merge size fix into default diff -r dee3dcb72acf -r 204e6de93232 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Thu Aug 25 21:06:35 2011 +0100 @@ -0,0 +1,4 @@ +obj/* +bin/* +IBBoard.WarFoundry.API.suo +IBBoard.WarFoundry.API.pidb \ No newline at end of file diff -r dee3dcb72acf -r 204e6de93232 API/Objects/GameSystem.cs --- a/API/Objects/GameSystem.cs Thu Aug 25 21:05:49 2011 +0100 +++ b/API/Objects/GameSystem.cs Thu Aug 25 21:06:35 2011 +0100 @@ -13,18 +13,17 @@ /// public class GameSystem : WarFoundryStagedLoadingObject { - private static int SYSTEM_DEFAULT_ARMY_SIZE = 1000; - private bool warnOnError; - private bool allowAllies; + private static readonly int SYSTEM_DEFAULT_ARMY_SIZE = 1000; + private bool warnOnError = true; + private bool allowAllies = false; private Dictionary categories = new Dictionary(); private Dictionary stats = new Dictionary(); - private string defaultStats; - private int defaultArmySize; + private string defaultStats = ""; + private int defaultArmySize = SYSTEM_DEFAULT_ARMY_SIZE; public GameSystem(string systemID, string systemName, IWarFoundryFactory creatingFactory) : base(systemID, systemName, creatingFactory) { - stats = new Dictionary(); - defaultStats = ""; + //Do nothing special } public int SystemArmyDefaultSize