Progress towards loading, need to fix up unseen layers

Author: Causeless

Source/Entities/SLTerrain.h

@@ -90,6 +90,14 @@ namespace RTE {
 		/// @param layerToDraw The layer that should be drawn. See LayerType enumeration.
 		void SetLayerToDraw(LayerType layerToDraw) { m_LayerToDraw = layerToDraw; }
 
+		/// Gets the foreground scenelayer of this SLTerrain.
+		/// @return A pointer to the foreground scenelayer.
+		SceneLayer* GetFGSceneLayer() { return m_FGColorLayer.get(); }
+
+		/// Gets the background scenelayer of this SLTerrain.
+		/// @return A pointer to the background scenelayer.
+		SceneLayer* GetBGSceneLayer() { return m_BGColorLayer.get(); }
+
 		/// Gets the foreground color bitmap of this SLTerrain.
 		/// @return A pointer to the foreground color bitmap.
 		BITMAP* GetFGColorBitmap() { return m_FGColorLayer->GetBitmap(); m_FGColorLayer->SetUpdated(); }

Source/Entities/Scene.cpp

@@ -847,7 +847,23 @@ int Scene::SaveData(std::string pathBase, bool doAsyncSaves) {
 	return 0;
 }
 
-std::vector<SceneLayerInfo> Scene::GetCopiedSceneLayerBitmaps() {
+void Scene::ConstructSceneLayersFromBitmaps(std::vector<SceneLayerInfo>&& layerInfos) {
+	for (SceneLayerInfo& sceneLayerInfo : layerInfos) {
+		if (sceneLayerInfo.name == "Mat") {
+			m_pTerrain->LoadDataFromBitmap(sceneLayerInfo.bitmap.release());
+		} else if (sceneLayerInfo.name == "FG") {
+			m_pTerrain->GetFGSceneLayer()->LoadDataFromBitmap(sceneLayerInfo.bitmap.release());
+		} else if (sceneLayerInfo.name == "BG") {
+			m_pTerrain->GetBGSceneLayer()->LoadDataFromBitmap(sceneLayerInfo.bitmap.release());
+		} else {
+			char endCh = sceneLayerInfo.name.back();
+			int team = endCh - '0';
+			m_apUnseenLayer[team]->LoadDataFromBitmap(sceneLayerInfo.bitmap.release());
+		}
+	}
+}
+
+std::vector<SceneLayerInfo> Scene::GetCopiedSceneLayerBitmaps() const {
 	std::vector<SceneLayerInfo> layerInfos;
 
 	// Save Terrain's data

Source/Entities/Scene.h

@@ -251,7 +251,9 @@ namespace RTE {
 		/// Anything below 0 is an error signal.
 		int SaveData(std::string pathBase, bool doAsyncSaves = true);
 
-		std::vector<SceneLayerInfo> GetCopiedSceneLayerBitmaps();
+		void ConstructSceneLayersFromBitmaps(std::vector<SceneLayerInfo>&& layerInfos);
+
+		std::vector<SceneLayerInfo> GetCopiedSceneLayerBitmaps() const;
 
 		/// Saves preview bitmap for this scene.
 		/// @param bitmapPath The full filepath the where to save the Bitmap data.

Source/Entities/SceneLayer.cpp

@@ -199,6 +199,25 @@ void SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::InitScrollRatios(bool initF
 	m_ScaledDimensions.SetXY(mainBitmapWidth * m_ScaleFactor.GetX(), mainBitmapHeight * m_ScaleFactor.GetY());
 }
 
+template <bool TRACK_DRAWINGS, bool STATIC_TEXTURE>
+int SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::LoadDataFromBitmap(BITMAP* bitmap) {
+	if (m_MainBitmapOwned) {
+		destroy_bitmap(m_MainBitmap);
+	}
+
+	m_MainBitmap = bitmap;
+	m_MainBitmapOwned = true;
+
+	m_BackBitmap = create_bitmap_ex(bitmap_color_depth(m_MainBitmap), m_MainBitmap->w, m_MainBitmap->h);
+	if constexpr (!STATIC_TEXTURE) {
+		m_MainTexture = std::make_unique<BigTexture>(m_MainBitmap);
+	}
+	m_LastClearColor = ColorKeys::g_InvalidColor;
+
+	InitScrollRatios();
+	return 0;
+}
+
 template <bool TRACK_DRAWINGS, bool STATIC_TEXTURE>
 int SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::LoadData() {
 	// Load from disk and take ownership. Don't cache because the bitmap will be modified.

Source/Entities/SceneLayer.h

@@ -76,6 +76,11 @@ namespace RTE {
 		/// @return Whether this SceneLayer's bitmap data was loaded from a file or not.
 		virtual bool IsLoadedFromDisk() const { return !m_BitmapFile.GetDataPath().empty(); }
 
+		/// Loads previously specified/created data into memory from an existing BITMAP. Has to be done before using this SceneLayer if the bitmap was not generated at runtime.
+		/// @param bitmap Pointer to the bitmap to take. Takes ownership!
+		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.
+		virtual int LoadDataFromBitmap(BITMAP* bitmap);
+
 		/// Loads previously specified/created data into memory. Has to be done before using this SceneLayer if the bitmap was not generated at runtime.
 		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.
 		virtual int LoadData();

Source/Managers/ActivityMan.cpp

@@ -201,21 +201,24 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
 	}
 
 	unz_file_info info;
-	char* buffer;
+	char* buffer = nullptr;
 
-	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;
-	}
+	auto unzipFileIntoBuffer = [&](std::string fullFileName) {
+		unzLocateFile(zippedSaveFile, fullFileName.c_str(), nullptr);
+		unzOpenCurrentFile(zippedSaveFile);
+		unzGetCurrentFileInfo(zippedSaveFile, &info, nullptr, 0, nullptr, 0, nullptr, 0);
 
-	unzReadCurrentFile(zippedSaveFile, buffer, info.uncompressed_size);
-	unzCloseCurrentFile(zippedSaveFile);
+		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");
+		}
+
+		unzReadCurrentFile(zippedSaveFile, buffer, info.uncompressed_size);
+		unzCloseCurrentFile(zippedSaveFile);
+	};
+
+	unzipFileIntoBuffer(fileName + ".ini");
 
 	Reader reader(std::make_unique<std::istringstream>(buffer), saveFilePath, true, nullptr, false);
 
@@ -240,6 +243,10 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
 		}
 	}
 
+	free(buffer);
+
+	int numberOfTeams = activity->m_TeamCount;
+
 	// SetSceneToLoad() doesn't Clone(), but when the Activity starts, it will eventually call LoadScene(), which does a Clone() of scene internally.
 	g_SceneMan.SetSceneToLoad(scene.get(), true, true);
 	// Saved Scenes get their presetname set to their filename to ensure they're separate from the preset Scene they're based off of.
@@ -250,9 +257,34 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
 	// When this method exits, our Scene object will be destroyed, which will cause problems if you try to restart it. To avoid this, set the Scene to load to the preset object with the same name.
 	g_SceneMan.SetSceneToLoad(originalScenePresetName, placeObjectsIfSceneIsRestarted, placeUnitsIfSceneIsRestarted);
 
-	g_ConsoleMan.PrintString("SYSTEM: Game \"" + fileName + "\" loaded!");
+	// Replace our scene images with the ones from the zip
+	std::vector<SceneLayerInfo> layerInfos;
 
+	PALETTE palette;
+	get_palette(palette);
+
+	unzipFileIntoBuffer(fileName + " Mat.png");
+	layerInfos.emplace_back("Mat", std::unique_ptr<BITMAP>(load_memory_png(buffer, info.uncompressed_size, palette)));
+	free(buffer);
+
+	unzipFileIntoBuffer(fileName + " FG.png");
+	layerInfos.emplace_back("FG",  std::unique_ptr<BITMAP>(load_memory_png(buffer, info.uncompressed_size, palette)));
 	free(buffer);
+
+	unzipFileIntoBuffer(fileName + " BG.png");
+	layerInfos.emplace_back("BG",  std::unique_ptr<BITMAP>(load_memory_png(buffer, info.uncompressed_size, palette)));
+	free(buffer);
+
+	for (int i = 0; i < numberOfTeams; ++i) {
+		unzipFileIntoBuffer(fileName + std::format(" T%i.png", i));
+		layerInfos.emplace_back(std::format("T%i", i), std::unique_ptr<BITMAP>(load_memory_png(buffer, info.uncompressed_size, palette)));
+		free(buffer);
+	}
+
+	g_SceneMan.GetScene()->ConstructSceneLayersFromBitmaps(std::move(layerInfos));
+	
+	g_ConsoleMan.PrintString("SYSTEM: Game \"" + fileName + "\" loaded!");
+
 	return true;
 }