aeafa16...4d3cf73

This commit is contained in:
Joonas Rikkonen
2019-03-18 22:57:05 +02:00
parent 3301bed442
commit 23687fbf2f
77 changed files with 2275 additions and 717 deletions
@@ -625,8 +625,7 @@ namespace Barotrauma
{
foreach (Item item in itemInventory.Items)
{
if (item == null) continue;
item.Drop();
item?.Drop(null);
}
}
else // If current screen is not subeditor, delete anyway to avoid lingering objects
@@ -671,8 +670,7 @@ namespace Barotrauma
{
foreach (Item item in itemInventory.Items)
{
if (item == null) continue;
item.Drop();
item?.Drop(null);
}
}
else // If current screen is not subeditor, delete anyway to avoid lingering objects
@@ -703,8 +701,7 @@ namespace Barotrauma
{
foreach (Item item in itemInventory.Items)
{
if (item == null) continue;
item.Drop();
item?.Drop(null);
}
}
else // If current screen is not subeditor, delete anyway to avoid lingering objects
@@ -1457,7 +1454,7 @@ namespace Barotrauma
Item existingWire = dummyCharacter.SelectedItems.FirstOrDefault(i => i != null && i.Prefab == userData as ItemPrefab);
if (existingWire != null)
{
existingWire.Drop();
existingWire.Drop(null);
existingWire.Remove();
return false;
}
@@ -1470,7 +1467,7 @@ namespace Barotrauma
existingWire = dummyCharacter.Inventory.Items[slotIndex];
if (existingWire != null && existingWire.Prefab != userData as ItemPrefab)
{
existingWire.Drop();
existingWire.Drop(null);
existingWire.Remove();
}