= fixed being able to repair consumables with more then 1 usage

~ st_unequip is hardcoded string to display text for unequippable slotted items
digitall · Dec 17, 2017 · 4c6fc27 · 4c6fc27
1 parent d25f6bf
commit 4c6fc27
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/xrGame/ui/UIActorMenuInventory.cpp b/src/xrGame/ui/UIActorMenuInventory.cpp
@@ -926,7 +926,12 @@ void CUIActorMenu::PropertiesBoxForSlots(PIItem item, bool& b_show)
         if (!pOutfit)
         {
             if (!pHelmet)
-                m_UIPropertiesBox->AddItem("st_move_to_bag", NULL, INVENTORY_TO_BAG_ACTION);
+            {
+                if (m_currMenuMode == mmDeadBodySearch)
+                    m_UIPropertiesBox->AddItem("st_move_to_bag", nullptr, INVENTORY_TO_BAG_ACTION);
+                else
+                    m_UIPropertiesBox->AddItem("st_unequip", nullptr, INVENTORY_TO_BAG_ACTION);
+            }
             else
                 m_UIPropertiesBox->AddItem("st_undress_helmet", NULL, INVENTORY_TO_BAG_ACTION);
         }

diff --git a/src/xrGame/ui/UIActorMenu_script.cpp b/src/xrGame/ui/UIActorMenu_script.cpp
@@ -12,6 +12,7 @@
 #include "UICellItem.h"
 #include "ai_space.h"
 #include "xrScriptEngine/script_engine.hpp"
+#include "eatable_item.h"
 
 using namespace luabind;
 
@@ -27,6 +28,15 @@ void CUIActorMenu::TryRepairItem(CUIWindow* w, void* d)
         return;
     }
     LPCSTR item_name = item->m_section_id.c_str();
+
+    CEatableItem* EItm = smart_cast<CEatableItem*>(item);
+    if (EItm)
+    {
+        bool allow_repair = !!READ_IF_EXISTS(pSettings, r_bool, item_name, "allow_repair", false);
+        if (!allow_repair)
+            return;
+    }
+
     LPCSTR partner = m_pPartnerInvOwner->CharacterInfo().Profile().c_str();
 
     luabind::functor<bool> funct;

diff --git a/src/xrGame/ui/UIDragDropListEx.cpp b/src/xrGame/ui/UIDragDropListEx.cpp
@@ -871,7 +871,7 @@ void CUICellContainer::Draw()
                     //Alundaio: Highlight equipped items
                     PIItem iitem = static_cast<PIItem>(ui_cell.m_item->m_pData);
                     if (iitem && iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(iitem->BaseSlot()) == iitem)
-                        select_mode = 3;
+                        select_mode = 2;
                     //-Alundaio
                 }
             }