From 12c2629061996e7055609f0d8f0ac3358dbfd4bc Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Thu, 15 Apr 2021 17:08:02 +0200
Subject: [PATCH] Make xmodel counts unsigned for iw3

---
 src/Common/Game/IW3/IW3_Assets.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Common/Game/IW3/IW3_Assets.h b/src/Common/Game/IW3/IW3_Assets.h
index 4662baf3..21fc0d71 100644
--- a/src/Common/Game/IW3/IW3_Assets.h
+++ b/src/Common/Game/IW3/IW3_Assets.h
@@ -472,9 +472,9 @@ namespace IW3
     struct XModel
     {
         const char* name;
-        char numBones;
-        char numRootBones;
-        char numsurfs;
+        unsigned char numBones;
+        unsigned char numRootBones;
+        unsigned char numsurfs;
         char lodRampType;
         uint16_t* boneNames;
         char* parentList;
@@ -994,8 +994,8 @@ namespace IW3
 
     struct CollisionPartition
     {
-        char triCount;
-        char borderCount;
+        unsigned char triCount;
+        unsigned char borderCount;
         int firstTri;
         CollisionBorder* borders;
     };
@@ -1023,7 +1023,7 @@ namespace IW3
         cLeaf_t leaf;
     };
 
-    struct cbrush_t
+    struct type_align(16) cbrush_t
     {
         float mins[3];
         int contents;
@@ -1129,13 +1129,13 @@ namespace IW3
         unsigned int numSubModels;
         cmodel_t* cmodels;
         uint16_t numBrushes;
-        cbrush_array_t* brushes;
+        cbrush_t* brushes;
         int numClusters;
         int clusterBytes;
         char* visibility;
         int vised;
         MapEnts* mapEnts;
-        cbrush_array_t* box_brush;
+        cbrush_t* box_brush;
         cmodel_t box_model;
         uint16_t dynEntCount[2];
         DynEntityDef* dynEntDefList[2];