From fedd955e6831295f83b7d62bb5dd23751bd5e360 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Sun, 21 Apr 2024 18:44:51 +0200
Subject: [PATCH] fix: attachment loader not properly loading attributes

---
 .../Game/IW5/Weapon/JsonWeaponAttachmentLoader.cpp         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ObjLoading/Game/IW5/Weapon/JsonWeaponAttachmentLoader.cpp b/src/ObjLoading/Game/IW5/Weapon/JsonWeaponAttachmentLoader.cpp
index c816ac1b..9dcce10a 100644
--- a/src/ObjLoading/Game/IW5/Weapon/JsonWeaponAttachmentLoader.cpp
+++ b/src/ObjLoading/Game/IW5/Weapon/JsonWeaponAttachmentLoader.cpp
@@ -60,7 +60,7 @@ namespace
     CreateXModelArrayFromJson(jAttachment.propertyName, attachment.propertyName, #propertyName, count, attachment);
 
 #define CONVERT_ATTRIBUTE(attributeClass, attributeName)                                                                                                       \
-    if (jAttachment.ammoGeneral)                                                                                                                               \
+    if (jAttachment.attributeName)                                                                                                                             \
     {                                                                                                                                                          \
         using AttributeType = std::remove_pointer_t<decltype(attachment.attributeName)>;                                                                       \
         attachment.attributeName = static_cast<AttributeType*>(m_memory.Alloc(sizeof(AttributeType)));                                                         \
@@ -520,8 +520,13 @@ namespace
         {
             if (jRumbles.fireRumble)
                 rumbles.fireRumble = m_memory.Dup(jRumbles.fireRumble.value().c_str());
+            else
+                rumbles.fireRumble = nullptr;
+
             if (jRumbles.meleeImpactRumble)
                 rumbles.meleeImpactRumble = m_memory.Dup(jRumbles.meleeImpactRumble.value().c_str());
+            else
+                rumbles.meleeImpactRumble = nullptr;
 
             return true;
         }