zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update iw5 weapon fulldef sizes

Browse Source
This commit is contained in:
Jan 2024-04-07 09:49:53 +02:00
parent 7be21ebb20
commit 9c4128b830
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/Game/IW5/IW5_Assets.h
View File

@ -3998,8 +3998,8 @@ namespace IW5
XModel* gunXModel[16]; XModel* gunXModel[16];
const char* szXAnimsRightHanded[42]; const char* szXAnimsRightHanded[42];
const char* szXAnimsLeftHanded[42]; const char* szXAnimsLeftHanded[42];
uint16_t notetrackSoundMapKeys[16]; uint16_t notetrackSoundMapKeys[24];
uint16_t notetrackSoundMapValues[16]; uint16_t notetrackSoundMapValues[24];
uint16_t notetrackRumbleMapKeys[16]; uint16_t notetrackRumbleMapKeys[16];
uint16_t notetrackRumbleMapValues[16]; uint16_t notetrackRumbleMapValues[16];
XModel* worldModel[16]; XModel* worldModel[16];

16
src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp
View File

@ -232,42 +232,39 @@ void AssetDumperWeapon::CopyToFullDef(const WeaponCompleteDef* weapon, WeaponFul
if (weapon->hideTags) if (weapon->hideTags)
{ {
assert(sizeof(WeaponFullDef::hideTags) >= sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::hideTags)>);
memcpy(fullDef->hideTags, weapon->hideTags, sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::hideTags)>); memcpy(fullDef->hideTags, weapon->hideTags, sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::hideTags)>);
fullDef->weapCompleteDef.hideTags = fullDef->hideTags; fullDef->weapCompleteDef.hideTags = fullDef->hideTags;
} }
if (weapon->szXAnims) if (weapon->szXAnims)
{ {
assert(sizeof(WeaponFullDef::szXAnims) >= sizeof(void*) * NUM_WEAP_ANIMS); static_assert(std::extent_v<decltype(WeaponFullDef::szXAnims)> == NUM_WEAP_ANIMS);
memcpy(fullDef->szXAnims, weapon->szXAnims, sizeof(void*) * NUM_WEAP_ANIMS); memcpy(fullDef->szXAnims, weapon->szXAnims, sizeof(void*) * NUM_WEAP_ANIMS);
fullDef->weapCompleteDef.szXAnims = fullDef->szXAnims; fullDef->weapCompleteDef.szXAnims = fullDef->szXAnims;
} }
if (fullDef->weapDef.gunXModel) if (fullDef->weapDef.gunXModel)
{ {
assert(sizeof(WeaponFullDef::gunXModel) >= sizeof(void*) * std::extent_v<decltype(WeaponFullDef::gunXModel)>);
memcpy(fullDef->gunXModel, fullDef->weapDef.gunXModel, sizeof(void*) * std::extent_v<decltype(WeaponFullDef::gunXModel)>); memcpy(fullDef->gunXModel, fullDef->weapDef.gunXModel, sizeof(void*) * std::extent_v<decltype(WeaponFullDef::gunXModel)>);
fullDef->weapDef.gunXModel = fullDef->gunXModel; fullDef->weapDef.gunXModel = fullDef->gunXModel;
} }
if (fullDef->weapDef.szXAnimsRightHanded) if (fullDef->weapDef.szXAnimsRightHanded)
{ {
assert(sizeof(WeaponFullDef::szXAnimsRightHanded) >= sizeof(void*) * NUM_WEAP_ANIMS); static_assert(std::extent_v<decltype(WeaponFullDef::szXAnimsRightHanded)> == NUM_WEAP_ANIMS);
memcpy(fullDef->szXAnimsRightHanded, fullDef->weapDef.szXAnimsRightHanded, sizeof(void*) * NUM_WEAP_ANIMS); memcpy(fullDef->szXAnimsRightHanded, fullDef->weapDef.szXAnimsRightHanded, sizeof(void*) * NUM_WEAP_ANIMS);
fullDef->weapDef.szXAnimsRightHanded = fullDef->szXAnimsRightHanded; fullDef->weapDef.szXAnimsRightHanded = fullDef->szXAnimsRightHanded;
} }
if (fullDef->weapDef.szXAnimsLeftHanded) if (fullDef->weapDef.szXAnimsLeftHanded)
{ {
assert(sizeof(WeaponFullDef::szXAnimsLeftHanded) >= sizeof(void*) * NUM_WEAP_ANIMS); static_assert(std::extent_v<decltype(WeaponFullDef::szXAnimsLeftHanded)> == NUM_WEAP_ANIMS);
memcpy(fullDef->szXAnimsLeftHanded, fullDef->weapDef.szXAnimsLeftHanded, sizeof(void*) * NUM_WEAP_ANIMS); memcpy(fullDef->szXAnimsLeftHanded, fullDef->weapDef.szXAnimsLeftHanded, sizeof(void*) * NUM_WEAP_ANIMS);
fullDef->weapDef.szXAnimsLeftHanded = fullDef->szXAnimsLeftHanded; fullDef->weapDef.szXAnimsLeftHanded = fullDef->szXAnimsLeftHanded;
} }
if (fullDef->weapDef.notetrackSoundMapKeys) if (fullDef->weapDef.notetrackSoundMapKeys)
{ {
assert(sizeof(WeaponFullDef::notetrackSoundMapKeys) >= sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackSoundMapKeys)>);
memcpy(fullDef->notetrackSoundMapKeys, memcpy(fullDef->notetrackSoundMapKeys,
fullDef->weapDef.notetrackSoundMapKeys, fullDef->weapDef.notetrackSoundMapKeys,
sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackSoundMapKeys)>); sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackSoundMapKeys)>);
@ -276,7 +273,6 @@ void AssetDumperWeapon::CopyToFullDef(const WeaponCompleteDef* weapon, WeaponFul
if (fullDef->weapDef.notetrackSoundMapValues) if (fullDef->weapDef.notetrackSoundMapValues)
{ {
assert(sizeof(WeaponFullDef::notetrackSoundMapValues) >= sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackSoundMapKeys)>);
memcpy(fullDef->notetrackSoundMapValues, memcpy(fullDef->notetrackSoundMapValues,
fullDef->weapDef.notetrackSoundMapValues, fullDef->weapDef.notetrackSoundMapValues,
sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackSoundMapKeys)>); sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackSoundMapKeys)>);
@ -285,7 +281,6 @@ void AssetDumperWeapon::CopyToFullDef(const WeaponCompleteDef* weapon, WeaponFul
if (fullDef->weapDef.notetrackRumbleMapKeys) if (fullDef->weapDef.notetrackRumbleMapKeys)
{ {
assert(sizeof(WeaponFullDef::notetrackRumbleMapKeys) >= sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackRumbleMapKeys)>);
memcpy(fullDef->notetrackRumbleMapKeys, memcpy(fullDef->notetrackRumbleMapKeys,
fullDef->weapDef.notetrackRumbleMapKeys, fullDef->weapDef.notetrackRumbleMapKeys,
sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackRumbleMapKeys)>); sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackRumbleMapKeys)>);
@ -294,7 +289,6 @@ void AssetDumperWeapon::CopyToFullDef(const WeaponCompleteDef* weapon, WeaponFul
if (fullDef->weapDef.notetrackRumbleMapValues) if (fullDef->weapDef.notetrackRumbleMapValues)
{ {
assert(sizeof(WeaponFullDef::notetrackRumbleMapValues) >= sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackRumbleMapKeys)>);
memcpy(fullDef->notetrackRumbleMapValues, memcpy(fullDef->notetrackRumbleMapValues,
fullDef->weapDef.notetrackRumbleMapValues, fullDef->weapDef.notetrackRumbleMapValues,
sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackRumbleMapKeys)>); sizeof(scr_string_t) * std::extent_v<decltype(WeaponFullDef::notetrackRumbleMapKeys)>);
@ -303,13 +297,13 @@ void AssetDumperWeapon::CopyToFullDef(const WeaponCompleteDef* weapon, WeaponFul
if (fullDef->weapDef.worldModel) if (fullDef->weapDef.worldModel)
{ {
assert(sizeof(WeaponFullDef::worldModel) >= sizeof(void*) * std::extent_v<decltype(WeaponFullDef::worldModel)>);
memcpy(fullDef->worldModel, fullDef->weapDef.worldModel, sizeof(void*) * std::extent_v<decltype(WeaponFullDef::worldModel)>); memcpy(fullDef->worldModel, fullDef->weapDef.worldModel, sizeof(void*) * std::extent_v<decltype(WeaponFullDef::worldModel)>);
fullDef->weapDef.worldModel = fullDef->worldModel; fullDef->weapDef.worldModel = fullDef->worldModel;
} }
if (fullDef->weapDef.parallelBounce) if (fullDef->weapDef.parallelBounce)
{ {
static_assert(std::extent_v<decltype(WeaponFullDef::parallelBounce)> == SURF_TYPE_NUM);
assert(sizeof(WeaponFullDef::parallelBounce) >= sizeof(float) * std::extent_v<decltype(WeaponFullDef::parallelBounce)>); assert(sizeof(WeaponFullDef::parallelBounce) >= sizeof(float) * std::extent_v<decltype(WeaponFullDef::parallelBounce)>);
memcpy(fullDef->parallelBounce, fullDef->weapDef.parallelBounce, sizeof(float) * std::extent_v<decltype(WeaponFullDef::parallelBounce)>); memcpy(fullDef->parallelBounce, fullDef->weapDef.parallelBounce, sizeof(float) * std::extent_v<decltype(WeaponFullDef::parallelBounce)>);
fullDef->weapDef.parallelBounce = fullDef->parallelBounce; fullDef->weapDef.parallelBounce = fullDef->parallelBounce;
@ -317,6 +311,7 @@ void AssetDumperWeapon::CopyToFullDef(const WeaponCompleteDef* weapon, WeaponFul
if (fullDef->weapDef.perpendicularBounce) if (fullDef->weapDef.perpendicularBounce)
{ {
static_assert(std::extent_v<decltype(WeaponFullDef::perpendicularBounce)> == SURF_TYPE_NUM);
assert(sizeof(WeaponFullDef::perpendicularBounce) >= sizeof(float) * std::extent_v<decltype(WeaponFullDef::perpendicularBounce)>); assert(sizeof(WeaponFullDef::perpendicularBounce) >= sizeof(float) * std::extent_v<decltype(WeaponFullDef::perpendicularBounce)>);
memcpy(fullDef->perpendicularBounce, fullDef->weapDef.perpendicularBounce, sizeof(float) * std::extent_v<decltype(WeaponFullDef::perpendicularBounce)>); memcpy(fullDef->perpendicularBounce, fullDef->weapDef.perpendicularBounce, sizeof(float) * std::extent_v<decltype(WeaponFullDef::perpendicularBounce)>);
fullDef->weapDef.perpendicularBounce = fullDef->perpendicularBounce; fullDef->weapDef.perpendicularBounce = fullDef->perpendicularBounce;
@ -324,6 +319,7 @@ void AssetDumperWeapon::CopyToFullDef(const WeaponCompleteDef* weapon, WeaponFul
if (fullDef->weapDef.locationDamageMultipliers) if (fullDef->weapDef.locationDamageMultipliers)
{ {
static_assert(std::extent_v<decltype(WeaponFullDef::locationDamageMultipliers)> == HITLOC_NUM);
assert(sizeof(WeaponFullDef::locationDamageMultipliers) >= sizeof(float) * std::extent_v<decltype(WeaponFullDef::locationDamageMultipliers)>); assert(sizeof(WeaponFullDef::locationDamageMultipliers) >= sizeof(float) * std::extent_v<decltype(WeaponFullDef::locationDamageMultipliers)>);
memcpy(fullDef->locationDamageMultipliers, memcpy(fullDef->locationDamageMultipliers,
fullDef->weapDef.locationDamageMultipliers, fullDef->weapDef.locationDamageMultipliers,

6
src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt
View File

@ -46,16 +46,16 @@ set reusable notetrackRumbleMapValues;
set scriptstring notetrackRumbleMapValues; set scriptstring notetrackRumbleMapValues;
set count notetrackRumbleMapValues 16; set count notetrackRumbleMapValues 16;
set reusable bounceSound; set reusable bounceSound;
set count bounceSound 31; set count bounceSound SURF_TYPE_NUM;
set reusable worldModel; set reusable worldModel;
set count worldModel 16; set count worldModel 16;
set string szAmmoName; set string szAmmoName;
set string szClipName; set string szClipName;
set string szSharedAmmoCapName; set string szSharedAmmoCapName;
set reusable parallelBounce; set reusable parallelBounce;
set count parallelBounce 31; set count parallelBounce SURF_TYPE_NUM;
set reusable perpendicularBounce; set reusable perpendicularBounce;
set count perpendicularBounce 31; set count perpendicularBounce SURF_TYPE_NUM;
set string accuracyGraphName0; set string accuracyGraphName0;
set string accuracyGraphName1; set string accuracyGraphName1;
set reusable originalAccuracyGraphKnots0; set reusable originalAccuracyGraphKnots0;

8
src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt
View File

@ -76,18 +76,18 @@ set reusable notetrackRumbleMapValues;
set scriptstring notetrackRumbleMapValues; set scriptstring notetrackRumbleMapValues;
set count notetrackRumbleMapValues 16; set count notetrackRumbleMapValues 16;
set reusable bounceSound; set reusable bounceSound;
set count bounceSound 31; set count bounceSound SURF_TYPE_NUM;
set reusable rollingSound; set reusable rollingSound;
set count rollingSound 31; set count rollingSound SURF_TYPE_NUM;
set reusable worldModel; set reusable worldModel;
set count worldModel 16; set count worldModel 16;
set string szAmmoName; set string szAmmoName;
set string szClipName; set string szClipName;
set string szSharedAmmoCapName; set string szSharedAmmoCapName;
set reusable parallelBounce; set reusable parallelBounce;
set count parallelBounce 31; set count parallelBounce SURF_TYPE_NUM;
set reusable perpendicularBounce; set reusable perpendicularBounce;
set count perpendicularBounce 31; set count perpendicularBounce SURF_TYPE_NUM;
set string accuracyGraphName0; set string accuracyGraphName0;
set string accuracyGraphName1; set string accuracyGraphName1;
set reusable originalAccuracyGraphKnots0; set reusable originalAccuracyGraphKnots0;