Added activity/scene/date info

Author: Causeless

Menus/SaveLoadMenuGUI.cpp

@@ -6,6 +6,7 @@
 
 #include "GUI.h"
 #include "AllegroScreen.h"
+#include "GAScripted.h"
 #include "GUIInputWrapper.h"
 #include "GUICollectionBox.h"
 #include "GUILabel.h"
@@ -40,6 +41,7 @@ namespace RTE {
 		m_BackToMainButton->SetPositionAbs((rootBox->GetWidth() - m_BackToMainButton->GetWidth()) / 2, saveGameMenuBox->GetYPos() + saveGameMenuBox->GetHeight() + 10);
 
 		m_SaveGamesListBox = dynamic_cast<GUIListBox *>(m_GUIControlManager->GetControl("ListBoxSaveGames"));
+		m_SaveGamesListBox->SetFont(m_GUIControlManager->GetSkin()->GetFont("FontConsoleMonospace.png"));
 		m_SaveGamesListBox->SetMouseScrolling(true);
 		m_SaveGamesListBox->SetScrollBarThickness(15);
 		m_SaveGamesListBox->SetScrollBarPadding(2);
@@ -56,26 +58,76 @@ namespace RTE {
 
 	void SaveLoadMenuGUI::PopulateSaveGamesList() {
 		m_SaveGames.clear();
-		m_SaveGamesListBox->ClearList();
 
 		std::string saveFilePath = g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/";
 		for (const auto &entry : std::filesystem::directory_iterator(saveFilePath)) {
 			if (entry.path().extension() == ".ini" && entry.path().filename() != "Index.ini") {
 				SaveRecord record;
-				record.SaveName = entry.path().stem().string();
+				record.SavePath = entry.path();
 				record.SaveDate = entry.last_write_time();
 				m_SaveGames.push_back(record);
 			}
 		}
 
+		std::for_each(std::execution::par_unseq,
+			m_SaveGames.begin(), m_SaveGames.end(),
+			[](SaveRecord &record) {
+				Reader reader(record.SavePath.string(), true, nullptr, true);
+
+				bool readActivity = false;
+				bool readSceneName = false;
+
+				GAScripted activity;
+
+				std::string originalScenePresetName;
+				while (reader.NextProperty()) {
+					std::string propName = reader.ReadPropName();
+					if (propName == "Activity") {
+						reader >> activity;
+						readActivity = true;
+					} else if (propName == "OriginalScenePresetName") {
+						reader >> originalScenePresetName;
+						readSceneName = true;
+					}
+
+					if (readActivity && readSceneName) {
+						break;
+					}
+				}
+
+				record.Activity = activity.GetPresetName();
+				record.Scene = originalScenePresetName;
+			});
+
+		m_SaveGamesFetched = true;
+		UpdateSaveGamesGUIList();
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void SaveLoadMenuGUI::UpdateSaveGamesGUIList()
+	{
 		std::sort(m_SaveGames.begin(), m_SaveGames.end());
 
+		m_SaveGamesListBox->ClearList();
 		for (int i = 0; i < m_SaveGames.size(); i++) {
-			m_SaveGamesListBox->AddItem(m_SaveGames.at(i).SaveName, std::string(), nullptr, nullptr, i);
+			const SaveRecord &save = m_SaveGames[i];
+
+			std::stringstream saveNameText;
+			saveNameText << std::left << std::setfill(' ') << std::setw(32) << save.SavePath.stem().string();
+
+			// This is so much more fucking difficult than it has any right to be
+			const auto saveFsTime = std::chrono::clock_cast<std::chrono::system_clock>(save.SaveDate);
+			const auto saveTime = std::chrono::system_clock::to_time_t(saveFsTime);
+			const auto saveTimeLocal = std::localtime(&saveTime);
+
+			std::stringstream saveDateTimeText;
+			saveDateTimeText << std::put_time(saveTimeLocal, "%Y-%m-%d %X");
+
+			m_SaveGamesListBox->AddItem(" " + saveNameText.str() + "" + save.Scene + " - " + save.Activity + "", saveDateTimeText.str() + " ", nullptr, nullptr, i);
 		}
 
 		m_SaveGamesListBox->ScrollToTop();
-		m_SaveGamesFetched = true;
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -127,7 +179,7 @@ namespace RTE {
 				if (guiEvent.GetControl() == m_SaveGamesListBox && (guiEvent.GetMsg() == GUIListBox::Select && m_SaveGamesListBox->GetSelectedIndex() > -1)) {
 					const SaveRecord &record = m_SaveGames.at(m_SaveGamesListBox->GetSelected()->m_ExtraIndex);
 					//m_DescriptionLabel->SetText(record.GetDisplayString());
-					m_SaveGameName->SetText(record.SaveName);
+					m_SaveGameName->SetText(record.SavePath.stem().string());
 				}
 			}
 		}

Menus/SaveLoadMenuGUI.h

@@ -48,8 +48,10 @@ namespace RTE {
 		/// Struct containing information about a valid Savegame.
 		/// </summary>
 		struct SaveRecord {
-			std::string SaveName; //!< Savegame name.
-			std::filesystem::file_time_type SaveDate; //!< Savegame last modified date.
+			std::filesystem::path SavePath; //!< Savegame filepath.
+			std::filesystem::file_time_type SaveDate; //!< Last modified date.
+			std::string Activity; //!< The activity name.
+			std::string Scene; //!< The scene name.
 
 			bool operator<(const SaveRecord &rhs) const { return SaveDate > rhs.SaveDate; }
 		};
@@ -78,10 +80,15 @@ namespace RTE {
 		bool ListsFetched() const { return m_SaveGamesFetched; }
 
 		/// <summary>
-		/// Fills the SaveGames list with all valid savegames, then fills the SaveGamesListBox using it.
+		/// Fills the SaveGames list with all valid savegames.
 		/// </summary>
 		void PopulateSaveGamesList();
 
+		/// <summary>
+		/// Updates the SaveGamesListBox GUI.
+		/// </summary>
+		void UpdateSaveGamesGUIList();
+
 		/// <summary>
 		/// Loads the currently selected savefile.
 		/// </summary>