From 1601c8748120fafbe6810a243a275d73e5166c1b Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Sun, 21 Apr 2024 19:34:28 +0200
Subject: [PATCH] chore: set internal name earlier

---
 src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp | 4 +---
 src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp
index ccc8df95..a4edbf06 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp
@@ -258,7 +258,6 @@ namespace
         weapon->weapDef.parallelBounce = weapon->parallelBounce;
         weapon->weapDef.perpendicularBounce = weapon->perpendicularBounce;
         weapon->weapDef.locationDamageMultipliers = weapon->locationDamageMultipliers;
-        weapon->weapCompleteDef.szInternalName = "";
 
         for (const auto& field : weapon_fields)
         {
@@ -397,6 +396,7 @@ namespace
         auto* weaponFullDef = memory->Create<WeaponFullDef>();
         memset(weaponFullDef, 0, sizeof(WeaponFullDef));
         InitWeaponFullDef(weaponFullDef);
+        weaponFullDef->weapCompleteDef.szInternalName = memory->Dup(assetName.c_str());
 
         InfoStringToWeaponConverter converter(
             infoString, weaponFullDef, zone->m_script_strings, memory, manager, weapon_fields, std::extent_v<decltype(weapon_fields)>);
@@ -406,8 +406,6 @@ namespace
             return true;
         }
 
-        weaponFullDef->weapCompleteDef.szInternalName = memory->Dup(assetName.c_str());
-
         CalculateWeaponFields(weaponFullDef, memory);
 
         manager->AddAsset(ASSET_TYPE_WEAPON,
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp
index 07274569..0da50ba4 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp
@@ -683,7 +683,6 @@ namespace
         weapon->weapDef.parallelBounce = weapon->parallelBounce;
         weapon->weapDef.perpendicularBounce = weapon->perpendicularBounce;
         weapon->weapDef.locationDamageMultipliers = weapon->locationDamageMultipliers;
-        weapon->weapCompleteDef.szInternalName = "";
 
         for (const auto& field : weapon_fields)
         {
@@ -822,6 +821,7 @@ namespace
         auto* weaponFullDef = memory->Create<WeaponFullDef>();
         memset(weaponFullDef, 0, sizeof(WeaponFullDef));
         InitWeaponFullDef(weaponFullDef);
+        weaponFullDef->weapCompleteDef.szInternalName = memory->Dup(assetName.c_str());
 
         InfoStringToWeaponConverter converter(
             infoString, weaponFullDef, zone->m_script_strings, memory, manager, weapon_fields, std::extent_v<decltype(weapon_fields)>);
@@ -831,8 +831,6 @@ namespace
             return true;
         }
 
-        weaponFullDef->weapCompleteDef.szInternalName = memory->Dup(assetName.c_str());
-
         CalculateWeaponFields(weaponFullDef, memory);
 
         manager->AddAsset(ASSET_TYPE_WEAPON,