(3340f2f90) Don't do impact damage to structures in Structure.OnWallCollision. Impact damage was disabled when a character hits the sub from the outside (implemented in SubmarineBody), but should've been done here as well.

2019-04-29 21:05:21 +03:00
parent 69c4b9a74f
commit 33747a63b0
6 changed files with 50 additions and 50 deletions
@@ -793,7 +793,7 @@ namespace Barotrauma

            base.Draw(spriteBatch);
            
-            if (hideButton != null && hideButton.Visible)
+            if (hideButton != null && hideButton.Visible && !Locked)
            {
                hideButton.DrawManually(spriteBatch, alsoChildren: true);
            }
@@ -835,6 +835,7 @@ namespace Barotrauma
                    color = Color.White;
                    highlightedQuickUseSlot = slots[i];
                }
+                if (Locked) { color *= 0.3f; }

                var quickUseIndicator = Items[i].AllowedSlots.Any(a => a == InvSlotType.Any) ?
                    EquipIndicator : DropIndicator;