More descriptive coroutine exception error messages, more null checks in Level.Unload

This commit is contained in:
Regalis
2016-05-30 18:33:46 +03:00
parent b512a7ec18
commit 1828198abf
2 changed files with 30 additions and 14 deletions
+1 -1
View File
@@ -93,7 +93,7 @@ namespace Barotrauma
catch (Exception e) catch (Exception e)
{ {
DebugConsole.ThrowError("Coroutine " + Coroutines[i] + " threw an exception: " + e.Message); DebugConsole.ThrowError("Coroutine " + Coroutines[i].Name + " threw an exception: " + e.Message);
#if DEBUG #if DEBUG
throw e; throw e;
+17 -1
View File
@@ -870,11 +870,20 @@ namespace Barotrauma
private void Unload() private void Unload()
{ {
if (renderer!=null) renderer.Dispose(); if (renderer!=null)
{
renderer.Dispose();
renderer = null; renderer = null;
}
if (ruins != null)
{
ruins.Clear(); ruins.Clear();
ruins = null;
}
if (wrappingWalls!=null)
{
for (int side = 0; side < 2; side++) for (int side = 0; side < 2; side++)
{ {
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
@@ -883,10 +892,17 @@ namespace Barotrauma
} }
} }
wrappingWalls = null;
}
cells = null; cells = null;
if (bodies != null)
{
bodies.Clear(); bodies.Clear();
bodies = null; bodies = null;
}
loaded = null; loaded = null;
} }