[ZoneBuilder] Add IGameWorldSp interface (WIP)

src/Components/Modules/AssetHandler.cpp

@@ -397,6 +397,7 @@ namespace Components
 			AssetHandler::RegisterInterface(new Assets::IXAnimParts());
 			AssetHandler::RegisterInterface(new Assets::IFxEffectDef());
 			AssetHandler::RegisterInterface(new Assets::IGameWorldMp());
+			AssetHandler::RegisterInterface(new Assets::IGameWorldSp());
 			AssetHandler::RegisterInterface(new Assets::IGfxLightDef());
 			AssetHandler::RegisterInterface(new Assets::ILoadedSound());
 			AssetHandler::RegisterInterface(new Assets::IPhysCollmap());

src/Components/Modules/AssetHandler.hpp

@@ -84,6 +84,7 @@ namespace Components
 #include "AssetInterfaces\IXAnimParts.hpp"
 #include "AssetInterfaces\IFxEffectDef.hpp"
 #include "AssetInterfaces\IGameWorldMp.hpp"
+#include "AssetInterfaces\IGameWorldSp.hpp"
 #include "AssetInterfaces\IGfxLightDef.hpp"
 #include "AssetInterfaces\ILoadedSound.hpp"
 #include "AssetInterfaces\IPhysCollmap.hpp"

src/Components/Modules/AssetInterfaces/IGameWorldSp.cpp

@@ -0,0 +1,233 @@
+#include <STDInclude.hpp>
+
+namespace Assets
+{
+	void IGameWorldSp::mark(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder)
+	{
+		Game::GameWorldSp* asset = header.gameWorldSp;
+
+		if (asset->pathData.nodes)
+		{
+			for (unsigned int i = 0; i < asset->pathData.nodeCount; ++i)
+			{
+				Game::pathnode_t* node = &asset->pathData.nodes[i];
+
+				for (char j = 0; j < 5; ++j)
+				{
+					builder->addScriptString((&node->constant.targetname)[j]);
+				}
+			}
+		}
+	}
+
+	void IGameWorldSp::savepathnode_tree_info_t(Game::pathnode_tree_t* nodeTree, Game::pathnode_tree_t* destNodeTree, Components::ZoneBuilder::Zone* builder)
+	{
+		AssertSize(Game::pathnode_tree_info_t, 8);
+		Utils::Stream* buffer = builder->getBuffer();
+
+		if (nodeTree->axis < 0)
+		{
+			AssertSize(Game::pathnode_tree_nodes_t, 8);
+
+			if (nodeTree->u.s.nodes)
+			{
+				buffer->align(Utils::Stream::ALIGN_2);
+				buffer->saveArray(nodeTree->u.s.nodes, nodeTree->u.s.nodeCount);
+				Utils::Stream::ClearPointer(&destNodeTree->u.s.nodes);
+			}
+		}
+		else
+		{
+			for (int i = 0; i < 2; ++i)
+			{
+				Game::pathnode_tree_t** destChildNodeTreePtr = &destNodeTree->u.child[i];
+				Game::pathnode_tree_t** childNodeTreePtr = &nodeTree->u.child[i];
+
+				if (builder->hasPointer(*childNodeTreePtr))
+				{
+					*destChildNodeTreePtr = builder->getPointer(*childNodeTreePtr);
+				}
+				else
+				{
+					buffer->align(Utils::Stream::ALIGN_4);
+					builder->storePointer(*childNodeTreePtr);
+
+					Game::pathnode_tree_t* destChildNodeTree = buffer->dest<Game::pathnode_tree_t>();
+					buffer->save(*childNodeTreePtr);
+
+					IGameWorldSp::savepathnode_tree_info_t(*childNodeTreePtr, destChildNodeTree, builder);
+					Utils::Stream::ClearPointer(destChildNodeTreePtr);
+				}
+			}
+		}
+	}
+
+	void IGameWorldSp::save(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder)
+	{
+		AssertSize(Game::GameWorldMp, 8);
+
+		Utils::Stream* buffer = builder->getBuffer();
+		Game::GameWorldSp* asset = header.gameWorldSp;
+		Game::GameWorldSp* dest = buffer->dest<Game::GameWorldSp>();
+		buffer->save(asset);
+
+		buffer->pushBlock(Game::XFILE_BLOCK_VIRTUAL);
+
+		if (asset->name)
+		{
+			buffer->saveString(builder->getAssetName(this->getType(), asset->name));
+			Utils::Stream::ClearPointer(&dest->name);
+		}
+
+		// Save_PathData
+		{
+			AssertSize(Game::PathData, 40);
+
+			if (asset->pathData.nodes)
+			{
+				AssertSize(Game::pathnode_t, 136);
+				buffer->align(Utils::Stream::ALIGN_4);
+
+				Game::pathnode_t* destNodes = buffer->dest<Game::pathnode_t>();
+				buffer->saveArray(asset->pathData.nodes, asset->pathData.nodeCount);
+
+				for (unsigned int i = 0; i < asset->pathData.nodeCount; ++i)
+				{
+					Game::pathnode_t* destNode = &destNodes[i];
+					Game::pathnode_t* node = &asset->pathData.nodes[i];
+
+					AssertSize(Game::pathnode_constant_t, 64);
+
+					for (char j = 0; j < 5; ++j)
+					{
+						builder->mapScriptString(&(&node->constant.targetname)[j]);
+					}
+
+					if (node->constant.Links)
+					{
+						AssertSize(Game::pathlink_s, 12);
+						buffer->align(Utils::Stream::ALIGN_4);
+						buffer->saveArray(node->constant.Links, node->constant.totalLinkCount);
+						Utils::Stream::ClearPointer(&destNode->constant.Links);
+					}
+				}
+
+				Utils::Stream::ClearPointer(&dest->pathData.nodes);
+			}
+
+			buffer->pushBlock(Game::XFILE_BLOCK_RUNTIME);
+
+			if (asset->pathData.basenodes)
+			{
+				AssertSize(Game::pathbasenode_t, 16);
+
+				buffer->align(Utils::Stream::ALIGN_16);
+				buffer->saveArray(asset->pathData.basenodes, asset->pathData.nodeCount);
+				Utils::Stream::ClearPointer(&dest->pathData.basenodes);
+			}
+
+			buffer->popBlock();
+
+			if (asset->pathData.chainNodeForNode)
+			{
+				buffer->align(Utils::Stream::ALIGN_2);
+				buffer->saveArray(asset->pathData.chainNodeForNode, asset->pathData.nodeCount);
+				Utils::Stream::ClearPointer(&dest->pathData.chainNodeForNode);
+			}
+
+			if (asset->pathData.nodeForChainNode)
+			{
+				buffer->align(Utils::Stream::ALIGN_2);
+				buffer->saveArray(asset->pathData.nodeForChainNode, asset->pathData.nodeCount);
+				Utils::Stream::ClearPointer(&dest->pathData.nodeForChainNode);
+			}
+
+			if (asset->pathData.pathVis)
+			{
+				buffer->saveArray(asset->pathData.pathVis, asset->pathData.visBytes);
+				Utils::Stream::ClearPointer(&dest->pathData.pathVis);
+			}
+
+			if (asset->pathData.nodeTree)
+			{
+				AssertSize(Game::pathnode_tree_t, 16);
+				buffer->align(Utils::Stream::ALIGN_4);
+
+				Game::pathnode_tree_t* destNodeTrees = buffer->dest<Game::pathnode_tree_t>();
+				buffer->saveArray(asset->pathData.nodeTree, asset->pathData.nodeTreeCount);
+
+				for (unsigned int i = 0; i < asset->pathData.nodeCount; ++i)
+				{
+					Game::pathnode_tree_t* destNodeTree = &destNodeTrees[i];
+					Game::pathnode_tree_t* nodeTree = &asset->pathData.nodeTree[i];
+
+					IGameWorldSp::savepathnode_tree_info_t(nodeTree, destNodeTree, builder);
+				}
+
+				Utils::Stream::ClearPointer(&dest->pathData.nodeTree);
+			}
+		}
+
+		// Save_VehicleTrack
+		{
+			// TODO: Finish that!
+			AssertSize(Game::VehicleTrack, 8);
+			dest->vehicleTrack.trackSegments = 0;
+			dest->vehicleTrack.trackSegmentCount = 0;
+		}
+
+		if (asset->data)
+		{
+			// Save_G_GlassData
+			{
+				AssertSize(Game::G_GlassData, 128);
+				buffer->align(Utils::Stream::ALIGN_4);
+
+				Game::G_GlassData* destGlass = buffer->dest<Game::G_GlassData>();
+				buffer->save(asset->data);
+
+				if (asset->data->glassPieces)
+				{
+					AssertSize(Game::G_GlassPiece, 12);
+					buffer->align(Utils::Stream::ALIGN_4);
+					buffer->saveArray(asset->data->glassPieces, asset->data->pieceCount);
+					Utils::Stream::ClearPointer(&destGlass->glassPieces);
+				}
+
+				if (asset->data->glassNames)
+				{
+					AssertSize(Game::G_GlassName, 12);
+					buffer->align(Utils::Stream::ALIGN_4);
+
+					Game::G_GlassName* destGlassNames = buffer->dest<Game::G_GlassName>();
+					buffer->saveArray(asset->data->glassNames, asset->data->glassNameCount);
+
+					for (unsigned int i = 0; i < asset->data->glassNameCount; ++i)
+					{
+						Game::G_GlassName* destGlassName = &destGlassNames[i];
+						Game::G_GlassName* glassName = &asset->data->glassNames[i];
+
+						if (glassName->nameStr)
+						{
+							buffer->saveString(glassName->nameStr);
+							Utils::Stream::ClearPointer(&destGlassName->nameStr);
+						}
+
+						if (glassName->pieceIndices)
+						{
+							buffer->align(Utils::Stream::ALIGN_2);
+							buffer->saveArray(glassName->pieceIndices, glassName->pieceCount);
+							Utils::Stream::ClearPointer(&destGlassName->pieceIndices);
+						}
+					}
+
+					Utils::Stream::ClearPointer(&destGlass->glassNames);
+				}
+			}
+
+			Utils::Stream::ClearPointer(&dest->data);
+		}
+
+		buffer->popBlock();
+	}
+}

src/Components/Modules/AssetInterfaces/IGameWorldSp.hpp

@@ -0,0 +1,14 @@
+namespace Assets
+{
+	class IGameWorldSp : public Components::AssetHandler::IAsset
+	{
+	public:
+		virtual Game::XAssetType getType() override { return Game::XAssetType::ASSET_TYPE_GAME_MAP_SP; };
+
+		virtual void save(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder) override;
+		virtual void mark(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder) override;
+
+	private:
+		void savepathnode_tree_info_t(Game::pathnode_tree_t* nodeTree, Game::pathnode_tree_t* destNodeTree, Components::ZoneBuilder::Zone* builder);
+	};
+}

src/Game/Structs.hpp

@@ -2574,9 +2574,9 @@ namespace Game
 		float fRadius;
 		float minUseDistSq;
 		__int16 wOverlapNode[2];
-		__int16 wChainId;
-		__int16 wChainDepth;
-		__int16 wChainParent;
+// 		__int16 wChainId;
+// 		__int16 wChainDepth;
+// 		__int16 wChainParent;
 		unsigned __int16 totalLinkCount;
 		pathlink_s *Links;
 	};
@@ -2611,6 +2611,7 @@ namespace Game
 		pathnode_constant_t constant;
 		pathnode_dynamic_t dynamic;
 		pathnode_transient_t transient;
+		char pad[12];
 	};
 
 	struct PathData

src/Utils/Stream.hpp

@@ -80,11 +80,11 @@ namespace Utils
 		char* save(const void * _str, size_t size, size_t count = 1);
 		char* save(Game::XFILE_BLOCK_TYPES stream, const void * _str, size_t size, size_t count);
 		char* save(Game::XFILE_BLOCK_TYPES stream, int value, size_t count);
-		template <typename T> char* save(T* object)
+		template <typename T> inline char* save(T* object)
 		{
 			return saveArray<T>(object, 1);
 		}
-		template <typename T> char* saveArray(T* array, size_t count)
+		template <typename T> inline char* saveArray(T* array, size_t count)
 		{
 			return save(array, sizeof(T), count);
 		}