From 6fd4d14497310b3711be805cf213d39298b6c01c Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Tue, 26 Mar 2019 17:34:35 +0200 Subject: [PATCH] (8b8693dbf) Allow editing selected wires in wiring mode, made connection panels a little less transparent. Closes #1329 --- .../Source/Items/Components/Machines/Steering.cs | 12 ------------ .../Source/Items/Components/Signal/Wire.cs | 4 +--- .../Source/Screens/SubEditorScreen.cs | 4 ++++ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs index 6ff7cb7f7..dc51312ea 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs @@ -127,18 +127,6 @@ namespace Barotrauma.Items.Components Stretch = true, RelativeSpacing = 0.03f }; - autopilotTickBox = new GUITickBox(new RectTransform(new Vector2(0.3f, 0.3f), paddedControlContainer.RectTransform), - TextManager.Get("SteeringAutoPilot"), style: "GUIRadioButton") - { - OnSelected = (GUITickBox box) => - { - AutoPilot = box.Selected; - if (AutoPilot && MaintainPos) - { - posToMaintain = controlledSub == null ? item.WorldPosition : controlledSub.WorldPosition; - } - unsentChanges = true; - user = Character.Controlled; maintainPosTickBox = new GUITickBox(new RectTransform(new Vector2(0.2f, 0.2f), paddedAutoPilotControls.RectTransform), TextManager.Get("SteeringMaintainPos"), font: GUI.SmallFont) diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs index dfaad49b9..3a428089a 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs @@ -178,9 +178,7 @@ namespace Barotrauma.Items.Components { if (PlayerInput.LeftButtonClicked()) { - float temp = 0.0f; - int closestSectionIndex = selectedWire.GetClosestSectionIndex(mousePos, sectionSelectDist, out temp); - + int closestSectionIndex = selectedWire.GetClosestSectionIndex(mousePos, sectionSelectDist, out _); if (closestSectionIndex > -1) { selectedWire.nodes.Insert(closestSectionIndex + 1, mousePos); diff --git a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs index 7ac15f8d0..25cbbc9d4 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs @@ -2040,6 +2040,10 @@ namespace Barotrauma dummyCharacter.SelectedConstruction = null; } } + else if (MapEntity.SelectedList.Count == 1) + { + (MapEntity.SelectedList[0] as Item)?.UpdateHUD(cam, dummyCharacter, (float)deltaTime); + } CharacterHUD.Update((float)deltaTime, dummyCharacter, cam); }