vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(b6b2972ea) Fixed linked subs not getting docked correctly when loading a saved game. Closes #1381

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-31 20:22:33 +03:00
parent aeeacf6779
commit 1d766ef349
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs
+1 -2
View File
@@ -880,8 +880,7 @@ namespace Barotrauma.Items.Components
List<MapEntity> linked = new List<MapEntity>(item.linkedTo); List<MapEntity> linked = new List<MapEntity>(item.linkedTo);
foreach (MapEntity entity in linked) foreach (MapEntity entity in linked)
{ {
Item linkedItem = entity as Item; if (!(entity is Item linkedItem)) { continue; }
if (linkedItem == null) { continue; }
var dockingPort = linkedItem.GetComponent<DockingPort>(); var dockingPort = linkedItem.GetComponent<DockingPort>();
if (dockingPort != null) if (dockingPort != null)
Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs
+2
View File
@@ -229,6 +229,8 @@ namespace Barotrauma
if (myPort != null) if (myPort != null)
{ {
myPort.Undock();
Vector2 portDiff = myPort.Item.WorldPosition - sub.WorldPosition; Vector2 portDiff = myPort.Item.WorldPosition - sub.WorldPosition;
Vector2 offset = (myPort.IsHorizontal ? Vector2 offset = (myPort.IsHorizontal ?
Vector2.UnitX * Math.Sign(linkedPort.Item.WorldPosition.X - myPort.Item.WorldPosition.X) : Vector2.UnitX * Math.Sign(linkedPort.Item.WorldPosition.X - myPort.Item.WorldPosition.X) :