diff --git a/src/ZoneCode/Game/T6/T6_Commands.txt b/src/ZoneCode/Game/T6/T6_Commands.txt index 288f0c42..97c40819 100644 --- a/src/ZoneCode/Game/T6/T6_Commands.txt +++ b/src/ZoneCode/Game/T6/T6_Commands.txt @@ -132,6 +132,7 @@ set count indices::_2 indexCount; set condition indices::_1 numframes < 256; set condition indices::data never; reorder: + name names notify deltaPart @@ -188,6 +189,11 @@ set arraysize u::frames::indices::_1 size + 1; set arraysize u::frames::indices::_2 size + 1; set count u::frames::frames size + 1; +// XAnimDeltaPartQuatDataFrames +reorder XAnimDeltaPartQuatDataFrames: + indices + frames; + // ========================================= // XModel // ========================================= @@ -994,7 +1000,7 @@ set string worldModelTag; set string szXAnims; set count szXAnims 88; set reusable szXAnims; -set count locationDamageMultipliers 84; +set count locationDamageMultipliers 21; set reusable locationDamageMultipliers; set string fireSound; set string fireSoundPlayer; @@ -1070,6 +1076,7 @@ set condition anonymous never; set condition model FxElemDef::elemType == FX_ELEM_TYPE_MODEL; set condition effectDef FxElemDef::elemType == FX_ELEM_TYPE_RUNNER; set condition soundName FxElemDef::elemType == FX_ELEM_TYPE_SOUND; +set string soundName; set condition lightDef FxElemDef::elemType == FX_ELEM_TYPE_SPOT_LIGHT; set condition material FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_BILLBOARD || FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_ORIENTED diff --git a/src/ZoneCommon/Game/T6/T6_Assets.h b/src/ZoneCommon/Game/T6/T6_Assets.h index d7aebbbc..dda6a31d 100644 --- a/src/ZoneCommon/Game/T6/T6_Assets.h +++ b/src/ZoneCommon/Game/T6/T6_Assets.h @@ -5174,15 +5174,17 @@ namespace T6 DevGraph devguiGraph; }; + typedef char ByteVec[3]; + typedef __declspec(align(4)) unsigned __int16 UShortVec[3]; union XAnimDynamicFrames { - char (*_1)[3]; - unsigned __int16 (*_2)[3]; + ByteVec *_1; + UShortVec *_2; }; - union XAnimDynamicIndices + union XAnimDynamicIndicesTrans { char _1[1]; unsigned __int16 _2[1]; @@ -5194,7 +5196,7 @@ namespace T6 vec3_t mins; vec3_t size; XAnimDynamicFrames frames; - XAnimDynamicIndices indices; + XAnimDynamicIndicesTrans indices; }; @@ -5212,18 +5214,25 @@ namespace T6 XAnimPartTransData u; }; + union XAnimDynamicIndicesDeltaQuat2 + { + char _1[1]; + unsigned __int16 _2[1]; + }; + + typedef __declspec(align(4)) __int16 XQuat2[2]; struct __declspec(align(4)) XAnimDeltaPartQuatDataFrames2 { - __int16 (*frames)[2]; - XAnimDynamicIndices indices; + XQuat2 *frames; + XAnimDynamicIndicesDeltaQuat2 indices; }; union XAnimDeltaPartQuatData2 { XAnimDeltaPartQuatDataFrames2 frames; - __int16 frame0[2]; + XQuat2 frame0; }; @@ -5233,18 +5242,25 @@ namespace T6 XAnimDeltaPartQuatData2 u; }; + union XAnimDynamicIndicesDeltaQuat + { + char _1[1]; + unsigned __int16 _2[1]; + }; + + typedef __declspec(align(4)) __int16 XQuat[4]; struct __declspec(align(4)) XAnimDeltaPartQuatDataFrames { - __int16 (*frames)[4]; - XAnimDynamicIndices indices; + XQuat *frames; + XAnimDynamicIndicesDeltaQuat indices; }; union XAnimDeltaPartQuatData { XAnimDeltaPartQuatDataFrames frames; - __int16 frame0[4]; + XQuat frame0; };