Serialise sector names list (message addresses)

Author: jerethk

TheForceEngine/TFE_Jedi/InfSystem/message.cpp

@@ -7,6 +7,8 @@
 #include <TFE_Jedi/InfSystem/infSystem.h>
 #include <TFE_Jedi/Task/task.h>
 #include <TFE_Jedi/Level/robject.h>
+#include <TFE_Jedi/Serialization/serialization.h>
+#include <TFE_Jedi/Level/levelData.h>
 #include <TFE_DarkForces/logic.h>
 #include <assert.h>
 #include <stdio.h>
@@ -99,4 +101,52 @@ namespace TFE_Jedi
 		inf_sendSectorMessage(sector, msgType);
 		inf_sendLinkMessages(sector->infLink, entity, evt, msgType);
 	}
+
+	// Serialisation
+	// param0 and param1 are not serialised because they appear to be always set to 0 and never used
+	void level_serializeMessageAddresses(Stream* stream)
+	{
+		if (serialization_getMode() == SMODE_READ)
+		{
+			message_free();
+			s_messageAddr = allocator_create(sizeof(MessageAddress));
+
+			s32 msgCount = 0;
+			SERIALIZE(LevelState_SaveSectorNames, msgCount, 0);
+
+			for (s32 m = 0; m < msgCount; m++)
+			{
+				MessageAddress* msgAddr = (MessageAddress*)allocator_newItem(s_messageAddr);
+
+				u32 nameLength = 0;
+				SERIALIZE(LevelState_SaveSectorNames, nameLength, 0);
+				for (s32 i = 0; i < nameLength; i++)
+				{
+					SERIALIZE(LevelState_SaveSectorNames, msgAddr->name[i], 0);
+				}
+
+				serialization_serializeSectorPtr(stream, LevelState_SaveSectorNames, msgAddr->sector);
+			}
+		}
+		else // SMODE_WRITE
+		{
+			s32 msgCount = allocator_getCount(s_messageAddr);
+			SERIALIZE(LevelState_SaveSectorNames, msgCount, 0);
+			
+			MessageAddress* msgAddr = (MessageAddress*)allocator_getHead(s_messageAddr);
+			while (msgAddr)
+			{
+				u32 nameLength = strlen(msgAddr->name);
+				SERIALIZE(LevelState_SaveSectorNames, nameLength, 0);
+				for (s32 i = 0; i < nameLength; i++)
+				{
+					SERIALIZE(LevelState_SaveSectorNames, msgAddr->name[i], 0);
+				}
+
+				serialization_serializeSectorPtr(stream, LevelState_SaveSectorNames, msgAddr->sector);
+
+				msgAddr = (MessageAddress*)allocator_getNext(s_messageAddr);
+			}
+		}
+	}
 }

TheForceEngine/TFE_Jedi/InfSystem/message.h

@@ -60,6 +60,9 @@ namespace TFE_Jedi
 	void message_sendToObj(SecObject* obj, MessageType msgType, MessageFunc func);
 	void message_sendToSector(RSector* sector, SecObject* entity, u32 evt, MessageType msgType);
 
+	// Serialisation
+	void level_serializeMessageAddresses(Stream* stream);
+
 	// Optional message values - set these before calling message_XXX() and read inside the message function.
 	extern void* s_msgEntity;
 	extern void* s_msgTarget;

TheForceEngine/TFE_Jedi/Level/levelData.cpp

@@ -22,11 +22,6 @@ namespace TFE_DarkForces
 
 namespace TFE_Jedi
 {
-	enum LevelStateVersion : u32
-	{
-		LevelState_InitVersion = 1,
-		LevelState_CurVersion = LevelState_InitVersion,
-	};
 	enum LevelTextureType : u32
 	{
 		LEVTEX_TYPE_TEX = 1,
@@ -221,6 +216,9 @@ namespace TFE_Jedi
 			level_serializeFixupMirrors();
 		}
 
+		// Serialise sector names - so the scripting system can access sectors by their names after save & load
+		level_serializeMessageAddresses(stream);
+
 		// Serialize objects.
 		objData_serialize(stream);
 	}

TheForceEngine/TFE_Jedi/Level/levelData.h

@@ -32,6 +32,13 @@ struct Task;
 
 namespace TFE_Jedi
 {
+	enum LevelStateVersion : u32
+	{
+		LevelState_InitVersion = 1,
+		LevelState_SaveSectorNames = 2,
+		LevelState_CurVersion = LevelState_SaveSectorNames,
+	};
+
 	enum GoalConstants
 	{
 		COMPL_TRIG = 0,