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

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
@@ -68,7 +68,7 @@ namespace Barotrauma
partial class Inventory
{
protected class SlotReference
public class SlotReference
{
public readonly Inventory Inventory;
public readonly InventorySlot Slot;
@@ -133,6 +133,10 @@ namespace Barotrauma
}
}
public static SlotReference SelectedSlot
{
get { return selectedSlot; }
}
protected virtual void CreateSlots()
{