For non-weapon items respect spawn count value.

OpenXRay · Jan 3, 2025 · 3ed7c04 · 3ed7c04
1 parent 4f355fa
commit 3ed7c04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/xrGame/alife_object.cpp b/src/xrGame/alife_object.cpp
@@ -125,6 +125,13 @@ void CSE_ALifeObject::spawn_supplies(LPCSTR ini_string)
                                     alife().spawn_item(ammoSec, o_Position, m_tNodeID, m_tGraphID, ID);
                         }
                     }
+                    // If not weapon item, handle count as literal count, not ammo (useful for grenades and consumables).
+                    else
+                    {
+                        for (u32 i = 1; i <= spawnCount - 1; ++i)
+                            alife().spawn_item(itmSection, o_Position, m_tNodeID, m_tGraphID, ID);
+                    }
+
                     if (const auto IItem = smart_cast<CSE_ALifeInventoryItem*>(E))
                         IItem->m_fCondition = fCond;
                 }

diff --git a/src/xrServerEntities/xrServer_Objects_ALife.h b/src/xrServerEntities/xrServer_Objects_ALife.h
@@ -168,6 +168,7 @@ class CSE_ALifeObject : public CSE_Abstract, public CRandom
     virtual u32 ef_weapon_type() const;
     virtual u32 ef_detector_type() const;
 #ifdef XRGAME_EXPORTS
+    virtual bool is_spawn_supplies_flag_set(LPCSTR, LPCSTR);
     virtual void spawn_supplies(LPCSTR);
     virtual void spawn_supplies();
     CALifeSimulator& alife() const;