(4d924cc86) Fixes to New Game and Game Settings layouts

+ merge fix
2019-04-01 22:53:55 +03:00
parent 22372dfffe
commit cae366e807
8 changed files with 36 additions and 71 deletions
@@ -890,7 +890,6 @@ namespace Barotrauma
            if (closestBody.UserData is Structure wall && wall.Submarine != null)
            {
                int sectionIndex = wall.FindSectionIndex(ConvertUnits.ToDisplayUnits(Submarine.LastPickedPosition));
-                int passableHoleCount = GetMinimumPassableHoleCount();

                float sectionDamage = wall.SectionDamage(sectionIndex);
                for (int i = sectionIndex - 2; i <= sectionIndex + 2; i++)
@@ -1232,7 +1231,7 @@ namespace Barotrauma
                                valueModifier = isOutdoor ? 1 : 0;
                                valueModifier *= isOpen ? 5 : 1;
                            }
-                            if (isDisabled)
+                            else
                            {
                                valueModifier = isOutdoor ? 0 : 1;
                                valueModifier *= isOpen ? 0 : 1;