Simplify loading of classic games

Author: axx0

Civ2/Civ2Interface.cs

@@ -373,35 +373,24 @@ public IList<Ruleset> FindRuleSets(string[] searchPaths)
     public abstract bool IsButtonInOuterPanel { get; }
 
     public int InterfaceIndex { get; set; }
-    public IInterfaceAction HandleLoadClassicGame(GameData gameData)
-    {
-        ExpectedMaps = gameData.MapNoSecondaryMaps + 1;
-        Initialization.LoadGraphicsAssets(this);
-
-        var game = ClassicSaveLoader.LoadSave(gameData, MainApp.ActiveRuleSet, Initialization.ConfigObject.Rules);
-
-        Initialization.Start(game);
-        return DialogHandlers[LoadOk.Title].Show(this);
-    }
 
-    public IInterfaceAction HandleLoadScenario(GameData gameData, string scnName, string scnDirectory)
+    public IInterfaceAction HandleLoadScenario(IGame game, string scnName, string scnDirectory)
     {
-        ExpectedMaps = gameData.MapNoSecondaryMaps + 1;
+        ExpectedMaps = game.NoMaps;
         Initialization.LoadGraphicsAssets(this);
 
         var config = Initialization.ConfigObject;
-        config.TechParadigm = gameData.TechParadigm;
-        config.ScenarioName = gameData.ScenarioName;
-        config.CivNames = gameData.CivTribeName;
-        config.CivGenders = gameData.RulerGender;
-        config.LeaderNames = gameData.CivLeaderName;
-        config.StartingYear = gameData.StartingYear;
-        config.TurnYearIncrement = gameData.TurnYearIncrement;
-        config.DifficultyLevel = gameData.DifficultyLevel;
-        config.MaxTurns = gameData.MaxTurns;
-        config.CivsInPlay = gameData.CivsInPlay;
-
-        var game = ClassicSaveLoader.LoadScn(gameData, MainApp.ActiveRuleSet, config.Rules);
+        config.TechParadigm = game.ScenarioData.TechParadigm;
+        config.ScenarioName = game.ScenarioData.Name;
+        config.CivNames = game.AllCivilizations.Select(c => c.TribeName).ToArray();
+        config.CivGenders = game.AllCivilizations.Select(c => c.LeaderGender).ToArray();
+        config.LeaderNames = game.AllCivilizations.Select(c => c.LeaderName).ToArray();
+        config.StartingYear = game.ScenarioData.StartingYear;
+        config.TurnYearIncrement = game.ScenarioData.TurnYearIncrement;
+        config.DifficultyLevel = game.DifficultyLevel;
+        config.MaxTurns = game.ScenarioData.MaxTurns;
+        config.CivsInPlay = game.AllCivilizations.Select(c => c.Alive).ToArray(); ;
+
         Initialization.Start(game);
 
         var titleImage = "Title.gif";
@@ -433,6 +422,15 @@ public IInterfaceAction HandleLoadScenario(GameData gameData, string scnName, st
         return DialogHandlers[ScenarioLoadedDialog.Title].Show(this);
     }
 
+    public IInterfaceAction HandleLoadGame(IGame game, Civ2engine.Rules rules, Ruleset ruleset)
+    {
+        ExpectedMaps = game.NoMaps;
+        Initialization.LoadGraphicsAssets(this);
+
+        Initialization.Start(game);
+        return DialogHandlers[LoadOk.Title].Show(this);
+    }
+
     public IInterfaceAction InitNewGame(bool quickStart)
     {
         Initialization.LoadGraphicsAssets(this);
@@ -488,15 +486,4 @@ public string GetScientistName(int epoch)
     {
         return Labels.For(epoch < 3 ? LabelIndex.wisemen : LabelIndex.scientists);
     }
-
-    public IInterfaceAction HandleLoadGame(IGame game, Civ2engine.Rules rules, Ruleset ruleset)
-    {
-        
-        ExpectedMaps = game.NoMaps;
-        Initialization.LoadGraphicsAssets(this);
-        Initialization.LoadGraphicsAssets(this);
-
-        Initialization.Start(game);
-        return DialogHandlers[LoadOk.Title].Show(this);
-    }
 }

Civ2/Dialogs/FileDialogs/LoadScenario.cs

@@ -26,13 +26,6 @@ public override ICivDialogHandler UpdatePopupData(Dictionary<string, PopupBox?>
 
     protected override IInterfaceAction HandleFileSelection(string fileName, Dictionary<string, ICivDialogHandler> civDialogHandlers, Civ2Interface civ2Interface)
     {
-        var scnDirectory = Path.GetDirectoryName(fileName);
-        var root = Settings.SearchPaths.FirstOrDefault(p => scnDirectory.StartsWith(p)) ?? Settings.SearchPaths[0];
-        var scnName = Path.GetFileName(fileName);
-        GameData gameData = Read.ReadSavFile(File.ReadAllBytes(fileName));
-
-        var activeInterface = civ2Interface.MainApp.SetActiveRulesetFromFile(root, scnDirectory, gameData.ExtendedMetadata);
-
-        return activeInterface.HandleLoadScenario(gameData, scnName, scnDirectory);
+        return Civ2engine.SaveLoad.LoadGame.LoadFrom(fileName, civ2Interface.MainApp);
     }
 }