MP S&L and AutoSave

README.md

@@ -21,8 +21,16 @@ Credits
 - **[Kerbiter (Metadorius)](https://github.com/Metadorius)**
   - Further maintenance
   - Event verification checks
+  - Save button for multiplayer pause menu
+  - Beacon crash fix for multiplayer save/load
+- **[TaranDahl](https://github.com/TaranDahl)**
+  - Porting of multiplayer save/load
+  - Porting of autosaves
 - **[Rampastring](https://github.com/Rampastring)**
   - Original event verification checks
+- **[Vinifera](https://github.com/Vinifera-Developers/Vinifera) Contributors and [TS Patches](https://github.com/CnCNet/ts-patches) Contributors**
+  - Original TS implementation of multiplayer save/load
+  - Original TS implementation of autosaves
 - **[CnCNet](https://github.com/CnCNet) Contributors** - the [original spawner](https://github.com/CnCNet/yr-patches)
 - **[Ares](https://github.com/Ares-Developers/Ares) and [Phobos](https://github.com/Phobos-developers/Phobos) Contributors** - [YRpp](https://github.com/Phobos-developers/yrpp) and [Syringe](https://github.com/Ares-Developers/Syringe) which are used and some code snippets
 

Spawner.vcxproj

@@ -17,6 +17,8 @@
   <!-- Compiled files -->
   <ItemGroup>
     <!-- Root -->
+    <ClCompile Include="src\UI\Dialogs.cpp" />
+    <ClCompile Include="src\UI\Hooks.cpp" />
     <ResourceCompile Include="$(ThisDir)\src\version.rc" />
     <ClCompile Include="$(ThisDir)\src\Main.cpp" />
     <ClCompile Include="$(ThisDir)\src\Main.Config.cpp" />
@@ -63,6 +65,8 @@
     <!-- Utilities -->
     <ClCompile Include="$(ThisDir)\src\Utilities\Debug.cpp" />
     <ClCompile Include="$(ThisDir)\src\Utilities\Patch.cpp" />
+    <!-- Dialogs -->
+    <ResourceCompile Include="$(ThisDir)\src\UI\MultiplayerGameOptionsDialog.rc" />
   </ItemGroup>
   <!-- Header files -->
   <ItemGroup>
@@ -76,6 +80,7 @@
     <!-- CnCNetYR -->
     <ClInclude Include="$(ThisDir)\src\CnCNetYR\Ra2Mode.h" />
     <!-- Misc -->
+    <ClInclude Include="$(ThisDir)\src\UI\Dialogs.h" />
     <!-- Spawner -->
     <ClInclude Include="$(ThisDir)\src\Spawner\NetHack.h" />
     <ClInclude Include="$(ThisDir)\src\Spawner\ProtocolZero.h" />

src/Ext/Event/Body.cpp

@@ -19,6 +19,7 @@
 
 #include "Body.h"
 #include <Spawner/ProtocolZero.h>
+#include <Spawner/Spawner.h>
 
 #include <Helpers/Macro.h>
 #include <EventClass.h>

src/Spawner/Spawner.Config.cpp

@@ -52,10 +52,14 @@ void SpawnerConfig::LoadFromINIFile(CCINIClass* pINI)
 			MultiByteToWideChar(CP_UTF8, 0, Main::readBuffer, strlen(Main::readBuffer), UIGameMode, std::size(UIGameMode));
 	}
 
-	// SaveGame Options
-	LoadSaveGame     = pINI->ReadBool(pSettingsSection, "LoadSaveGame", LoadSaveGame);
-	/* SavedGameDir */ pINI->ReadString(pSettingsSection, "SavedGameDir", SavedGameDir, SavedGameDir, sizeof(SavedGameDir));
-	/* SaveGameName */ pINI->ReadString(pSettingsSection, "SaveGameName", SaveGameName, SaveGameName, sizeof(SaveGameName));
+	{// SaveGame Options
+		LoadSaveGame = pINI->ReadBool(pSettingsSection, "LoadSaveGame", LoadSaveGame);
+		/* SavedGameDir   */ pINI->ReadString(pSettingsSection, "SavedGameDir", SavedGameDir, SavedGameDir, sizeof(SavedGameDir));
+		/* SaveGameName   */ pINI->ReadString(pSettingsSection, "SaveGameName", SaveGameName, SaveGameName, sizeof(SaveGameName));
+		AutoSaveCount = pINI->ReadInteger(pSettingsSection, "AutoSaveCount", AutoSaveCount);
+		AutoSaveInterval = pINI->ReadInteger(pSettingsSection, "AutoSaveInterval", AutoSaveInterval);
+		NextAutoSaveNumber = pINI->ReadInteger(pSettingsSection, "NextAutoSaveNumber", NextAutoSaveNumber);
+	}
 
 	{ // Scenario Options
 		Seed             = pINI->ReadInteger(pSettingsSection, "Seed", Seed);

src/Spawner/Spawner.Config.h

@@ -94,6 +94,9 @@ class SpawnerConfig
 	bool LoadSaveGame;
 	char SavedGameDir[MAX_PATH]; // Nested paths are also supported, e.g. "Saved Games\\Yuri's Revenge"
 	char SaveGameName[60];
+	int AutoSaveCount;
+	int AutoSaveInterval;
+	int NextAutoSaveNumber;
 
 	// Scenario Options
 	int  Seed;
@@ -161,6 +164,9 @@ class SpawnerConfig
 		, LoadSaveGame { false }
 		, SavedGameDir { "Saved Games" }
 		, SaveGameName { "" }
+		, AutoSaveCount { 5 }
+		, AutoSaveInterval { 7200 }
+		, NextAutoSaveNumber { 0 }
 
 		// Scenario Options
 		, Seed { 0 }

src/Spawner/Spawner.Hook.cpp

@@ -22,8 +22,10 @@
 
 #include <HouseClass.h>
 #include <SessionClass.h>
+#include <BeaconManagerClass.h>
 #include <Utilities/Debug.h>
 #include <Utilities/Macro.h>
+#include <Unsorted.h>
 
 DEFINE_HOOK(0x6BD7C5, WinMain_SpawnerInit, 0x6)
 {
@@ -179,3 +181,57 @@ DEFINE_HOOK(0x4FC57C, HouseClass__MPlayerDefeated_CheckAliveAndHumans, 0x7)
 }
 
 #pragma endregion MPlayerDefeated
+
+#pragma region Save&Load
+
+DEFINE_HOOK_AGAIN(0x624271, SomeFunc_InterceptMainLoop, 0x5);
+DEFINE_HOOK_AGAIN(0x623D72, SomeFunc_InterceptMainLoop, 0x5);
+DEFINE_HOOK_AGAIN(0x62314E, SomeFunc_InterceptMainLoop, 0x5);
+DEFINE_HOOK_AGAIN(0x60D407, SomeFunc_InterceptMainLoop, 0x5);
+DEFINE_HOOK_AGAIN(0x608206, SomeFunc_InterceptMainLoop, 0x5);
+DEFINE_HOOK(0x48CE8A, SomeFunc_InterceptMainLoop, 0x5)
+{
+	/**
+	 *  Main loop.
+	 */
+	Game::MainLoop();
+
+	/**
+	 *  After loop.
+	 */
+	Spawner::After_Main_Loop();
+	return R->Origin() + 0x5;
+}
+
+DEFINE_HOOK(0x52DAED, Game_Start_ResetGlobal, 0x7)
+{
+	Spawner::DoSave = false;
+	Spawner::NextAutoSaveFrame = -1;
+	Spawner::NextAutoSaveNumber = 0;
+	return 0;
+}
+
+DEFINE_HOOK(0x686B20, INIClass_ReadScenario_AutoSave, 0x6)
+{
+	/**
+	 *  Schedule the next autosave.
+	 */
+	Spawner::NextAutoSaveFrame = Unsorted::CurrentFrame;
+	Spawner::NextAutoSaveFrame += Spawner::GetConfig()->AutoSaveInterval;
+	return 0;
+}
+
+DEFINE_HOOK(0x4C7A14, EventClass_RespondToEvent_SaveGame, 0x5)
+{
+	Spawner::DoSave = true;
+	return 0x4C7B42;
+}
+
+// for some reason beacons are only inited on scenario init, which doesn't happen on load
+DEFINE_HOOK(0x67E6DA, LoadGame_AfterInit, 0x6)
+{
+	BeaconManagerClass::Instance.LoadArt();
+	return 0;
+}
+
+#pragma endregion