Cleanup

Author: Causeless

Source/Entities/Scene.cpp

@@ -847,22 +847,6 @@ int Scene::SaveData(std::string pathBase, bool doAsyncSaves) {
 	return 0;
 }
 
-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;
 

Source/Entities/Scene.h

@@ -9,6 +9,7 @@
 #include "Box.h"
 #include "Activity.h"
 #include "PathFinder.h"
+#include "SceneLayer.h"
 
 #include <array>
 #include <map>
@@ -25,11 +26,6 @@ namespace RTE {
 	class SceneObject;
 	class Deployment;
 
-	struct SceneLayerInfo {
-		std::string name;
-		std::unique_ptr<BITMAP> bitmap;
-	};
-
 	/// Contains everything that defines a complete scene.
 	class Scene : public Entity {
 
@@ -251,8 +247,8 @@ namespace RTE {
 		/// Anything below 0 is an error signal.
 		int SaveData(std::string pathBase, bool doAsyncSaves = true);
 
-		void ConstructSceneLayersFromBitmaps(std::vector<SceneLayerInfo>&& layerInfos);
-
+		// Gets copied bitmaps of our scene layers, for saving.
+		// @return A list of SceneLayerInfo including our name and a copied bitmap.
 		std::vector<SceneLayerInfo> GetCopiedSceneLayerBitmaps() const;
 
 		/// Saves preview bitmap for this scene.

Source/Entities/SceneLayer.cpp

@@ -199,26 +199,6 @@ 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 = nullptr;
-	}
-
-	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() {
 	if (m_MainBitmapOwned) {

Source/Entities/SceneLayer.h

@@ -11,6 +11,11 @@ namespace RTE {
 
 	struct BigTexture;
 
+	struct SceneLayerInfo {
+		std::string name;
+		std::unique_ptr<BITMAP> bitmap;
+	};
+
 	/// A scrolling layer of the Scene.
 	template <bool TRACK_DRAWINGS, bool STATIC_TEXTURE = false>
 	class SceneLayerImpl : public Entity {
@@ -80,11 +85,6 @@ namespace RTE {
 		/// @return This SceneLayer's ContentFile.
 		ContentFile& GetContentFile() { return m_BitmapFile; }
 
-		/// 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

@@ -165,23 +165,19 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 		mainStream->flush();
 		indexStream->flush();
 
-		// Ugly copies, but eh. todo - use a string stream that just gives us a raw buffer to grab at
-		std::string mainStreamAsString = mainStream->str();
-		std::string indexStreamAsString = indexStream->str();
+		std::string_view mainStreamView = mainStream->view();
+		std::string_view indexStreamView = indexStream->view();
 
 		zip_fileinfo zfi = {0};
 
 		zipOpenNewFileInZip(zippedSaveFile, "Index.ini", &zfi, nullptr, 0, nullptr, 0, nullptr, MZ_COMPRESS_METHOD_STORE, MZ_COMPRESS_LEVEL_FAST);
-		zipWriteInFileInZip(zippedSaveFile, indexStreamAsString.data(), indexStreamAsString.size());
+		zipWriteInFileInZip(zippedSaveFile, indexStreamView.data(), indexStreamView.size());
 		zipCloseFileInZip(zippedSaveFile);
 
 		zipOpenNewFileInZip(zippedSaveFile, "Save.ini", &zfi, nullptr, 0, nullptr, 0, nullptr, MZ_COMPRESS_METHOD_DEFLATE, MZ_COMPRESS_LEVEL_FAST);
-		zipWriteInFileInZip(zippedSaveFile, mainStreamAsString.data(), mainStreamAsString.size());
+		zipWriteInFileInZip(zippedSaveFile, mainStreamView.data(), mainStreamView.size());
 		zipCloseFileInZip(zippedSaveFile);
 
-		PALETTE palette;
-		get_palette(palette);
-
 		for (const SceneLayerInfo& layerInfo : *sceneLayerInfos)
 		{
 			// Save png into a memory buffer