From c2930e59fbdd09e07bc7965742f3fde3bc5537ef Mon Sep 17 00:00:00 2001
From: /dev/urandom <iw4x-dev-urandom@protonmail.com>
Date: Sun, 21 May 2017 22:59:59 +0200
Subject: [PATCH] Revert "[ZoneBuilder] Neuter startup more and add support for
 defaults.ff and shaders.ff"

---
 src/Components/Modules/ZoneBuilder.cpp | 69 --------------------------
 src/Components/Modules/ZoneBuilder.hpp |  3 --
 2 files changed, 72 deletions(-)

diff --git a/src/Components/Modules/ZoneBuilder.cpp b/src/Components/Modules/ZoneBuilder.cpp
index 777aa04f..56d91699 100644
--- a/src/Components/Modules/ZoneBuilder.cpp
+++ b/src/Components/Modules/ZoneBuilder.cpp
@@ -791,69 +791,6 @@ namespace Components
 		}
 	}
 
-	
-	Game::XZoneInfo baseZones_old [] = { { "code_pre_gfx_mp", 0, 0 },
-		{ "localized_code_pre_gfx_mp", 0, 0 },
-		{ "code_post_gfx_mp", 0, 0 },
-		{ "localized_code_post_gfx_mp", 0, 0 },
-		{ "common_mp", 0, 0 }
-	};
-	
-
-	Game::XZoneInfo baseZones [] = {
-		{ "defaults", 0, 0 },
-		{ "shaders", 0, 0 },
-		{ "common_mp", 0, 0 }
-	};
-
-	void ZoneBuilder::EndInit()
-	{
-		// do other init stuff
-		DWORD R_RegisterDvars = 0x5196C0;
-		DWORD NET_Init = 0x491860;
-		DWORD SND_InitDriver = 0x4F5090;
-		DWORD SND_Init = 0x46A630;
-		DWORD G_SetupWeaponDef = 0x4E1F30;
-		__asm
-		{
-			call R_RegisterDvars
-			call NET_Init
-			call SND_InitDriver
-			call SND_Init
-		}
-
-		// now load default assets and shaders
-		if (FastFiles::Exists("defaults") && FastFiles::Exists("shaders"))
-		{
-			Game::DB_LoadXAssets(baseZones, 3, 0);
-		}
-		else
-		{
-			Logger::Print("Warning: Missing new init zones (defaults.ff & shaders.ff). You will need to load fastfiles to manually obtain techsets.\n");
-			Game::DB_LoadXAssets(baseZones_old, 5, 0);
-		}
-
-		Logger::Print("Waiting for fastiles to load...");
-		while (!Game::Sys_IsDatabaseReady()) std::this_thread::sleep_for(100ms);
-		Logger::Print("Done!\n");
-
-		// defaults need to load before we do this
-		__asm
-		{
-			call G_SetupWeaponDef
-		}
-	}
-
-	void __declspec(naked) ZoneBuilder::EndInitStub()
-	{
-		__asm
-		{
-			add esp, 0x14
-			call ZoneBuilder::EndInit
-			retn
-		}
-	}
-
 	ZoneBuilder::ZoneBuilder()
 	{
 		// ReSharper disable CppStaticAssertFailure
@@ -916,12 +853,6 @@ namespace Components
 			Utils::Hook::Set<DWORD>(0x64A029, 0x38400000); // 900 MiB
 			Utils::Hook::Set<DWORD>(0x64A057, 0x38400000);
 
-			// Further neuter Com_Init
-			Utils::Hook(0x60BBCE, ZoneBuilder::EndInitStub, HOOK_JUMP).install()->quick();
-
-			// dont run Live_Frame
-			Utils::Hook::Nop(0x48A0AF, 5);
-
 			AssetHandler::OnLoad([](Game::XAssetType type, Game::XAssetHeader /*asset*/, std::string name, bool* /*restrict*/)
 			{
 				if (!ZoneBuilder::TraceZone.empty() && ZoneBuilder::TraceZone == FastFiles::Current())
diff --git a/src/Components/Modules/ZoneBuilder.hpp b/src/Components/Modules/ZoneBuilder.hpp
index 69137abd..a59edf35 100644
--- a/src/Components/Modules/ZoneBuilder.hpp
+++ b/src/Components/Modules/ZoneBuilder.hpp
@@ -114,8 +114,5 @@ namespace Components
 		static Utils::Memory::Allocator MemAllocator;
 		static int StoreTexture(Game::GfxImageLoadDef **loadDef, Game::GfxImage *image);
 		static void ReleaseTexture(Game::XAssetHeader header);
-
-		static void EndInitStub();
-		static void EndInit();
 	};
 }