Merge remote-tracking branch 'source/zip-save-files' into zip-save-files

Author: traunts

Entities/Scene.cpp

@@ -1068,6 +1068,29 @@ int Scene::SaveData(std::string pathBase, bool doAsyncSaves)
     return 0;
 }
 
+std::vector<SceneLayerInfo> Scene::GetCopiedSceneLayerBitmaps() {
+    std::vector<SceneLayerInfo> layerInfos;
+
+    /*
+    // Save Terrain's data
+    m_pTerrain
+
+    // Don't bother saving background layers to disk, as they are never altered
+
+    // Save unseen layers' data
+    char str[64];
+    for (int team = Activity::TeamOne; team < Activity::MaxTeamCount; ++team)
+    {
+        if (m_apUnseenLayer[team])
+        {
+            m_apUnseenLayer[team]
+        }
+    }
+    */
+
+    return layerInfos;
+}
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  SavePreview

Entities/Scene.h

@@ -32,6 +32,11 @@ class BunkerAssembly;
 class SceneObject;
 class Deployment;
 
+struct SceneLayerInfo {
+    std::string name;
+    std::unique_ptr<BITMAP> bitmap;
+};
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Class:           Scene
@@ -403,6 +408,8 @@ EntityAllocation(Scene)
 
 	int SaveData(std::string pathBase, bool doAsyncSaves = true);
 
+    std::vector<SceneLayerInfo> GetCopiedSceneLayerBitmaps();
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  SavePreview

Entities/SceneLayer.cpp

@@ -230,6 +230,18 @@ namespace RTE {
 		return 0;
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	template <bool TRACK_DRAWINGS>
+	std::unique_ptr<BITMAP> SceneLayerImpl<TRACK_DRAWINGS>::CopyBitmap() {
+		BITMAP* outputBitmap = create_bitmap_ex(bitmap_color_depth(m_MainBitmap), m_MainBitmap->w, m_MainBitmap->h);
+		if (m_MainBitmap) {
+			outputBitmap = create_bitmap_ex(bitmap_color_depth(m_MainBitmap), m_MainBitmap->w, m_MainBitmap->h);
+			blit(m_MainBitmap, outputBitmap, 0, 0, 0, 0, m_MainBitmap->w, m_MainBitmap->h);
+		}
+		return std::unique_ptr<BITMAP>(outputBitmap);
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	template <bool TRACK_DRAWINGS>

Entities/SceneLayer.h

@@ -112,6 +112,12 @@ namespace RTE {
 		/// </summary>
 		/// <returns>An error return value signaling success or any particular failure. Anything below 0 is an error signal.</returns>
 		virtual int ClearData();
+
+		/// <summary>
+		/// Copies the bitmap.
+		/// </summary>
+		/// <returns>The copied bitmap.</returns>
+		std::unique_ptr<BITMAP> CopyBitmap();
 #pragma endregion
 
 #pragma region Getters and Setters

Managers/ActivityMan.cpp

@@ -27,6 +27,8 @@
 #include "MultiplayerServerLobby.h"
 #include "MultiplayerGame.h"
 
+#include "zip.h"
+#include "unzip.h"
 
 namespace RTE {
 
@@ -110,8 +112,17 @@ namespace RTE {
 		modifiableScene->GetTerrain()->SetPresetName(fileName);
 		modifiableScene->GetTerrain()->MigrateToModule(g_PresetMan.GetModuleID(c_UserScriptedSavesModuleName));
 
+		// Create zip sav file
+		zipFile zippedSaveFile = zipOpen((g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/" + fileName + ".ccsave").c_str(), APPEND_STATUS_CREATE);
+		if (!zippedSaveFile) {
+			g_ConsoleMan.PrintString("ERROR: Couldn't create zip save file!");
+			return false;
+		}
+
+		std::unique_ptr<std::stringstream> iniStream = std::make_unique<std::stringstream>();
+
 		// Block the main thread for a bit to let the Writer access the relevant data.
-		std::unique_ptr<Writer> writer(std::make_unique<Writer>(g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/" + fileName + "/Save.ini"));
+		std::unique_ptr<Writer> writer(std::make_unique<Writer>(std::move(iniStream)));
 		writer->NewPropertyWithValue("Activity", activity);
 
 		// Pull all stuff from MovableMan into the Scene for saving, so existing Actors/ADoors are saved, without transferring ownership, so the game can continue.
@@ -128,8 +139,22 @@ namespace RTE {
 		writer->NewPropertyWithValue("PlaceUnitsIfSceneIsRestarted", g_SceneMan.GetPlaceUnitsOnLoad());
 		writer->NewPropertyWithValue("Scene", modifiableScene.get());
 
-		auto saveWriterData = [](Writer* writerToSave) {
-			writerToSave->EndWrite();
+		auto saveWriterData = [&](Writer* writerToSave) {
+			std::stringstream *stream = static_cast<std::stringstream *>(writerToSave->GetStream());
+			stream->flush();
+
+			// Ugly copies, but eh. todo - use a string stream that just gives us a raw buffer to grab at
+			std::string streamAsString = stream->str();
+
+			zip_fileinfo zfi = { 0 };
+
+			const int defaultCompression = 6;
+			zipOpenNewFileInZip(zippedSaveFile, (fileName + ".ini").c_str(), &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED, defaultCompression);
+			zipWriteInFileInZip(zippedSaveFile, streamAsString.data(), streamAsString.size());
+			zipCloseFileInZip(zippedSaveFile);
+
+			zipClose(zippedSaveFile, fileName.c_str());
+
 			delete writerToSave;
 		};
 

Menus/SaveLoadMenuGUI.cpp

@@ -84,18 +84,18 @@ namespace RTE {
 
 		std::string saveFilePath = g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/";
 		for (const auto &entry : std::filesystem::directory_iterator(saveFilePath)) {
-			if (entry.is_directory()) {
+			if (entry.path().extension() == ".ccsave" && entry.path().filename() != "Index.ini") {
 				SaveRecord record;
 				record.SavePath = entry.path();
-				record.SaveDate = std::filesystem::last_write_time(entry.path() / "Save.ini");
+				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() + "/Save.ini", true, nullptr, true);
+				Reader reader(record.SavePath.string(), true, nullptr, true);
 
 				bool readActivity = false;
 				bool readSceneName = false;
@@ -202,9 +202,9 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void SaveLoadMenuGUI::DeleteSave() {
-		std::string saveFilePath = g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/" + m_SaveGameName->GetText();
+		std::string saveFilePath = g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/" + m_SaveGameName->GetText() + ".ccsave";
 
-		std::filesystem::remove_all(saveFilePath);
+		std::filesystem::remove(saveFilePath);
 		g_GUISound.ConfirmSound()->Play();
 
 		PopulateSaveGamesList();

System/Writer.h

@@ -126,6 +126,11 @@ namespace RTE {
 		/// <returns>Whether the writer is ready to start accepting data streamed to it or not.</returns>
 		bool WriterOK() const { return m_Stream.get() && m_Stream->good(); }
 
+		/// <summary>
+		/// Returns the underlying stream.
+		/// </summary>
+		std::ostream * GetStream() { return m_Stream.get(); }
+
 		/// <summary>
 		/// Flushes and closes the output stream of this Writer. This happens automatically at destruction but needs to be called manually if a written file must be read from in the same scope.
 		/// </summary>

external/sources/allegro 4.4.3.1-custom/addons/loadpng/loadpng.h

@@ -66,6 +66,9 @@ APNG_FUNC(BITMAP *, load_memory_png, (AL_CONST void *buffer, int buffer_size, RG
 /* Save a bitmap to disk in PNG format. */
 APNG_FUNC(int, save_png, (AL_CONST char *filename, BITMAP *bmp, AL_CONST RGB *pal));
 
+/* Save a bitmap to a PACKFILE in PNG format. */
+APNG_FUNC(int, save_png_pf, (PACKFILE *pack, BITMAP *bmp, AL_CONST RGB *pal));
+
 /* Adds `PNG' to Allegro's internal file type table.
  * You can then just use load_bitmap and save_bitmap as usual.
  */

external/sources/allegro 4.4.3.1-custom/addons/loadpng/savepng.c

@@ -313,3 +313,17 @@ int save_png(AL_CONST char *filename, BITMAP *bmp, AL_CONST RGB *pal)
 
     return result;
 }
+
+int save_png_pf(PACKFILE *pack, BITMAP *bmp, AL_CONST RGB *pal)
+{
+    int result;
+
+    ASSERT(pack);
+    ASSERT(bmp);
+    
+    acquire_bitmap(bmp);
+    result = really_save_png(pack, bmp, pal);
+    release_bitmap(bmp);
+
+    return result;
+}