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

Fix errors

Browse Source
This commit is contained in:
Evil Factory
2022-02-24 14:34:01 -03:00
parent 6340304ae4
commit df55ad1902
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/GameMain.cs
+4 -4
View File
@@ -399,7 +399,7 @@ namespace Barotrauma
prevTicks = currTicks; prevTicks = currTicks;
while (Timing.Accumulator >= Timing.Step) while (Timing.Accumulator >= Timing.Step)
{ {
performanceMeasurement.Start(); performanceCounterTimer.Start();
Timing.TotalTime += Timing.Step; Timing.TotalTime += Timing.Step;
DebugConsole.Update(); DebugConsole.Update();
@@ -415,9 +415,9 @@ namespace Barotrauma
GameMain.Lua.Update(); GameMain.Lua.Update();
GameMain.Lua.hook.Call("think", new object[] { }); GameMain.Lua.hook.Call("think", new object[] { });
performanceMeasurement.Stop(); performanceCounterTimer.Stop();
LuaSetup.LuaTimer.LastUpdateTime = performanceMeasurement.ElapsedMilliseconds; LuaSetup.LuaTimer.LastUpdateTime = performanceCounterTimer.ElapsedMilliseconds;
performanceMeasurement.Reset(); performanceCounterTimer.Reset();
Timing.Accumulator -= Timing.Step; Timing.Accumulator -= Timing.Step;
updateCount++; updateCount++;
Barotrauma/BarotraumaShared/SharedSource/Networking/ChatMessage.cs
+4 -4
View File
@@ -79,16 +79,16 @@ namespace Barotrauma.Networking
public readonly string SenderName; public readonly string SenderName;
private Color? customColor = null; private Color? customTextColor = null;
public Color Color public Color Color
{ {
get get
{ {
if(customColor == null) return MessageColor[(int)Type]; if(customTextColor == null) return MessageColor[(int)Type];
return (Color)customColor; return (Color)customTextColor;
} }
set { customColor = value; } set { customTextColor = value; }
} }
public static string GetTimeStamp() public static string GetTimeStamp()