changeset 414:fceddbff47ee

Re #341: Wrong default army size * Merge branch (should use bookmarks instead for short-lived branches)
author IBBoard <dev@ibboard.co.uk>
date Sun, 21 Aug 2011 21:03:24 +0100
parents cbe69734f48f (current diff) 5733e3b957cc (diff)
children 131fb56da842
files
diffstat 2 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sun Aug 21 21:03:24 2011 +0100
@@ -0,0 +1,4 @@
+obj/*
+bin/*
+IBBoard.WarFoundry.API.suo
+IBBoard.WarFoundry.API.pidb
\ No newline at end of file
--- a/API/Objects/GameSystem.cs	Sun Aug 14 00:58:02 2011 +0000
+++ b/API/Objects/GameSystem.cs	Sun Aug 21 21:03:24 2011 +0100
@@ -13,18 +13,17 @@
 	/// </summary>
 	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<string, Category> categories = new Dictionary<string, Category>();
 		private Dictionary<string, SystemStats> stats = new Dictionary<string, SystemStats>();
-		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<string, SystemStats>();
-			defaultStats = "";
+			//Do nothing special
 		}
 
 		public int SystemArmyDefaultSize