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

chore: remove unnecessary weapon defaults

Browse Source
This commit is contained in:
Jan 2024-04-21 19:34:52 +02:00
parent 1601c87481
commit 94aee91592
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp
View File

@ -332,17 +332,6 @@ namespace
if (!weaponDef.worldLastShotEjectEffect) if (!weaponDef.worldLastShotEjectEffect)
weaponDef.worldLastShotEjectEffect = weaponDef.worldShellEjectEffect; weaponDef.worldLastShotEjectEffect = weaponDef.worldShellEjectEffect;
if (!weaponDef.raiseSound.name)
weaponDef.raiseSound.name = CreateSoundAliasListName("weap_raise", memory);
if (!weaponDef.putawaySound.name)
weaponDef.putawaySound.name = CreateSoundAliasListName("weap_putaway", memory);
if (!weaponDef.pickupSound.name)
weaponDef.pickupSound.name = CreateSoundAliasListName("weap_pickup", memory);
if (!weaponDef.ammoPickupSound.name)
weaponDef.ammoPickupSound.name = CreateSoundAliasListName("weap_ammo_pickup", memory);
if (!weaponDef.emptyFireSound.name)
weaponDef.emptyFireSound.name = CreateSoundAliasListName("weap_dryfire_smg_npc", memory);
if (weaponCompleteDef.iAdsTransInTime <= 0) if (weaponCompleteDef.iAdsTransInTime <= 0)
weaponDef.fOOPosAnimLength[0] = 0.0033333334f; weaponDef.fOOPosAnimLength[0] = 0.0033333334f;
else else
@ -353,9 +342,9 @@ namespace
else else
weaponDef.fOOPosAnimLength[1] = 1.0f / static_cast<float>(weaponCompleteDef.iAdsTransOutTime); weaponDef.fOOPosAnimLength[1] = 1.0f / static_cast<float>(weaponCompleteDef.iAdsTransOutTime);
if (weaponDef.fMaxDamageRange <= 0.0f) if (weaponDef.fMaxDamageRange < 0.0f)
weaponDef.fMaxDamageRange = 999999.0f; weaponDef.fMaxDamageRange = 999999.0f;
if (weaponDef.fMinDamageRange <= 0.0f) if (weaponDef.fMinDamageRange < 0.0f)
weaponDef.fMinDamageRange = 999999.12f; weaponDef.fMinDamageRange = 999999.12f;
if (weaponDef.enemyCrosshairRange > 15000.0f) if (weaponDef.enemyCrosshairRange > 15000.0f)

15
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp
View File

@ -757,17 +757,6 @@ namespace
if (!weaponDef.worldLastShotEjectEffect) if (!weaponDef.worldLastShotEjectEffect)
weaponDef.worldLastShotEjectEffect = weaponDef.worldShellEjectEffect; weaponDef.worldLastShotEjectEffect = weaponDef.worldShellEjectEffect;
if (!weaponDef.raiseSound.name)
weaponDef.raiseSound.name = CreateSoundAliasListName("weap_raise", memory);
if (!weaponDef.putawaySound.name)
weaponDef.putawaySound.name = CreateSoundAliasListName("weap_putaway", memory);
if (!weaponDef.pickupSound.name)
weaponDef.pickupSound.name = CreateSoundAliasListName("weap_pickup", memory);
if (!weaponDef.ammoPickupSound.name)
weaponDef.ammoPickupSound.name = CreateSoundAliasListName("weap_ammo_pickup", memory);
if (!weaponDef.emptyFireSound.name)
weaponDef.emptyFireSound.name = CreateSoundAliasListName("weap_dryfire_smg_npc", memory);
if (weaponCompleteDef.iAdsTransInTime <= 0) if (weaponCompleteDef.iAdsTransInTime <= 0)
weaponDef.fOOPosAnimLength[0] = 0.0033333334f; weaponDef.fOOPosAnimLength[0] = 0.0033333334f;
else else
@ -778,9 +767,9 @@ namespace
else else
weaponDef.fOOPosAnimLength[1] = 1.0f / static_cast<float>(weaponCompleteDef.iAdsTransOutTime); weaponDef.fOOPosAnimLength[1] = 1.0f / static_cast<float>(weaponCompleteDef.iAdsTransOutTime);
if (weaponDef.fMaxDamageRange <= 0.0f) if (weaponDef.fMaxDamageRange < 0.0f)
weaponDef.fMaxDamageRange = 999999.0f; weaponDef.fMaxDamageRange = 999999.0f;
if (weaponDef.fMinDamageRange <= 0.0f) if (weaponDef.fMinDamageRange < 0.0f)
weaponDef.fMinDamageRange = 999999.12f; weaponDef.fMinDamageRange = 999999.12f;
if (weaponDef.enemyCrosshairRange > 15000.0f) if (weaponDef.enemyCrosshairRange > 15000.0f)