From e7e51fbe0cbac0b79c04ab800b9dcdabe0df7042 Mon Sep 17 00:00:00 2001 From: Regalis Date: Sun, 9 Oct 2016 17:38:01 +0300 Subject: [PATCH] Saving times and map seeds are displayed correctly in the "load game" menu --- Subsurface/Source/GameSession/GameSession.cs | 4 +++- Subsurface/Source/Screens/MainMenuScreen.cs | 11 +---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Subsurface/Source/GameSession/GameSession.cs b/Subsurface/Source/GameSession/GameSession.cs index cc5fb63ea..dc3842065 100644 --- a/Subsurface/Source/GameSession/GameSession.cs +++ b/Subsurface/Source/GameSession/GameSession.cs @@ -334,10 +334,12 @@ namespace Barotrauma new XElement("Gamesession")); var now = DateTime.Now; - doc.Root.Add(new XAttribute("savetime", now.Hour + ":" + now.Minute + ", " + now.ToShortDateString())); + doc.Root.Add(new XAttribute("savetime", now.ToShortTimeString() + ", " + now.ToShortDateString())); doc.Root.Add(new XAttribute("submarine", submarine==null ? "" : submarine.Name)); + doc.Root.Add(new XAttribute("mapseed", Map.Seed)); + ((SinglePlayerMode)gameMode).Save(doc.Root); try diff --git a/Subsurface/Source/Screens/MainMenuScreen.cs b/Subsurface/Source/Screens/MainMenuScreen.cs index beb4d6e17..9625cd33c 100644 --- a/Subsurface/Source/Screens/MainMenuScreen.cs +++ b/Subsurface/Source/Screens/MainMenuScreen.cs @@ -417,16 +417,7 @@ namespace Barotrauma string saveTime = ToolBox.GetAttributeString(doc.Root, "savetime", "unknown"); - XElement modeElement = null; - foreach (XElement element in doc.Root.Elements()) - { - if (element.Name.ToString().ToLowerInvariant() != "gamemode") continue; - - modeElement = element; - break; - } - - string mapseed = ToolBox.GetAttributeString(modeElement, "mapseed", "unknown"); + string mapseed = ToolBox.GetAttributeString(doc.Root, "mapseed", "unknown"); GUIFrame saveFileFrame = new GUIFrame(new Rectangle((int)(saveList.Rect.Width + 20), 0, 200, 230), Color.Black*0.4f, GUI.Style, menuTabs[(int)Tab.LoadGame]); saveFileFrame.UserData = "savefileframe";