diff --git a/src/Common/Game/T5/T5_Assets.h b/src/Common/Game/T5/T5_Assets.h index e1897cca..0edccb72 100644 --- a/src/Common/Game/T5/T5_Assets.h +++ b/src/Common/Game/T5/T5_Assets.h @@ -1129,7 +1129,7 @@ namespace T5 int sequence; }; - struct SndIndexEntry + struct type_align(4) SndIndexEntry { uint16_t value; uint16_t next; @@ -1284,7 +1284,7 @@ namespace T5 int partitionIndex; }; - struct CollisionAabbTree + struct type_align(16) CollisionAabbTree { float origin[3]; uint16_t materialIndex; diff --git a/src/ZoneCode/Game/T5/XAssets/XModel.txt b/src/ZoneCode/Game/T5/XAssets/XModel.txt index 7299b1ec..4541f1f7 100644 --- a/src/ZoneCode/Game/T5/XAssets/XModel.txt +++ b/src/ZoneCode/Game/T5/XAssets/XModel.txt @@ -49,10 +49,10 @@ set count vertsBlend vertCount[0] + 5 * vertCount[2] + 7 * vertCount[3]; set reusable tensionData; -set count tensionData vertCount[0] +set count tensionData 12 * (vertCount[0] + vertCount[1] + vertCount[2] - + vertCount[3]; + + vertCount[3]); // XRigidVertList set reusable XRigidVertList::collisionTree; diff --git a/src/ZoneCode/Game/T5/XAssets/clipMap_t.txt b/src/ZoneCode/Game/T5/XAssets/clipMap_t.txt index 975851cf..10dc3505 100644 --- a/src/ZoneCode/Game/T5/XAssets/clipMap_t.txt +++ b/src/ZoneCode/Game/T5/XAssets/clipMap_t.txt @@ -47,6 +47,7 @@ set count constraints num_constraints; set block ropes XFILE_BLOCK_RUNTIME; set count ropes max_ropes; reorder: + ... leafs leafbrushes leafbrushNodes