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

- the server log view is not cleared when saving the log (but old messages are removed when going over the max number of lines)

Browse Source 
- log can be viewed in the server lobby, not just in-game
- logging pump, reactor & battery state usage
- GUIListBox.MouseRect doesn't return an empty rect anymore -> listboxes without selectable content can be scrolled with the mouse wheel
This commit is contained in:
Regalis
2017-05-08 21:30:54 +03:00
parent 7dad837733
commit bee570e2e3
7 changed files with 123 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Subsurface/Source/Networking/GameServer.cs
View File

@@ -65,6 +65,11 @@ namespace Barotrauma.Networking
get { return entityEventManager; }
}
public ServerLog ServerLog
{
get { return log; }
}
public TimeSpan UpdateInterval
{
get { return updateInterval; }
@@ -194,7 +199,7 @@ namespace Barotrauma.Networking
GameMain.NetworkMember = null;
yield return CoroutineStatus.Success;
}
if (config.EnableUPnP)
{
server.UPnP.ForwardPort(config.Port, "barotrauma");
@@ -228,7 +233,7 @@ namespace Barotrauma.Networking
updateInterval = new TimeSpan(0, 0, 0, 0, 150);
DebugConsole.NewMessage("Server started", Color.Green);
Log("Server started", Color.Cyan);
GameMain.NetLobbyScreen.Select();
started = true;

28
Subsurface/Source/Networking/ServerLog.cs
View File

@@ -20,6 +20,8 @@ namespace Barotrauma.Networking
private readonly Queue<ColoredText> lines;
private int unsavedLineCount;
public int LinesPerFile
{
get { return linesPerFile; }
@@ -38,7 +40,7 @@ namespace Barotrauma.Networking
string logLine = "[" + DateTime.Now.ToLongTimeString() + "] " + line;
var newText = new ColoredText(logLine, color == null ? Color.White : (Color)color);
lines.Enqueue(newText);
if (LogFrame != null)
@@ -47,11 +49,19 @@ namespace Barotrauma.Networking
listBox.UpdateScrollBarSize();
}
unsavedLineCount++;
if (lines.Count >= LinesPerFile)
if (unsavedLineCount >= LinesPerFile)
{
Save();
lines.Clear();
unsavedLineCount = 0;
}
while (lines.Count > LinesPerFile)
{
listBox.RemoveChild(listBox.children[0]);
lines.Dequeue();
}
}
@@ -59,10 +69,10 @@ namespace Barotrauma.Networking
{
LogFrame = new GUIFrame(new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), Color.Black * 0.5f);
GUIFrame innerFrame = new GUIFrame(new Rectangle(0, 0, 500, 400), null, Alignment.Center, "", LogFrame);
GUIFrame innerFrame = new GUIFrame(new Rectangle(0, 0, 500, 420), null, Alignment.Center, "", LogFrame);
innerFrame.Padding = new Vector4(10.0f, 20.0f, 10.0f, 20.0f);
new GUITextBlock(new Rectangle(-200, 0, 100, 15), "Filter", "", Alignment.TopRight, Alignment.TopRight, innerFrame, false, GUI.SmallFont);
new GUITextBlock(new Rectangle(-200, 0, 100, 15), "Filter", "", Alignment.TopRight, Alignment.CenterRight, innerFrame, false, GUI.SmallFont);
GUITextBox searchBox = new GUITextBox(new Rectangle(-20, 0, 180, 15), Alignment.TopRight, "", innerFrame);
searchBox.Font = GUI.SmallFont;
@@ -73,7 +83,7 @@ namespace Barotrauma.Networking
clearButton.OnClicked = ClearFilter;
clearButton.UserData = searchBox;
listBox = new GUIListBox(new Rectangle(0, 30, 0, 310), "", innerFrame);
listBox = new GUIListBox(new Rectangle(0, 30, 0, 320), "", innerFrame);
var currLines = lines.ToList();
@@ -84,9 +94,9 @@ namespace Barotrauma.Networking
listBox.UpdateScrollBarSize();
if (listBox.BarScroll==0.0f || listBox.BarScroll==1.0f) listBox.BarScroll = 1.0f;
if (listBox.BarScroll == 0.0f || listBox.BarScroll == 1.0f) listBox.BarScroll = 1.0f;
GUIButton closeButton = new GUIButton(new Rectangle(0,0,100, 15), "Close", Alignment.BottomRight, "", innerFrame);
GUIButton closeButton = new GUIButton(new Rectangle(-100, 10, 100, 15), "Close", Alignment.BottomRight, "", innerFrame);
closeButton.OnClicked = (GUIButton button, object userData) =>
{
LogFrame = null;
@@ -173,8 +183,6 @@ namespace Barotrauma.Networking
{
DebugConsole.ThrowError("Saving the server log to " + filePath + " failed", e);
}
lines.Clear();
}
}
}