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: set internal name earlier

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

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

@ -258,7 +258,6 @@ namespace
weapon->weapDef.parallelBounce = weapon->parallelBounce; weapon->weapDef.parallelBounce = weapon->parallelBounce;
weapon->weapDef.perpendicularBounce = weapon->perpendicularBounce; weapon->weapDef.perpendicularBounce = weapon->perpendicularBounce;
weapon->weapDef.locationDamageMultipliers = weapon->locationDamageMultipliers; weapon->weapDef.locationDamageMultipliers = weapon->locationDamageMultipliers;
weapon->weapCompleteDef.szInternalName = "";
for (const auto& field : weapon_fields) for (const auto& field : weapon_fields)
{ {
@ -397,6 +396,7 @@ namespace
auto* weaponFullDef = memory->Create<WeaponFullDef>(); auto* weaponFullDef = memory->Create<WeaponFullDef>();
memset(weaponFullDef, 0, sizeof(WeaponFullDef)); memset(weaponFullDef, 0, sizeof(WeaponFullDef));
InitWeaponFullDef(weaponFullDef); InitWeaponFullDef(weaponFullDef);
weaponFullDef->weapCompleteDef.szInternalName = memory->Dup(assetName.c_str());
InfoStringToWeaponConverter converter( InfoStringToWeaponConverter converter(
infoString, weaponFullDef, zone->m_script_strings, memory, manager, weapon_fields, std::extent_v<decltype(weapon_fields)>); infoString, weaponFullDef, zone->m_script_strings, memory, manager, weapon_fields, std::extent_v<decltype(weapon_fields)>);
@ -406,8 +406,6 @@ namespace
return true; return true;
} }
weaponFullDef->weapCompleteDef.szInternalName = memory->Dup(assetName.c_str());
CalculateWeaponFields(weaponFullDef, memory); CalculateWeaponFields(weaponFullDef, memory);
manager->AddAsset(ASSET_TYPE_WEAPON, manager->AddAsset(ASSET_TYPE_WEAPON,

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

@ -683,7 +683,6 @@ namespace
weapon->weapDef.parallelBounce = weapon->parallelBounce; weapon->weapDef.parallelBounce = weapon->parallelBounce;
weapon->weapDef.perpendicularBounce = weapon->perpendicularBounce; weapon->weapDef.perpendicularBounce = weapon->perpendicularBounce;
weapon->weapDef.locationDamageMultipliers = weapon->locationDamageMultipliers; weapon->weapDef.locationDamageMultipliers = weapon->locationDamageMultipliers;
weapon->weapCompleteDef.szInternalName = "";
for (const auto& field : weapon_fields) for (const auto& field : weapon_fields)
{ {
@ -822,6 +821,7 @@ namespace
auto* weaponFullDef = memory->Create<WeaponFullDef>(); auto* weaponFullDef = memory->Create<WeaponFullDef>();
memset(weaponFullDef, 0, sizeof(WeaponFullDef)); memset(weaponFullDef, 0, sizeof(WeaponFullDef));
InitWeaponFullDef(weaponFullDef); InitWeaponFullDef(weaponFullDef);
weaponFullDef->weapCompleteDef.szInternalName = memory->Dup(assetName.c_str());
InfoStringToWeaponConverter converter( InfoStringToWeaponConverter converter(
infoString, weaponFullDef, zone->m_script_strings, memory, manager, weapon_fields, std::extent_v<decltype(weapon_fields)>); infoString, weaponFullDef, zone->m_script_strings, memory, manager, weapon_fields, std::extent_v<decltype(weapon_fields)>);
@ -831,8 +831,6 @@ namespace
return true; return true;
} }
weaponFullDef->weapCompleteDef.szInternalName = memory->Dup(assetName.c_str());
CalculateWeaponFields(weaponFullDef, memory); CalculateWeaponFields(weaponFullDef, memory);
manager->AddAsset(ASSET_TYPE_WEAPON, manager->AddAsset(ASSET_TYPE_WEAPON,