Serialize the ScriptCalls

Author: jerethk

TheForceEngine/TFE_DarkForces/darkForcesMain.cpp

@@ -1619,9 +1619,10 @@ namespace TFE_DarkForces
 		TFE_ForceScript::serialize(stream);
 		if (!writeState)
 		{
-			// Setup the level script after script serialization and fixup INF function pointers.
+			// Setup the level script after script serialization and fixup ScriptCall function pointers.
 			loadLevelScript();
 			inf_fixupScriptCalls();
+			logic_fixupScriptCalls();
 		}
 
 		TFE_System::messages_serialize(stream);

TheForceEngine/TFE_DarkForces/logic.cpp

@@ -671,4 +671,56 @@ namespace TFE_DarkForces
 		};
 	}
 
+	void logic_serializeScriptCalls(Stream* stream)
+	{
+		s32 count;
+		if (serialization_getMode() == SMODE_WRITE)
+		{
+			count = s_logicScriptCalls.size();
+		}
+		else if (serialization_getMode() == SMODE_READ)
+		{
+			logic_clearScriptCalls();
+			count = 0;
+		}
+
+		SERIALIZE(ObjState_LogicScriptCallV1, count, 0);
+
+		for (s32 i = 0; i < count; i++)
+		{
+			LogicScriptCall* scriptCall = nullptr;
+			if (serialization_getMode() == SMODE_READ)
+			{
+				LogicScriptCall newCall = {};
+				scriptCall = &newCall;
+			}
+			else
+			{
+				scriptCall = &s_logicScriptCalls[i];
+			}
+
+			SERIALIZE(ObjState_LogicScriptCallV1, scriptCall->argCount, 0);
+			for (s32 arg = 0; arg < scriptCall->argCount; arg++)
+			{
+				serialization_serializeScriptArg(stream, ObjState_LogicScriptCallV1, &scriptCall->args[arg]);
+			}
+
+			SERIALIZE_CSTRING(ObjState_LogicScriptCallV1, scriptCall->funcName);
+			if (serialization_getMode() == SMODE_READ)
+			{
+				scriptCall->funcPtr = nullptr;
+				s_logicScriptCalls.push_back(*scriptCall);
+			}
+		}
+	}
+
+	void logic_fixupScriptCalls()
+	{
+		// Fixup the function pointers
+		for (s32 i = 0; i < s_logicScriptCalls.size(); i++)
+		{
+			s_logicScriptCalls[i].funcPtr = getLevelScriptFunc(s_logicScriptCalls[i].funcName);
+		}
+	}
+
 }  // TFE_DarkForces

TheForceEngine/TFE_DarkForces/logic.h

@@ -84,6 +84,8 @@ namespace TFE_DarkForces
 
 	LogicScriptCall* logic_getScriptCall(s32 index);
 	void logic_clearScriptCalls();
+	void logic_serializeScriptCalls(Stream* stream);
+	void logic_fixupScriptCalls();
 
 	// Shared variables used for loading.
 	extern char s_objSeqArg0[];

TheForceEngine/TFE_Jedi/Level/robjData.cpp

@@ -273,6 +273,7 @@ namespace TFE_Jedi
 		}
 
 		objRefList_serialize(stream);
+		TFE_DarkForces::logic_serializeScriptCalls(stream);
 	}
 
 	////////////////////////////////////////////