Fixed spectators joining messing up the game, textboxes are deselected when switching the screen, nerfed engineer construction level, tickboxes or textboxes cannot be selected through other ui elements

2016-02-16 20:52:39 +02:00
parent 9004205c80
commit f3112e29b4
19 changed files with 55 additions and 37 deletions
@@ -250,7 +250,7 @@ namespace Barotrauma
            foreach (Item item in Item.ItemList)
            {
                if (item.CurrentHull != hull || item.FireProof || item.Condition <= 0.0f) continue;
-                if (item.Inventory != null) return;
+                if (item.ParentInventory != null) return;

                float range = (float)Math.Sqrt(size.X) * 10.0f;
                if (item.Position.X < position.X - range || item.Position.X > position.X + size.X + range) continue;