v0.10.6.2
This commit is contained in:
@@ -30,6 +30,8 @@ namespace Barotrauma
|
||||
|
||||
public CampaignMetadata CampaignMetadata;
|
||||
|
||||
protected XElement petsElement;
|
||||
|
||||
public enum TransitionType
|
||||
{
|
||||
None,
|
||||
@@ -188,7 +190,7 @@ namespace Barotrauma
|
||||
|
||||
if (CoroutineManager.IsCoroutineRunning("LevelTransition"))
|
||||
{
|
||||
DebugConsole.ThrowError("Level transition already running.\n" + Environment.StackTrace);
|
||||
DebugConsole.ThrowError("Level transition already running.\n" + Environment.StackTrace.CleanupStackTrace());
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -208,7 +210,7 @@ namespace Barotrauma
|
||||
"leaving sub: " + (leavingSub?.Info?.Name ?? "null") + ", " +
|
||||
"at start: " + (leavingSub?.AtStartPosition.ToString() ?? "null") + ", " +
|
||||
"at end: " + (leavingSub?.AtEndPosition.ToString() ?? "null") + ")\n" +
|
||||
Environment.StackTrace);
|
||||
Environment.StackTrace.CleanupStackTrace());
|
||||
return;
|
||||
}
|
||||
if (nextLevel == null)
|
||||
@@ -220,7 +222,7 @@ namespace Barotrauma
|
||||
"leaving sub: " + (leavingSub?.Info?.Name ?? "null") + ", " +
|
||||
"at start: " + (leavingSub?.AtStartPosition.ToString() ?? "null") + ", " +
|
||||
"at end: " + (leavingSub?.AtEndPosition.ToString() ?? "null") + ")\n" +
|
||||
Environment.StackTrace);
|
||||
Environment.StackTrace.CleanupStackTrace());
|
||||
return;
|
||||
}
|
||||
#if CLIENT
|
||||
|
||||
@@ -150,6 +150,9 @@ namespace Barotrauma
|
||||
case "cargo":
|
||||
CargoManager?.LoadPurchasedItems(subElement);
|
||||
break;
|
||||
case "pets":
|
||||
petsElement = subElement;
|
||||
break;
|
||||
#if SERVER
|
||||
case "availablesubs":
|
||||
foreach (XElement availableSub in subElement.Elements())
|
||||
|
||||
Reference in New Issue
Block a user