Scenario Number is used in game, do not change it

wait for better formulation

Author: chaserli

src/Misc/SavedGamesInSubdir.cpp

@@ -162,49 +162,59 @@ DEFINE_HOOK(0x67FD26, LoadOptionsClass_ReadSaveInfo_SGInSubdir, 0x5)
 	return 0;
 }
 
-//issue #18
-#define NEW_SAVEGAME_META_INFO
-#ifdef NEW_SAVEGAME_META_INFO
 #include <HouseClass.h>
 #include <AnimClass.h>
 
 namespace SavedGames
 {
-	// What do you need, man?
+	//issue #18
+	struct CampaignID
+	{
+		uint64_t Number;
+
+		explicit CampaignID() :
+			Number { SessionClass::IsCampaign() ? (uint64_t)Spawner::GetConfig()->CampaignID :  0 }
+		{
+		}
+
+		CampaignID(noinit_t()) { }
+	};
+
+	// More fun
 	struct ExtraMetaInfo
 	{
-		int CampaignID { -1 };
+		int CurrentFrame;
 		int PlayerCount;
 		int TechnoCount;
 		int AnimCount;
-		int CurrentFrame;
-		
+
 		explicit ExtraMetaInfo()
+			:CurrentFrame { Unsorted::CurrentFrame }
+			, PlayerCount { HouseClass::Array->Count }
+			, TechnoCount { TechnoClass::Array->Count }
+			, AnimCount { AnimClass::Array->Count }
 		{
-			if (SessionClass::IsCampaign())
-				CampaignID = Spawner::GetConfig()->CampaignID;
-			PlayerCount = HouseClass::Array->Count;
-			TechnoCount = TechnoClass::Array->Count;
-			AnimCount = AnimClass::Array->Count;
-			CurrentFrame = Unsorted::CurrentFrame;
 		}
+
+		ExtraMetaInfo(noinit_t()) { }
 	};
 
-	bool AppendExtraMetaInfo(IStorage* pStorage)
+	template<typename T>
+	bool AppendToStorage(IStorage* pStorage,const OLECHAR* name)
 	{
 		IStream* pStream = nullptr;
 		bool ret = false;
 		HRESULT hr = pStorage->CreateStream(
-			L"Spawner MetaInfo",
-			STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE,
+			name,
+			STGM_WRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE,
 			0,
 			0,
 			&pStream
 		);
 
 		if (SUCCEEDED(hr) && pStream != nullptr)
 		{
-			ExtraMetaInfo info {};
+			T info {};
 			ULONG written = 0;
 			hr = pStream->Write(&info, sizeof(info), &written);
 			ret = SUCCEEDED(hr) && written == sizeof(info);
@@ -213,31 +223,50 @@ namespace SavedGames
 
 		return ret;
 	}
+
+	/*
+	template<typename T>
+	bool ReadFromStorage(IStorage* pStorage, const OLECHAR* name)
+	{
+		IStream* pStream = nullptr;
+		bool ret = false;
+		HRESULT hr = pStorage->OpenStream(
+			name,
+			NULL,
+			STGM_READ | STGM_SHARE_EXCLUSIVE,
+			0,
+			&pStream
+		);
+
+		if (SUCCEEDED(hr) && pStream != nullptr)
+		{
+			T info;
+			ULONG read = 0;
+			hr = pStream->Read(&info, sizeof(info), &read);
+			ret = SUCCEEDED(hr) && read == sizeof(info);
+			pStream->Release();
+		}
+
+		return ret;
+	}
+	*/
 }
 
+// Write : A la fin
 DEFINE_HOOK(0x67D2E3, GameSave_AdditionalInfoForClient, 0x6)
 {
 	GET_STACK(IStorage*, pStorage, STACK_OFFSET(0x4A0, -0x490));
+	using namespace SavedGames;
 
-	if (pStorage && SavedGames::AppendExtraMetaInfo(pStorage))
+	if (pStorage
+		&& AppendToStorage<CampaignID>(pStorage, L"Campaign ID")
+		&& AppendToStorage<ExtraMetaInfo>(pStorage, L"Spawner extra info")
+		)
 		Debug::Log("[Spawner] Extra meta info appended on sav file\n");
 	else
 		Debug::Log("[Spawner] Cannot write extra meta info to sav file\n");
 
 	return 0;
 }
-
-#else
-
-DEFINE_HOOK(0x67D04E, GameSave_SavegameInformation, 0x7)
-{
-	REF_STACK(SavegameInformation, Info, STACK_OFFSET(0x4A4, -0x3F4));
-
-	//Are you sure this is unused when spawner active? I don't think so
-	Info.ScenarioNumber = SessionClass::IsCampaign() ? Spawner::GetConfig()->CampaignID : -1;
-
-	return 0;
-}
-
-DEFINE_JUMP(LJMP, 0x681AF1, 0x681B30);// skip reading ScenarioNumber
-#endif
+// Read : TODO
+// TODO : the requirement and solution on the client side needs better formulation