From 3b029079b7efd2f664c9fb5567dca68b11755c19 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Wed, 17 Jul 2024 10:24:18 -0600
Subject: [PATCH] Remove gps "texture" compound

because its very existence causes alignment errors on Windows.

Also fix the texture_indices lengths so they're correct.
---
 df.graphics.xml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/df.graphics.xml b/df.graphics.xml
index 3fcf908aa..7354a7850 100644
--- a/df.graphics.xml
+++ b/df.graphics.xml
@@ -288,21 +288,20 @@
         <int32_t name='dimx'/>
         <int32_t name='dimy'/>
 
-        <compound name='tileset'>
-            <static-array type-name='long' count='1' name='black_background_texpos'/>
-            <static-array type-name='int32_t' count='120' name='texture_indices1'/>
-            <stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
-            <static-array type-name='int32_t' count='8581' name='texture_indices2'/>
-
-            <compound type-name='interface_setst' name='graphical_interface'/>
-            <compound type-name='interface_setst' name='classic_interface'/>
-
-            <static-array type-name='int32_t' count='12044' name='texture_indices3'/>
-            <stl-vector type-name='int32_t' name='texpos_boulder'/>
-            <static-array type-name='int32_t' count='3588' name='texture_indices4'/>
-            <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
-            <static-array type-name='int32_t' count='14379' name='texture_indices5'/>
-        </compound>
+        -- do NOT put these in a compound, because it will break alignment!
+        <static-array type-name='long' count='1' name='black_background_texpos'/>
+        <static-array type-name='int32_t' count='120' name='texture_indices1'/>
+        <stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
+        <static-array type-name='int32_t' count='8626' name='texture_indices2'/>
+
+        <compound type-name='interface_setst' name='graphical_interface'/>
+        <compound type-name='interface_setst' name='classic_interface'/>
+
+        <static-array type-name='int32_t' count='12924' name='texture_indices3'/>
+        <stl-vector type-name='int32_t' name='texpos_boulder'/>
+        <static-array type-name='int32_t' count='3588' name='texture_indices4'/>
+        <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
+        <static-array type-name='int32_t' count='14379' name='texture_indices5'/>
     </struct-type>
 
     <struct-type type-name='interface_setst'>