xrGame/Inventory.cpp: fix using of eatable items for NPC

ChugunovRoman · Dec 15, 2024 · c2bf09e · c2bf09e
1 parent bc91f16
commit c2bf09e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/xrGame/Inventory.cpp b/src/xrGame/Inventory.cpp
@@ -1182,7 +1182,7 @@ bool CInventory::Eat(PIItem pIItem)
     if (pItemToEat->object().H_Parent()->ID() != entity_alive->ID())
         return false;
 
-    if (g_enhancend_anims && pSettings->line_exist(pIItem->m_section_id, "hud"))
+    if (g_enhancend_anims && m_pOwner->object_id() == 0 && pSettings->line_exist(pIItem->m_section_id, "hud"))
     {
         if (CCustomDetector* detector = smart_cast<CCustomDetector*>(Actor()->inventory().ItemFromSlot(DETECTOR_SLOT)))
         {

diff --git a/src/xrGame/eatable_item_object.cpp b/src/xrGame/eatable_item_object.cpp
@@ -249,11 +249,28 @@ void CEatableItemObject::OnStateSwitch(u32 S, u32 oldState)
     {
     case eShowing:
     {
-        g_player_hud[0]->attach_item(this);
-        m_sounds.PlaySound("useAnmSound", Fvector().set(0, 0, 0), this, true, false);
-        PlayHUDMotion("anm_use", "anim_use", FALSE, this, GetState());
-        PlayCamAnim("cam_anm_use");
-        SetPending(true);
+        if (Parent)
+        {
+            CInventoryOwner* m_pOwner = Parent->cast_inventory_owner();
+            if (m_pOwner && m_pOwner->object_id() == 0)
+            {
+                g_player_hud[0]->attach_item(this);
+                m_sounds.PlaySound("useAnmSound", Fvector().set(0, 0, 0), this, true, false);
+                PlayHUDMotion("anm_use", "anim_use", FALSE, this, GetState());
+                PlayCamAnim("cam_anm_use");
+                SetPending(true);
+            }
+            else
+            {
+                UseBy();
+                SwitchState(eHiding);
+            }
+        }
+        else
+        {
+            UseBy();
+            SwitchState(eHiding);
+        }
     }
     break;
     case eHiding:
@@ -284,8 +301,11 @@ void CEatableItemObject::RemoveItemIfNecessaryOrMoveToRuck()
 }
 void CEatableItemObject::RestoreSlot()
 {
+    if (!Parent)
+        return;
+
     CInventoryOwner* m_pOwner = Parent->cast_inventory_owner();
-    if (!m_pOwner)
+    if (!m_pOwner || m_pOwner->object_id() != 0)
         return;
 
     m_pOwner->inventory().SetActiveSlot(prev_slot);