Some zone stuff

deps/fmt

@@ -1 +1 @@
-Subproject commit cee50b7572e4416f5aa7a2a6068543c1e5cd04a9
+Subproject commit 4809e2956a9ec04e97f026c5df224349f61179b0

deps/json11

@@ -1 +1 @@
-Subproject commit 787809178ddb3d739e6f408af5233930c9077929
+Subproject commit bb0e389ffd1e994df9580bf9801a1e78b8c83862

deps/mongoose

@@ -1 +1 @@
-Subproject commit 786f46c6551af34bb720913c13a5d7fb37c02822
+Subproject commit f9a6403b115f2b62ead2664e57f0dd906d3f51d0

src/Components/Modules/AssetHandler.cpp

@@ -9,6 +9,8 @@ namespace Components
 
 	std::map<void*, void*> AssetHandler::Relocations;
 
+	std::vector<std::pair<Game::XAssetType, std::string>> AssetHandler::EmptyAssets;
+
 	std::map<std::string, Game::XAssetHeader> AssetHandler::TemporaryAssets[Game::XAssetType::ASSET_TYPE_COUNT];
 
 	void AssetHandler::RegisterInterface(IAsset* iAsset)
@@ -118,6 +120,18 @@ namespace Components
 		const char* name = Game::DB_GetXAssetNameHandlers[type](asset);
 		if (!name) return false;
 
+		for (auto i = AssetHandler::EmptyAssets.begin(); i != AssetHandler::EmptyAssets.end();)
+		{
+			if (i->first == type && i->second == name)
+			{
+				i = AssetHandler::EmptyAssets.erase(i);
+			}
+			else
+			{
+				++i;
+			}
+		}
+
 		if (Flags::HasFlag("entries"))
 		{
 			OutputDebugStringA(Utils::String::VA("%s: %d: %s\n", FastFiles::Current().data(), type, name));
@@ -172,7 +186,6 @@ namespace Components
 	{
 		for (DWORD i = 0; i < size; i += 4)
 		{
-			// Reinterpret cast is fine here, as we are working with low-level pointers (due to the relocation hook)
 			AssetHandler::Relocations[reinterpret_cast<char*>(start) + i] = reinterpret_cast<char*>(to) + i;
 		}
 	}
@@ -260,6 +273,30 @@ namespace Components
 		return header;
 	}
 
+	void AssetHandler::StoreEmptyAsset(Game::XAssetType type, const char* name)
+	{
+		AssetHandler::EmptyAssets.push_back({ type,name });
+	}
+
+	__declspec(naked) void AssetHandler::StoreEmptyAssetStub()
+	{
+		__asm
+		{
+			pushad
+			push ebx
+			push eax
+
+			call AssetHandler::StoreEmptyAsset
+
+			pop eax
+			pop ebx
+			popad
+
+			push 5BB290h
+			retn
+		}
+	}
+
 	AssetHandler::AssetHandler()
 	{
 		AssetHandler::ClearTemporaryAssets();
@@ -273,6 +310,22 @@ namespace Components
 		// DB_AddXAsset
 		Utils::Hook(0x5BB650, AssetHandler::AddAssetStub, HOOK_JUMP).Install()->Quick();
 
+		// Store empty assets
+		Utils::Hook(0x5BB6EC, AssetHandler::StoreEmptyAssetStub, HOOK_CALL).Install()->Quick();
+
+		QuickPatch::OnFrame([] ()
+		{
+			if (Game::Sys_IsDatabaseReady() && Game::Sys_IsDatabaseReady2() && !AssetHandler::EmptyAssets.empty())
+			{
+				for (auto& asset : AssetHandler::EmptyAssets)
+				{
+					Game::Sys_Error(25, reinterpret_cast<char*>(0x724428), Game::DB_GetXAssetTypeName(asset.first), asset.second.data());
+				}
+
+				AssetHandler::EmptyAssets.clear();
+			}
+		});
+
 		// Register asset interfaces
 		if (ZoneBuilder::IsEnabled())
 		{

src/Components/Modules/AssetHandler.hpp

@@ -46,6 +46,16 @@ namespace Components
 	private:
 		static bool BypassState;
 
+		static std::map<std::string, Game::XAssetHeader> TemporaryAssets[Game::XAssetType::ASSET_TYPE_COUNT];
+
+		static std::map<Game::XAssetType, IAsset*> AssetInterfaces;
+		static std::map<Game::XAssetType, wink::slot<Callback>> TypeCallbacks;
+		static wink::signal<wink::slot<RestrictCallback>> RestrictSignal;
+
+		static std::map<void*, void*> Relocations;
+
+		static std::vector<std::pair<Game::XAssetType, std::string>> EmptyAssets;
+
 		static void RegisterInterface(IAsset* iAsset);
 
 		static Game::XAssetHeader FindAsset(Game::XAssetType type, const char* filename);
@@ -55,13 +65,8 @@ namespace Components
 
 		static void OffsetToAlias(Utils::Stream::Offset* offset);
 
-		static std::map<std::string, Game::XAssetHeader> TemporaryAssets[Game::XAssetType::ASSET_TYPE_COUNT];
-
-		static std::map<Game::XAssetType, IAsset*> AssetInterfaces;
-		static std::map<Game::XAssetType, wink::slot<Callback>> TypeCallbacks;
-		static wink::signal<wink::slot<RestrictCallback>> RestrictSignal;
-
-		static std::map<void*, void*> Relocations;
+		static void StoreEmptyAsset(Game::XAssetType type, const char* name);
+		static void StoreEmptyAssetStub();
 	};
 }
 

src/Components/Modules/Zones.cpp

@@ -1123,8 +1123,9 @@ namespace Components
 	{
 		bool result = Game::Load_Stream(atStreamStart, buffer, size + 4);
 
-		std::memmove(buffer + 8, buffer + 12, 196);
-		AssetHandler::Relocate(buffer + 12, buffer + 8, 196);
+		int shiftTest = 4;
+		std::memmove(buffer + 8 + shiftTest, buffer + 12 + shiftTest, 196 - shiftTest);
+		AssetHandler::Relocate(buffer + 12 + shiftTest, buffer + 8 + shiftTest, 196 - shiftTest);
 
 		return result;
 	}
@@ -1150,6 +1151,8 @@ namespace Components
 		static_assert(offsetof(material339_s, sortKey) == 20, "");
 		static_assert(offsetof(material339_s, textureAtlasColumnCount) == 22, "");
 
+		static_assert(offsetof(Game::Material, stateBitsEntry) == 24, "");
+
 		Game::Material* material = (Game::Material*)buffer;
 		memcpy(&material359, material, sizeof(material359));
 
@@ -1158,9 +1161,12 @@ namespace Components
 		material->textureAtlasRowCount = material359.textureAtlasRowCount;
 		material->textureAtlasColumnCount = material359.textureAtlasColumnCount;
 		material->gameFlags = material359.gameFlags;
+
+		// Probably wrong
 		material->surfaceTypeBits = material359.surfaceTypeBits;
-		
-		memcpy(material->drawSurf, material359.drawSurfBegin, 4); // Probably wrong
+
+		// Pretty sure that's wrong
+		memcpy(material->drawSurf, material359.drawSurfBegin, 4);
 
 		material->drawSurf[4] = 0;
 		material->drawSurf[5] = 0;

src/Game/Functions.cpp

@@ -203,6 +203,7 @@ namespace Game
 	SV_Cmd_EndTokenizedString_t SV_Cmd_EndTokenizedString = (SV_Cmd_EndTokenizedString_t)0x464750;
 	SV_DirectConnect_t SV_DirectConnect = (SV_DirectConnect_t)0x460480;
 
+	Sys_Error_t Sys_Error = (Sys_Error_t)0x4E0200;
 	Sys_FreeFileList_t Sys_FreeFileList = (Sys_FreeFileList_t)0x4D8580;
 	Sys_IsDatabaseReady_t Sys_IsDatabaseReady = (Sys_IsDatabaseReady_t)0x4CA4A0;
 	Sys_IsDatabaseReady2_t Sys_IsDatabaseReady2 = (Sys_IsDatabaseReady2_t)0x441280;

src/Game/Functions.hpp

@@ -473,6 +473,9 @@ namespace Game
 	typedef void(__cdecl * SV_DirectConnect_t)(netadr_t adr);
 	extern SV_DirectConnect_t SV_DirectConnect;
 
+	typedef int(__cdecl * Sys_Error_t)(int, char *, ...);
+	extern Sys_Error_t Sys_Error;
+
 	typedef void(__cdecl * Sys_FreeFileList_t)(char** list);
 	extern Sys_FreeFileList_t Sys_FreeFileList;
 

src/Game/Structs.hpp

@@ -340,6 +340,15 @@ namespace Game
 		MaterialTechnique* techniques[48];
 	};
 
+	struct MaterialTechniqueSet_new
+	{
+		const char* name;
+		char pad[4];
+		MaterialTechniqueSet* remappedTechniques;
+		int pad2;
+		MaterialTechnique* techniques[48];
+	};
+
 	struct MaterialConstantDef
 	{
 		int nameHash;
@@ -368,6 +377,30 @@ namespace Game
 		void *stateBitTable;
 	};
 
+	struct Material_new
+	{
+		char drawSurfBegin[4]; // Probably wrong
+		int surfaceTypeBits;
+		const char *name;
+		char drawSurf[6];
+		char gameFlags;
+		char pad;
+		char sortKey;
+		char textureAtlasRowCount;
+		char textureAtlasColumnCount;
+		char pad2;
+		char stateBitsEntry[48];
+		char textureCount;
+		char constantCount;
+		char stateBitsCount;
+		char stateFlags;
+		char cameraRegion;
+		MaterialTechniqueSet_new *techniqueSet;
+		MaterialTextureDef *textureTable;
+		MaterialConstantDef *constantTable;
+		void *stateBitTable;
+	};
+
 	struct TracerDef
 	{
 		const char * name;
@@ -2776,6 +2809,10 @@ namespace Game
 	};
 #pragma pack(pop)
 
+#ifdef __cplusplus
+	static_assert(offsetof(GfxWorld, worldDraw) == 80, "");
+#endif
+
 	union XAssetHeader
 	{
 		void *data;