From 910ffb3195192d8851918d54ff1d2773f3e446cb Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Wed, 19 May 2021 18:30:12 +0200
Subject: [PATCH] Fix T5 alignment issues

---
 src/Common/Game/T5/T5_Assets.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Common/Game/T5/T5_Assets.h b/src/Common/Game/T5/T5_Assets.h
index 0edccb72..299cfd12 100644
--- a/src/Common/Game/T5/T5_Assets.h
+++ b/src/Common/Game/T5/T5_Assets.h
@@ -491,7 +491,7 @@ namespace T5
         XSurfaceCollisionTree* collisionTree;
     };
 
-    typedef tdef_align(16) unsigned short r_index16_t;
+    typedef tdef_align(16) uint16_t r_index16_t;
 
     struct XSurface
     {
@@ -1562,7 +1562,7 @@ namespace T5
         int maxy;
     };
 
-    struct ComWaterCell
+    struct type_align(4) ComWaterCell
     {
         int16_t waterheight;
         char flooroffset;
@@ -1972,7 +1972,7 @@ namespace T5
         PackedUnitVec normal;
         PackedUnitVec tangent;
     };
-
+    
     struct GfxWorldVertexData
     {
         GfxWorldVertex* vertices;
@@ -2095,6 +2095,8 @@ namespace T5
         uint16_t dynEntId;
     };
 
+    typedef tdef_align(4) GfxSceneDynModel GfxSceneDynModel4;
+
     struct BModelDrawInfo
     {
         uint16_t surfId;
@@ -2156,7 +2158,7 @@ namespace T5
         int stream2ByteOffset;
     };
 
-    struct GfxSurface
+    struct type_align(16) GfxSurface
     {
         srfTriangles_t tris;
         Material* material;
@@ -2328,7 +2330,7 @@ namespace T5
         float outdoorLookupMatrix[4][4];
         GfxImage* outdoorImage;
         unsigned int* cellCasterBits;
-        GfxSceneDynModel* sceneDynModel;
+        GfxSceneDynModel4* sceneDynModel;
         GfxSceneDynBrush* sceneDynBrush;
         unsigned int* primaryLightEntityShadowVis;
         unsigned int* primaryLightDynEntShadowVis[2];