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

Fixed items being dropped when attempting to place them in an itemcontainer slot that's on a normal inventory slot. Closes #200

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-12-31 01:59:49 +02:00
parent 7d2b701784
commit c77c598cb6
3 changed files with 141 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs
+31 -14
View File
@@ -2,6 +2,7 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System.Collections.Generic;
using System.Linq;
namespace Barotrauma
{
@@ -119,7 +120,7 @@ namespace Barotrauma
}
public override void Update(float deltaTime, bool subInventory = false)
public override void Update(float deltaTime, bool isSubInventory = false)
{
base.Update(deltaTime);
@@ -157,19 +158,39 @@ namespace Barotrauma
}
}
draggingItem = null;
GUI.PlayUISound(wasPut ? GUISoundType.PickItem : GUISoundType.PickItemFail);
}
if (selectedSlot > -1)
if (highlightedSubInventorySlot != null)
{
UpdateSubInventory(deltaTime, selectedSlot);
UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex);
if (highlightedSubInventory.slots == null ||
(!highlightedSubInventorySlot.Slot.InteractRect.Contains(PlayerInput.MousePosition) && !highlightedSubInventory.slots.Any(s => s.InteractRect.Contains(PlayerInput.MousePosition))))
{
highlightedSubInventory = null;
highlightedSubInventorySlot = null;
}
}
else
{
if (selectedSlot?.Inventory == this)
{
var subInventory = GetSubInventory(selectedSlot.SlotIndex);
if (subInventory != null)
{
highlightedSubInventory = subInventory;
highlightedSubInventorySlot = selectedSlot;
}
}
}
if (character == Character.Controlled)
{
for (int i = 0; i < capacity; i++)
{
if (selectedSlot != i &&
if ((selectedSlot == null || selectedSlot.SlotIndex != i) &&
Items[i] != null && Items[i].CanUseOnSelf && character.HasSelectedItem(Items[i]))
{
//-3 because selected items are in slots 3 and 4 (hands)
@@ -220,7 +241,7 @@ namespace Barotrauma
}
}
selectedSlot = -1;
selectedSlot = null;
}
public void DrawOwn(SpriteBatch spriteBatch)
@@ -270,7 +291,7 @@ namespace Barotrauma
{
for (int i = 0; i < capacity; i++)
{
if (selectedSlot != i &&
if ((selectedSlot == null || selectedSlot.SlotIndex != i) &&
Items[i] != null && Items[i].CanUseOnSelf && character.HasSelectedItem(Items[i]))
{
useOnSelfButton[i - 3].Draw(spriteBatch);
@@ -278,15 +299,11 @@ namespace Barotrauma
}
}
if (selectedSlot > -1)
for (int i = 0; i < capacity; i++)
{
DrawSubInventory(spriteBatch, selectedSlot);
if (selectedSlot > -1 &&
!slots[selectedSlot].IsHighlighted &&
(draggingItem == null || draggingItem.Container != Items[selectedSlot]))
if (slots[i].IsHighlighted)
{
selectedSlot = -1;
DrawSubInventory(spriteBatch, i);
}
}
}