(b7b7e6b02) Rename "courage" to "resolution" and disable it, because it's not yet used anywhere.

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:18:20 +03:00
parent dbb7b175d4
commit bed3afab4b
24 changed files with 427 additions and 199 deletions
@@ -271,10 +271,13 @@ namespace Barotrauma
{
bool isEquipped = !equip || character.HasEquippedItem(item);
if (character.Inventory.Items.Contains(item) && isEquipped) { return true; }
Item rootContainer = item.GetRootContainer();
if (rootContainer != null && rootContainer.ParentInventory is CharacterInventory)
if (!equip)
{
return rootContainer.ParentInventory.Owner == character;
Item rootContainer = item.GetRootContainer();
if (rootContainer != null && rootContainer.ParentInventory is CharacterInventory)
{
return rootContainer.ParentInventory.Owner == character;
}
}
return false;
}