~ polished some minor quirks with consumables due to new use_conditio…

…n feature
OpenXRay · Dec 16, 2017 · e21a81f · e21a81f
1 parent 801239f
commit e21a81f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/xrGame/eatable_item.cpp b/src/xrGame/eatable_item.cpp
@@ -138,7 +138,8 @@ bool CEatableItem::UseBy(CEntityAlive* entity_alive)
         m_iRemainingUses = 0;
 
     SetCondition((float)m_iRemainingUses / (float)m_iMaxUses);
-    CurrentGameUI()->GetActorMenu().RefreshConsumableCells();
+    if (IsUsingCondition())
+        CurrentGameUI()->GetActorMenu().RefreshConsumableCells();
 
     return true;
 }
diff --git a/src/xrGame/ui/UIActorMenuInventory.cpp b/src/xrGame/ui/UIActorMenuInventory.cpp
@@ -1300,29 +1300,32 @@ void CUIActorMenu::MoveArtefactsToBag()
 void CUIActorMenu::RefreshConsumableCells()
 {
     CUICellItem* ci = GetCurrentConsumable();
-    if (ci)
+    if (!ci)
+        return;
+
+    if (ci->ChildsCount() > 0)
     {
         CEatableItem* eitm = smart_cast<CEatableItem*>((CEatableItem*)ci->m_pData);
         if (eitm)
         {
-            Fvector2 cp = GetUICursor().GetCursorPosition(); // XXX: This is unused
             CUIDragDropListEx* invlist = GetListByType(iActorBag);
 
-            CUICellItem* parent = invlist->RemoveItem(ci, true);
-            const u32 c = parent->ChildsCount();
-            if (c > 0)
+            if (invlist->IsOwner(ci))
             {
-                while (parent->ChildsCount())
+                CUICellItem* parent = invlist->RemoveItem(ci, true);
+
+                if (parent->ChildsCount() > 0)
                 {
-                    CUICellItem* child = parent->PopChild(nullptr);
-                    invlist->SetItem(child);
+                    while (parent->ChildsCount())
+                    {
+                        CUICellItem* child = parent->PopChild(nullptr);
+                        invlist->SetItem(child);
+                    }
                 }
-
                 invlist->SetItem(parent);
             }
-            else
-                invlist->SetItem(parent);
         }
-        SetCurrentConsumable(nullptr);
     }
+
+    SetCurrentConsumable(nullptr);
 }