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

-try-catch blocks for GUIComponents fixedChildren lists

Browse Source 
-player name and IP address in debug messages
-crash logs now output up to 15 messages
This commit is contained in:
juanjp600
2017-03-03 15:14:18 -03:00
parent e059a08688
commit ee16f0708b
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Subsurface/Source/GUI/GUIComponent.cs
View File

@@ -29,10 +29,18 @@ namespace Barotrauma
if (ComponentsToUpdate.Contains(this)) return;
ComponentsToUpdate.Add(this);
List<GUIComponent> fixedChildren = new List<GUIComponent>(children);
foreach (GUIComponent c in fixedChildren)
try
{
c.AddToGUIUpdateList();
List<GUIComponent> fixedChildren = new List<GUIComponent>(children);
foreach (GUIComponent c in fixedChildren)
{
c.AddToGUIUpdateList();
}
}
catch (Exception e)
{
DebugConsole.NewMessage("Error in AddToGUIUPdateList! GUIComponent runtime type: "+this.GetType().ToString()+"; children count: "+children.Count.ToString(),Color.Red);
throw e;
}
}
@@ -372,13 +380,21 @@ namespace Barotrauma
}*/
//use a fixed list since children can change their order in the main children list
//TODO: maybe find a more efficient way of handling changes in list order
List<GUIComponent> fixedChildren = new List<GUIComponent>(children);
foreach (GUIComponent c in fixedChildren)
try
{
if (!c.Visible) continue;
c.Update(deltaTime);
//use a fixed list since children can change their order in the main children list
//TODO: maybe find a more efficient way of handling changes in list order
List<GUIComponent> fixedChildren = new List<GUIComponent>(children);
foreach (GUIComponent c in fixedChildren)
{
if (!c.Visible) continue;
c.Update(deltaTime);
}
}
catch (Exception e)
{
DebugConsole.NewMessage("Error in Update! GUIComponent runtime type: " + this.GetType().ToString() + "; children count: " + children.Count.ToString(), Color.Red);
throw e;
}
}

6
Subsurface/Source/Networking/GameServerLogin.cs
View File

@@ -86,9 +86,7 @@ namespace Barotrauma.Networking
inc.SenderConnection.Disconnect("Server full");
return;
}
DebugConsole.NewMessage("New player has joined the server", Color.White);
byte userID;
string version = "", packageName = "", packageHash = "", name = "";
try
@@ -106,6 +104,8 @@ namespace Barotrauma.Networking
return;
}
DebugConsole.NewMessage("New player has joined the server (" + name + ", " + inc.SenderConnection.RemoteEndPoint.Address.ToString() + ")", Color.White);
#if !DEBUG
if (string.IsNullOrWhiteSpace(name))
{

2
Subsurface/Source/Program.cs
View File

@@ -157,7 +157,7 @@ namespace Barotrauma
sb.AppendLine("\n");
sb.AppendLine("Last debug messages:");
for (int i = DebugConsole.Messages.Count - 1; i > 0 && i > DebugConsole.Messages.Count - 10; i-- )
for (int i = DebugConsole.Messages.Count - 1; i > 0 && i > DebugConsole.Messages.Count - 15; i-- )
{
sb.AppendLine(" "+DebugConsole.Messages[i].Time+" - "+DebugConsole.Messages[i].Text);
}