Fix ExtData allocation

- Now allocated in CTOR, loading game fetches existing extdata pointers and allocates if missing for any reason
- Because AbstractClass::Load() overrides pointer data stored at 0x18, the ExtData pointer is stored in Container<T> in PrepareStream() and restored in LoadStatic()

Author: Starkku

src/Ext/Anim/Body.cpp

@@ -281,10 +281,10 @@ DEFINE_HOOK_AGAIN(0x422126, AnimClass_CTOR, 0x5)
 DEFINE_HOOK_AGAIN(0x422707, AnimClass_CTOR, 0x5)
 DEFINE_HOOK(0x4228D2, AnimClass_CTOR, 0x5)
 {
+	GET(AnimClass*, pItem, ESI);
+
 	if (!Phobos::IsLoadingSaveGame)
 	{
-		GET(AnimClass*, pItem, ESI);
-
 		auto const callerAddress = CTORTemp::callerAddress;
 
 		// Do this here instead of using a duplicate hook in SyncLogger.cpp
@@ -296,10 +296,10 @@ DEFINE_HOOK(0x4228D2, AnimClass_CTOR, 0x5)
 			Debug::Log("Attempting to create animation with null Type (Caller: %08x)!\n", callerAddress);
 			return 0;
 		}
-
-		AnimExt::ExtMap.Allocate(pItem);
 	}
 
+	AnimExt::ExtMap.Allocate(pItem);
+
 	return 0;
 }
 

src/Utilities/Container.h

@@ -286,6 +286,7 @@ class Container
 	map_type Items;
 
 	base_type* SavingObject;
+	extension_type_ptr SavingExtPointer;
 	IStream* SavingStream;
 	const char* Name;
 
@@ -361,10 +362,6 @@ class Container
 
 	extension_type_ptr TryAllocate(base_type_ptr key, bool bCond, const std::string_view& nMessage)
 	{
-		// Do not allow allocation when loading save games.
-		if (Phobos::IsLoadingSaveGame)
-			return nullptr;
-
 		if (!key || (!bCond && !nMessage.empty()))
 		{
 			Debug::Log("%s \n", nMessage.data());
@@ -376,10 +373,6 @@ class Container
 
 	extension_type_ptr TryAllocate(base_type_ptr key)
 	{
-		// Do not allow allocation when loading save games.
-		if (Phobos::IsLoadingSaveGame)
-			return nullptr;
-
 		if (!key)
 		{
 			Debug::Log("Attempted to allocate %s from nullptr!\n", typeid(extension_type).name());
@@ -400,6 +393,22 @@ class Container
 			return this->Items.find(key);
 	}
 
+	// Only used on loading, does not check if key is nullptr.
+	extension_type_ptr FindOrAllocate(base_type_ptr key)
+	{
+		extension_type_ptr value = nullptr;
+
+		if constexpr (HasOffset<T>)
+			value = GetExtensionPointer(key);
+		else
+			value = this->Items.find(key);
+
+		if (!value)
+			value = Allocate(key);
+
+		return value;
+	}
+
 	void Remove(base_type_ptr key)
 	{
 		if (auto Item = Find(key))
@@ -442,6 +451,10 @@ class Container
 
 		this->SavingObject = key;
 		this->SavingStream = pStm;
+
+		// Loading the base type data might override the ext pointer stored on it so it needs to be saved.
+		if constexpr (HasOffset<T>)
+			this->SavingExtPointer = GetExtensionPointer(key);
 	}
 
 	void SaveStatic()
@@ -466,6 +479,10 @@ class Container
 	{
 		if (this->SavingObject && this->SavingStream)
 		{
+			// Restore stored ext pointer data.
+			if constexpr (HasOffset<T>)
+				SetExtensionPointer(this->SavingObject, this->SavingExtPointer);
+
 			//Debug::Log("[LoadStatic] Loading object %p as '%s'\n", this->SavingObject, this->Name);
 			if (!this->Load(this->SavingObject, this->SavingStream))
 				Debug::FatalErrorAndExit("LoadStatic - Loading object %p as '%s' failed!\n", this->SavingObject, this->Name);
@@ -550,8 +567,8 @@ class Container
 			return nullptr;
 		}
 
-		extension_type_ptr buffer = this->Allocate(key);
-
+		// get or allocate the value data
+		extension_type_ptr buffer = this->FindOrAllocate(key);
 		if (!buffer)
 		{
 			Debug::Log("LoadKey - Could not find or allocate value.\n");