Highlight equpped items only if option for this is enabled

Author: Xottab-DUTY

src/xrGame/console_commands.cpp

@@ -102,7 +102,10 @@ int g_keypress_on_start = 1;
 
 ENGINE_API extern float g_console_sensitive;
 
-extern BOOL g_ai_die_in_anomaly; //Alundaio
+//Alundaio
+extern BOOL g_ai_die_in_anomaly;
+int g_inv_highlight_equipped = 0;
+//-Alundaio
 
 void register_mp_console_commands();
 //-----------------------------------------------------------
@@ -1898,6 +1901,7 @@ void CCC_RegisterCommands()
     CMD3(CCC_Mask, "g_autopickup", &psActorFlags, AF_AUTOPICKUP);
     CMD3(CCC_Mask, "g_dynamic_music", &psActorFlags, AF_DYNAMIC_MUSIC);
     CMD3(CCC_Mask, "g_important_save", &psActorFlags, AF_IMPORTANT_SAVE);
+    CMD3(CCC_Integer, "g_inv_highlight_equipped", &g_inv_highlight_equipped, 0, 1);
 
 #ifdef DEBUG
     CMD1(CCC_ShowSmartCastStats, "show_smart_cast_stats");

src/xrGame/ui/UIDragDropListEx.cpp

@@ -482,9 +482,13 @@ bool CUICellContainer::AddSimilar(CUICellItem* itm)
         return false;
 
     //Alundaio: Don't stack equipped items
-    const PIItem iitem = static_cast<PIItem>(itm->m_pData);
-    if (iitem && iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(iitem->BaseSlot()) == iitem)
-        return false;
+    extern int g_inv_highlight_equipped;
+    if (g_inv_highlight_equipped)
+    {
+        const PIItem iitem = static_cast<PIItem>(itm->m_pData);
+        if (iitem && iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(iitem->BaseSlot()) == iitem)
+            return false;
+    }
     //-Alundaio
 
     CUICellItem* i = FindSimilar(itm);
@@ -509,9 +513,13 @@ CUICellItem* CUICellContainer::FindSimilar(CUICellItem* itm)
         auto i = (CUICellItem*)it;
 #endif
         //Alundaio: Don't stack equipped items
-        auto iitem = static_cast<PIItem>(i->m_pData);
-        if (iitem && iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(iitem->BaseSlot()) == iitem)
-            continue;
+        extern int g_inv_highlight_equipped;
+        if (g_inv_highlight_equipped)
+        {
+            auto iitem = static_cast<PIItem>(i->m_pData);
+            if (iitem && iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(iitem->BaseSlot()) == iitem)
+                continue;
+        }
         //-Alundaio
 
         if (i == itm)
@@ -831,8 +839,8 @@ void CUICellContainer::Draw()
     UI().ClientToScreenScaled(drawLT, drawLT.x, drawLT.y);
 
     const Fvector2 pts[6] = {{0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 1.0f}};
-#define ty 1.0f
-#define tx 0.25f
+    constexpr auto ty = 1.0f;
+    constexpr auto tx = 0.25f;
     const Fvector2 uvs[6] = {{0.0f, 0.0f}, {tx, 0.0f}, {tx, ty}, {0.0f, 0.0f}, {tx, ty}, {0.0f, ty}};
 
     // calculate cell size in screen pixels
@@ -871,9 +879,13 @@ void CUICellContainer::Draw()
                 else
                 {
                     //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 = 2;
+                    extern int g_inv_highlight_equipped;
+                    if (g_inv_highlight_equipped)
+                    {
+                        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 = 2;
+                    }
                     //-Alundaio
                 }
             }