Save/load ini- need to do pngs next

Author: Causeless

Source/Managers/ActivityMan.cpp

@@ -84,18 +84,6 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 		return false;
 	}
 
-	// THIS BLOCK OF CODE NEEDS ZIPPIFIED!
-	/*
-	// TODO, save to a zip instead of a directory
-	std::filesystem::create_directory(g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/" + fileName);
-
-	if (scene->SaveData(c_UserScriptedSavesModuleName + "/" + fileName + "/Save") < 0) {
-		// This print is actually pointless because game will abort if it fails to save layer bitmaps. It stays here for now because in reality the game doesn't properly abort if the layer bitmaps fail to save. It is what it is.
-		g_ConsoleMan.PrintString("ERROR: Failed to save scene bitmaps while saving!");
-		return false;
-	}
-	*/
-
 	// We need a copy of our scene, because we have to do some fixup to remove PLACEONLOAD items and only keep the current MovableMan state.
 	std::unique_ptr<Scene> modifiableScene(dynamic_cast<Scene*>(scene->Clone()));
 
@@ -203,16 +191,33 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
 	m_SaveGameTask.wait();
 
-	// TODO- this needs to load a zip!
+	std::string saveFilePath = g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/" + fileName + ".ccsave";
 
-	std::string saveFilePath = g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/" + fileName + "/Save.ini";
-
-	if (!std::filesystem::exists(saveFilePath)) {
+	// load zip sav file
+	unzFile zippedSaveFile = unzOpen(saveFilePath.c_str());
+	if (!zippedSaveFile) {
 		RTEError::ShowMessageBox("Game loading failed! Make sure you have a saved game called \"" + fileName + "\"");
 		return false;
 	}
 
-	Reader reader(saveFilePath, true, nullptr, false);
+	unz_file_info info;
+	char* buffer;
+
+	unzLocateFile(zippedSaveFile, (fileName + ".ini").c_str(), nullptr);
+	unzOpenCurrentFile(zippedSaveFile);
+	unzGetCurrentFileInfo(zippedSaveFile, &info, nullptr, 0, nullptr, 0, nullptr, 0);
+	
+	buffer = (char*)malloc(info.uncompressed_size);
+	if (!buffer) {
+		// If this ever hits I've lost all faith in modern OSes, but alas when one is writing C, one must dance along
+		RTEError::ShowMessageBox("Catastrophic failure! Failed to allocate memory for savegame");
+		return false;
+	}
+
+	unzReadCurrentFile(zippedSaveFile, buffer, info.uncompressed_size);
+	unzCloseCurrentFile(zippedSaveFile);
+
+	Reader reader(std::make_unique<std::istringstream>(buffer), saveFilePath, true, nullptr, false);
 
 	std::unique_ptr<Scene> scene(std::make_unique<Scene>());
 	std::unique_ptr<GAScripted> activity(std::make_unique<GAScripted>());
@@ -246,6 +251,8 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
 	g_SceneMan.SetSceneToLoad(originalScenePresetName, placeObjectsIfSceneIsRestarted, placeUnitsIfSceneIsRestarted);
 
 	g_ConsoleMan.PrintString("SYSTEM: Game \"" + fileName + "\" loaded!");
+
+	free(buffer);
 	return true;
 }
 

Source/System/Reader.cpp

@@ -33,16 +33,16 @@ Reader::Reader(const std::string& fileName, bool overwrites, const ProgressCallb
 	Create(fileName, overwrites, progressCallback, failOK);
 }
 
-Reader::Reader(std::unique_ptr<std::istream>&& stream, bool overwrites, const ProgressCallback& progressCallback, bool failOK) {
+Reader::Reader(std::unique_ptr<std::istream>&& stream, const std::string& fileName, bool overwrites, const ProgressCallback& progressCallback, bool failOK) {
 	Clear();
-	Create(std::move(stream), overwrites, progressCallback, failOK);
+	Create(std::move(stream), fileName, overwrites, progressCallback, failOK);
 }
 
 int Reader::Create(const std::string& fileName, bool overwrites, const ProgressCallback& progressCallback, bool failOK) {
 	if (fileName.empty()) {
 		return -1;
 	}
-
+	
 	if (m_NonModulePath) {
 		m_FilePath = std::filesystem::path(fileName).generic_string();
 		// Associate non-module paths with Base to prevent implosions when dealing with creating Entities.
@@ -56,17 +56,36 @@ int Reader::Create(const std::string& fileName, bool overwrites, const ProgressC
 		m_DataModuleName = g_PresetMan.GetModuleNameFromPath(m_FilePath);
 		m_DataModuleID = g_PresetMan.GetModuleID(m_DataModuleName);
 	}
-
-	return Create(std::make_unique<std::ifstream>(m_FilePath), overwrites, progressCallback, failOK);
+	
+	return Create(std::make_unique<std::ifstream>(m_FilePath), fileName, overwrites, progressCallback, failOK);
 }
 
-int Reader::Create(std::unique_ptr<std::istream>&& stream, bool overwrites, const ProgressCallback& progressCallback, bool failOK) {
+int Reader::Create(std::unique_ptr<std::istream>&& stream, const std::string& fileName, bool overwrites, const ProgressCallback& progressCallback, bool failOK) {
+	// We redundantly do this following block of code in both constructors, which feels really ugly and lazy
+	if (fileName.empty()) {
+		return -1;
+	}
+
+	if (m_NonModulePath) {
+		m_FilePath = std::filesystem::path(fileName).generic_string();
+		// Associate non-module paths with Base to prevent implosions when dealing with creating Entities.
+		m_DataModuleName = "Base.rte";
+		m_DataModuleID = 0;
+	} else {
+		m_FilePath = g_PresetMan.GetFullModulePath(fileName);
+
+		// Extract the file name and module name from the path
+		m_FileName = m_FilePath.substr(m_FilePath.find_last_of("/\\") + 1);
+		m_DataModuleName = g_PresetMan.GetModuleNameFromPath(m_FilePath);
+		m_DataModuleID = g_PresetMan.GetModuleID(m_DataModuleName);
+	}
+
 	m_CanFail = failOK;
 
 	m_Stream = std::move(stream);
 
 	if (!m_CanFail) {
-		RTEAssert(System::PathExistsCaseSensitive(m_FilePath) && m_Stream->good(), "Failed to open data file \"" + m_FilePath + "\"!");
+		RTEAssert(m_Stream->good(), "Failed to open data file \"" + m_FilePath + "\"!");
 	}
 
 	m_OverwriteExisting = overwrites;

Source/System/Reader.h

@@ -31,7 +31,7 @@ namespace RTE {
 		/// @param overwrites Whether object definitions read here overwrite existing ones with the same names.
 		/// @param progressCallback A function pointer to a function that will be called and sent a string with information about the progress of this Reader's reading.
 		/// @param failOK Whether it's ok for the file to not be there, ie we're only trying to open, and if it's not there, then fail silently.
-		Reader(std::unique_ptr<std::istream>&& stream, bool overwrites = false, const ProgressCallback& progressCallback = nullptr, bool failOK = false);
+		Reader(std::unique_ptr<std::istream>&& stream, const std::string& fileName, bool overwrites = false, const ProgressCallback& progressCallback = nullptr, bool failOK = false);
 
 		/// Makes the Reader object ready for use.
 		/// @param fileName Path to the file to open for reading. If the file doesn't exist the stream will fail to open.
@@ -47,7 +47,7 @@ namespace RTE {
 		/// @param progressCallback A function pointer to a function that will be called and sent a string with information about the progress of this Reader's reading.
 		/// @param failOK Whether it's ok for the file to not be there, ie we're only trying to open, and if it's not there, then fail silently.
 		/// @return An error return value signaling success or any particular failure.  Anything below 0 is an error signal.
-		int Create(std::unique_ptr<std::istream>&& stream, bool overwrites = false, const ProgressCallback& progressCallback = nullptr, bool failOK = false);
+		int Create(std::unique_ptr<std::istream>&& stream, const std::string& fileName, bool overwrites = false, const ProgressCallback& progressCallback = nullptr, bool failOK = false);
 #pragma endregion
 
 #pragma region Getters and Setters

imgui.ini

@@ -0,0 +1,4 @@
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+