Mercurial > repos > IBBoard.WarFoundry.GUI.WinForms

diff FrmMain.cs @ 193:eaa7b639d390

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fix build issues no-open-ticket
author IBBoard <dev@ibboard.co.uk>
date Sun, 03 Apr 2011 14:50:34 +0000
parents 70575ace029b
children 983d96be91f5
line wrap: on
line diff
--- a/FrmMain.cs	Wed Jan 26 20:25:49 2011 +0000
+++ b/FrmMain.cs	Sun Apr 03 14:50:34 2011 +0000
@@ -26,6 +26,7 @@
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.WarFoundry.API.Util;
 using IBBoard.WarFoundry.API.Savers;
+using IBBoard.WarFoundry.API.Savers.Xml;
 using IBBoard.WarFoundry.API.Factories;
 using IBBoard.WarFoundry.API.Factories.Xml;
 
@@ -162,7 +163,7 @@
 			WarFoundryLoader.GetDefault().AddLoadDirectory(new DirectoryInfo(Constants.ExecutablePath + Constants.DirectoryString + DefaultDataDir));
 			WarFoundryLoader.GetDefault().RegisterFactory(WarFoundryXmlFactory.GetFactory());
 			WarFoundryLoader.GetDefault().FileLoadingFinished += FileLoadingFinished;
-			WarFoundrySaver.SetFileSaver(new WarFoundryXmlSaver());
+			WarFoundrySaver.SetFileSaver(new WarFoundryXmlFileSaver());
 		}
 
 		private FrmArmyTree GetArmyTree()
@@ -189,11 +190,6 @@
 			ControlTranslator.TranslateComponents(components.Components);
 			ControlTranslator.TranslateComponent(openArmyDialog);
 			ControlTranslator.TranslateComponent(saveArmyDialog);
-            //make sure translations exist for gamesystem pointsnames
-            if (CurrentGameSystem != null)
-            {
-                CurrentGameSystem.LoadPointsSystemNames();
-            }
             //translate pointspanel and tooltip
             SetPointsPanelToolTipText();
             SetPointsPanelText();
@@ -826,7 +822,7 @@
 
 		private bool SaveCurrentArmyToFile(string filePath)
 		{
-			if (WarFoundrySaver.GetSaver().Save(CurrentArmy, filePath))
+            if (WarFoundrySaver.GetSaver().Save(filePath, CurrentArmy))
 			{
 				loadedFilePath = filePath;
 				miSaveArmy.Enabled = false;
@@ -885,7 +881,6 @@
 		{
 			SetAppTitle();
 			RemoveCategoryButtons();
-            newSystem.LoadPointsSystemNames();
 		}
 
 		private void FrmMain_ArmyChanged(Army oldArmy, Army newArmy)
@@ -1302,7 +1297,7 @@
 			}
 			else 
 			{
-                string pointsPanelText = String.Format(Translation.GetTranslation("statusPanelPoints"), CurrentArmy.Points, CurrentGameSystem.UsePointsName(CurrentArmy.Points), CurrentArmy.MaxPoints, CurrentGameSystem.UsePointsName(CurrentArmy.MaxPoints));
+                string pointsPanelText = String.Format(Translation.GetTranslation("statusPanelPoints"), CurrentArmy.Points, CurrentGameSystem.GetPointsName(CurrentArmy.Points), CurrentArmy.MaxPoints, CurrentGameSystem.GetPointsName(CurrentArmy.MaxPoints));
                 sbPointsPanel.Text = pointsPanelText;
 
 				if (CurrentArmy.Points>CurrentArmy.MaxPoints)