Fixed docking ports leaking if multiple vessels have docked to the main sub, cargo is always spawned in the main sub

This commit is contained in:
Regalis
2016-08-19 20:13:24 +03:00
parent ef0098d52a
commit 08817090a0
5 changed files with 9 additions and 3 deletions
+4
View File
@@ -30,6 +30,9 @@ namespace Barotrauma
private float higherSurface;
private float lowerSurface;
//if set to true, hull connections of this gap won't be updated when changes are being done to hulls
public bool DisableHullRechecks;
public float Open
{
get { return open; }
@@ -119,6 +122,7 @@ namespace Barotrauma
{
foreach (Gap g in GapList)
{
if (g.DisableHullRechecks) continue;
g.FindHulls();
}
}
+2 -1
View File
@@ -631,12 +631,13 @@ namespace Barotrauma
if (!wayPoint2.linkedTo.Contains(this)) wayPoint2.linkedTo.Add(this);
}
public static WayPoint GetRandom(SpawnType spawnType = SpawnType.Human, Job assignedJob = null)
public static WayPoint GetRandom(SpawnType spawnType = SpawnType.Human, Job assignedJob = null, Submarine sub = null)
{
List<WayPoint> wayPoints = new List<WayPoint>();
foreach (WayPoint wp in WayPointList)
{
if (sub != null && wp.Submarine != sub) continue;
if (wp.spawnType != spawnType) continue;
if (assignedJob != null && wp.assignedJob != assignedJob.Prefab) continue;