vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed subinventory becoming active in the controlled character's inventory when the slot with the same index is highlighted in a grabbed character's inventory (or vice versa), fixed CPR & grab buttons being drawn on top of subinventories

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-01-25 09:36:58 +02:00
parent 30e624e572
commit 43d48ceb13
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs
+6 -1
View File
@@ -169,7 +169,11 @@ namespace Barotrauma
if (highlightedSubInventorySlot != null)
{
UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex);
if (highlightedSubInventorySlot.Inventory == this)
{
UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex);
}
if (highlightedSubInventory.slots == null ||
(!highlightedSubInventorySlot.Slot.InteractRect.Contains(PlayerInput.MousePosition) && !highlightedSubInventory.slots.Any(s => s.InteractRect.Contains(PlayerInput.MousePosition))))
{
@@ -186,6 +190,7 @@ namespace Barotrauma
{
highlightedSubInventory = subInventory;
highlightedSubInventorySlot = selectedSlot;
UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex);
}
}
}