(2c9775b8e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-05-06 11:22:36 +03:00
parent b797d112b7
commit 65d627d57c
11 changed files with 237 additions and 132 deletions
@@ -17,6 +17,8 @@ namespace Barotrauma.Items.Components
Passive
};
private bool dynamicDockingIndicator = true;
private bool unsentChanges;
private float networkUpdateTimer;
@@ -653,7 +655,7 @@ namespace Barotrauma.Items.Components
Vector2 dockingDir = sourcePortPos - targetPortPos;
Vector2 normalizedDockingDir = Vector2.Normalize(dockingDir);
if (!DynamicDockingIndicator)
if (!dynamicDockingIndicator)
{
if (steering.DockingSource.IsHorizontal)
{