Fix beacon load again (#41)

* Revert "Update Beacon Load"

This reverts commit e243a9e.

* Fix weird revert

Author: Metadorius

src/Spawner/Spawner.Hook.cpp

@@ -22,6 +22,7 @@
 
 #include <HouseClass.h>
 #include <SessionClass.h>
+#include <BeaconManagerClass.h>
 #include <Utilities/Debug.h>
 #include <Utilities/Macro.h>
 #include <Unsorted.h>
@@ -223,8 +224,14 @@ DEFINE_HOOK(0x686B20, INIClass_ReadScenario_AutoSave, 0x6)
 DEFINE_HOOK(0x4C7A14, EventClass_RespondToEvent_SaveGame, 0x5)
 {
 	Spawner::RespondToSaveGame();
-
 	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

src/Spawner/Spawner.cpp

@@ -25,18 +25,17 @@
 #include <Utilities/Debug.h>
 #include <Utilities/DumperTypes.h>
 
-#include <BeaconManagerClass.h>
 #include <GameOptionsClass.h>
 #include <GameStrings.h>
 #include <HouseClass.h>
 #include <IPXManagerClass.h>
 #include <LoadOptionsClass.h>
+#include <WWMessageBox.h>
 #include <MPGameModeClass.h>
 #include <ScenarioClass.h>
 #include <time.h>
 #include <UDPInterfaceClass.h>
 #include <Unsorted.h>
-#include <WWMessageBox.h>
 #include <WWMouseClass.h>
 
 bool Spawner::Enabled = false;
@@ -352,9 +351,6 @@ bool Spawner::StartScenario(const char* pScenarioName)
 
 bool Spawner::LoadSavedGame(const char* saveGameName)
 {
-	// for some reason beacons are only inited on scenario init, which doesn't happen on load
-	BeaconManagerClass::Instance.LoadArt();
-
 	if (!saveGameName[0] || !LoadOptionsClass::LoadMission(saveGameName))
 	{
 		Debug::Log("[Spawner] Failed Load Game [%s]\n", saveGameName);