From 53af2af8b72f91dd3fe71f4e5fd8c6d78cac228a Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Sun, 4 Jun 2017 11:01:04 +0200
Subject: [PATCH] [ZoneBuilder] Use static allocator as unreleased data is
 freed anyways

---
 src/Components/Modules/ZoneBuilder.cpp | 10 ++--------
 src/Components/Modules/ZoneBuilder.hpp |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Components/Modules/ZoneBuilder.cpp b/src/Components/Modules/ZoneBuilder.cpp
index 9069e613..89ffe091 100644
--- a/src/Components/Modules/ZoneBuilder.cpp
+++ b/src/Components/Modules/ZoneBuilder.cpp
@@ -2,8 +2,6 @@
 
 namespace Components
 {
-	Utils::Memory::Allocator ZoneBuilder::MemAllocator;
-
 	std::string ZoneBuilder::TraceZone;
 	std::vector<std::pair<Game::XAssetType, std::string>> ZoneBuilder::TraceAssets;
 
@@ -727,7 +725,7 @@ namespace Components
 	int ZoneBuilder::StoreTexture(Game::GfxImageLoadDef **loadDef, Game::GfxImage *image)
 	{
 		size_t size = 16 + (*loadDef)->resourceSize;
-		void* data = ZoneBuilder::MemAllocator.allocate(size);
+		void* data = Utils::Memory::GetAllocator()->allocate(size);
 		std::memcpy(data, *loadDef, size);
 
 		image->loadDef = reinterpret_cast<Game::GfxImageLoadDef *>(data);
@@ -739,7 +737,7 @@ namespace Components
 	{
 		if (header.image && header.image->loadDef)
 		{
-			ZoneBuilder::MemAllocator.free(header.image->loadDef);
+			Utils::Memory::GetAllocator()->free(header.image->loadDef);
 		}
 	}
 
@@ -1522,10 +1520,6 @@ namespace Components
 
 	ZoneBuilder::~ZoneBuilder()
 	{
-#if DEBUG
-		assert(ZoneBuilder::MemAllocator.empty());
-#endif
-
 		ZoneBuilder::Terminate = true;
 		if(ZoneBuilder::CommandThread.joinable())
 		{
diff --git a/src/Components/Modules/ZoneBuilder.hpp b/src/Components/Modules/ZoneBuilder.hpp
index 29e9b5a8..cfded145 100644
--- a/src/Components/Modules/ZoneBuilder.hpp
+++ b/src/Components/Modules/ZoneBuilder.hpp
@@ -109,7 +109,6 @@ namespace Components
 		static Game::XAssetHeader GetEmptyAssetIfCommon(Game::XAssetType type, std::string name, Zone* builder);
 
 	private:
-		static Utils::Memory::Allocator MemAllocator;
 		static int StoreTexture(Game::GfxImageLoadDef **loadDef, Game::GfxImage *image);
 		static void ReleaseTexture(Game::XAssetHeader header);