From 3d24a0be0929d097330c2de40b25d4a2f22cd659 Mon Sep 17 00:00:00 2001
From: Jereth <jerethk@iinet.net.au>
Date: Tue, 16 Sep 2025 21:15:10 +1000
Subject: [PATCH] Bug fix - external data needs to be cleared out before
 loading a game

---
 TheForceEngine/TFE_Game/saveSystem.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/TheForceEngine/TFE_Game/saveSystem.cpp b/TheForceEngine/TFE_Game/saveSystem.cpp
index e9ef8387e..10156e815 100644
--- a/TheForceEngine/TFE_Game/saveSystem.cpp
+++ b/TheForceEngine/TFE_Game/saveSystem.cpp
@@ -4,6 +4,9 @@
 #include <TFE_FileSystem/fileutil.h>
 #include <TFE_Input/inputMapping.h>
 #include <TFE_RenderBackend/renderBackend.h>
+#include <TFE_ExternalData/dfLogics.h>
+#include <TFE_ExternalData/weaponExternal.h>
+#include <TFE_ExternalData/pickupExternal.h>
 #include <TFE_Settings/gameSourceData.h>
 #include <TFE_System/system.h>
 #include <cassert>
@@ -247,6 +250,14 @@ namespace TFE_SaveSystem
 		{
 			SaveHeader header;
 			loadHeader(&stream, &header, filename);
+			
+			// Clear out custom logics and external data before loading
+			TFE_ExternalData::getExternalLogics()->actorLogics.clear();
+			TFE_ExternalData::clearExternalWeapons();
+			TFE_ExternalData::clearExternalProjectiles();
+			TFE_ExternalData::clearExternalEffects();
+			TFE_ExternalData::clearExternalPickups();
+
 			ret = s_game->serializeGameState(&stream, filename, false);
 			stream.close();
 		}