xrGame/Inventory.cpp: fix show detector after item's animations

ChugunovRoman · Dec 14, 2024 · 0cc68f8 · 0cc68f8
1 parent 9f77430
commit 0cc68f8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/xrGame/CustomDetector.cpp b/src/xrGame/CustomDetector.cpp
@@ -241,6 +241,7 @@ void CCustomDetector::OnAnimationEnd(u32 state)
     case eShowing:
     {
         SwitchState(eIdle);
+        m_bDetectorActive = true;
         if (IsUsingCondition() && m_fDecayRate > 0.f)
             this->SetCondition(-m_fDecayRate);
         if (g_player_hud[0]->attached_item())
@@ -268,6 +269,7 @@ void CCustomDetector::OnAnimationEnd(u32 state)
         g_player_hud[1]->detach_item(this);
         g_player_hud[0]->after_detach_item_idx(this);
         g_player_hud[0]->set_bone_visible("l_clavicle", TRUE, FALSE);
+        m_bDetectorActive = false;
     }
     break;
     }
@@ -276,7 +278,7 @@ void CCustomDetector::OnAnimationEnd(u32 state)
 void CCustomDetector::UpdateXForm() { CInventoryItem::UpdateXForm(); }
 void CCustomDetector::OnActiveItem()
 {
-    m_bDetectorActive = true;
+    m_bDetectorActive = false;
 }
 void CCustomDetector::OnHiddenItem()
 {

diff --git a/src/xrGame/Inventory.cpp b/src/xrGame/Inventory.cpp
@@ -1186,10 +1186,13 @@ bool CInventory::Eat(PIItem pIItem)
     {
         if (CCustomDetector* detector = smart_cast<CCustomDetector*>(Actor()->inventory().ItemFromSlot(DETECTOR_SLOT)))
         {
-            detector->HideDetector(CCustomDetector::eQuick);
-            CEatableItemObject* pItemToEatObj = smart_cast<CEatableItemObject*>(pIItem);
-            if (pItemToEatObj)
-                pItemToEatObj->SetRestoreDetector(true);
+            if (detector->IsActive())
+            {
+                detector->HideDetector(CCustomDetector::eQuick);
+                CEatableItemObject* pItemToEatObj = smart_cast<CEatableItemObject*>(pIItem);
+                if (pItemToEatObj)
+                    pItemToEatObj->SetRestoreDetector(true);
+            }
         }
 
         CurrentGameUI()->GetActorMenu().HideDialog();

diff --git a/src/xrGame/eatable_item_object.cpp b/src/xrGame/eatable_item_object.cpp
@@ -244,7 +244,7 @@ void CEatableItemObject::RestoreSlot()
     if (restor_detector)
     {
         if (CCustomDetector* detector = smart_cast<CCustomDetector*>(Actor()->inventory().ItemFromSlot(DETECTOR_SLOT)))
-            detector->ShowDetector(CCustomDetector::eNone);
+            detector->ShowDetector(CCustomDetector::eFast);
     }
 
     restor_detector = false;