From 589347ce0869ec1c2ddce28cf708d1e904d717d3 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Fri, 7 Feb 2020 20:54:40 +0100
Subject: [PATCH] ZoneCommon: Add Texture pointer from OAT to GfxTexture union
 of T6 to be able to save loaded texture data in GfxImage

---
 src/ZoneCode/Game/Common.h           | 3 +++
 src/ZoneCode/Game/T6/T6_Commands.txt | 1 +
 src/ZoneCommon/Game/T6/T6.h          | 2 +-
 src/ZoneCommon/Game/T6/T6_Assets.h   | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ZoneCode/Game/Common.h b/src/ZoneCode/Game/Common.h
index e3d7a9c7..1f35d05c 100644
--- a/src/ZoneCode/Game/Common.h
+++ b/src/ZoneCode/Game/Common.h
@@ -40,6 +40,9 @@ typedef void ID3D11VertexShader;
 typedef void ID3D11InputLayout;
 typedef void ID3D11Buffer;
 
+// OAT Types
+typedef void Texture;
+
 // Unimportant cpp keywords
 #define __unaligned
 #define volatile
diff --git a/src/ZoneCode/Game/T6/T6_Commands.txt b/src/ZoneCode/Game/T6/T6_Commands.txt
index 1b01fcf0..c26c9c36 100644
--- a/src/ZoneCode/Game/T6/T6_Commands.txt
+++ b/src/ZoneCode/Game/T6/T6_Commands.txt
@@ -376,6 +376,7 @@ use GfxTexture;
 set reusable loadDef;
 set block loadDef XFILE_BLOCK_TEMP;
 set condition basemap never;
+set condition texture never;
 
 // GfxImageLoadDef
 use GfxImageLoadDef;
diff --git a/src/ZoneCommon/Game/T6/T6.h b/src/ZoneCommon/Game/T6/T6.h
index 2bfad627..a0ea047e 100644
--- a/src/ZoneCommon/Game/T6/T6.h
+++ b/src/ZoneCommon/Game/T6/T6.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <d3d11.h>
+#include "Image/Texture.h"
 
 #include "T6_Assets.h"
 
@@ -18,7 +19,6 @@ namespace T6
         XAssetHeader header;
     };
 
-
     struct XAssetList
     {
         ScriptStringList stringList;
diff --git a/src/ZoneCommon/Game/T6/T6_Assets.h b/src/ZoneCommon/Game/T6/T6_Assets.h
index bc521b47..16ab9601 100644
--- a/src/ZoneCommon/Game/T6/T6_Assets.h
+++ b/src/ZoneCommon/Game/T6/T6_Assets.h
@@ -696,6 +696,7 @@ namespace T6
     union GfxTexture
     {
         ID3D11ShaderResourceView* basemap;
+        Texture* texture;
         GfxImageLoadDef* loadDef;
     };