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

Disabled EntityEvent debug messages from release builds

Browse Source
This commit is contained in:
Regalis
2017-05-30 19:47:29 +03:00
parent 4c7a3b34fe
commit 87788b449e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs
+8 -4
View File
@@ -112,12 +112,15 @@ namespace Barotrauma.Networking
unreceivedEntityEventCount = msg.ReadUInt16(); unreceivedEntityEventCount = msg.ReadUInt16();
firstNewID = msg.ReadUInt16(); firstNewID = msg.ReadUInt16();
#if DEBUG
DebugConsole.NewMessage("received midround syncing msg, unreceived: "+unreceivedEntityEventCount+", first new ID: "+firstNewID, Microsoft.Xna.Framework.Color.Yellow); DebugConsole.NewMessage("received midround syncing msg, unreceived: "+unreceivedEntityEventCount+", first new ID: "+firstNewID, Microsoft.Xna.Framework.Color.Yellow);
#endif
} }
else if (firstNewID != null) else if (firstNewID != null)
{ {
#if DEBUG
DebugConsole.NewMessage("midround syncing complete, switching to ID "+ (UInt16)(firstNewID - 1), Microsoft.Xna.Framework.Color.Yellow); DebugConsole.NewMessage("midround syncing complete, switching to ID "+ (UInt16)(firstNewID - 1), Microsoft.Xna.Framework.Color.Yellow);
#endif
lastReceivedID = (UInt16)(firstNewID - 1); lastReceivedID = (UInt16)(firstNewID - 1);
firstNewID = null; firstNewID = null;
@@ -133,8 +136,6 @@ namespace Barotrauma.Networking
if (entityID == 0 && thisEventID == (UInt16)(lastReceivedID + 1)) if (entityID == 0 && thisEventID == (UInt16)(lastReceivedID + 1))
{ {
DebugConsole.NewMessage("received empty event " + thisEventID, Microsoft.Xna.Framework.Color.Orange);
msg.ReadPadBits(); msg.ReadPadBits();
lastReceivedID++; lastReceivedID++;
continue; continue;
@@ -147,6 +148,7 @@ namespace Barotrauma.Networking
//skip the event if we've already received it or if the entity isn't found //skip the event if we've already received it or if the entity isn't found
if (thisEventID != (UInt16)(lastReceivedID + 1) || entity == null) if (thisEventID != (UInt16)(lastReceivedID + 1) || entity == null)
{ {
#if DEBUG
if (thisEventID != (UInt16)(lastReceivedID + 1)) if (thisEventID != (UInt16)(lastReceivedID + 1))
{ {
DebugConsole.NewMessage("received msg " + thisEventID + " (waiting for "+ (lastReceivedID+1) + ")", thisEventID<lastReceivedID+1 ? Microsoft.Xna.Framework.Color.Yellow : Microsoft.Xna.Framework.Color.Red); DebugConsole.NewMessage("received msg " + thisEventID + " (waiting for "+ (lastReceivedID+1) + ")", thisEventID<lastReceivedID+1 ? Microsoft.Xna.Framework.Color.Yellow : Microsoft.Xna.Framework.Color.Red);
@@ -155,13 +157,15 @@ namespace Barotrauma.Networking
{ {
DebugConsole.NewMessage("received msg " + thisEventID + ", entity " + entityID + " not found", Microsoft.Xna.Framework.Color.Red); DebugConsole.NewMessage("received msg " + thisEventID + ", entity " + entityID + " not found", Microsoft.Xna.Framework.Color.Red);
} }
#endif
msg.Position += msgLength * 8; msg.Position += msgLength * 8;
} }
else else
{ {
long msgPosition = msg.Position; long msgPosition = msg.Position;
#if DEBUG
DebugConsole.NewMessage("received msg " + thisEventID + " (" + entity.ToString() + ")", Microsoft.Xna.Framework.Color.Green); DebugConsole.NewMessage("received msg " + thisEventID + " (" + entity.ToString() + ")", Microsoft.Xna.Framework.Color.Green);
#endif
lastReceivedID++; lastReceivedID++;
try try
{ {
Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
+2
View File
@@ -326,6 +326,7 @@ namespace Barotrauma.Networking
//skip the event if we've already received it or if the entity isn't found //skip the event if we've already received it or if the entity isn't found
if (thisEventID != (UInt16)(sender.lastSentEntityEventID + 1) || entity == null) if (thisEventID != (UInt16)(sender.lastSentEntityEventID + 1) || entity == null)
{ {
#if DEBUG
if (thisEventID != (UInt16)(sender.lastSentEntityEventID + 1)) if (thisEventID != (UInt16)(sender.lastSentEntityEventID + 1))
{ {
DebugConsole.NewMessage("received msg " + thisEventID, Microsoft.Xna.Framework.Color.Red); DebugConsole.NewMessage("received msg " + thisEventID, Microsoft.Xna.Framework.Color.Red);
@@ -334,6 +335,7 @@ namespace Barotrauma.Networking
{ {
DebugConsole.NewMessage("received msg " + thisEventID + ", entity " + entityID + " not found", Microsoft.Xna.Framework.Color.Red); DebugConsole.NewMessage("received msg " + thisEventID + ", entity " + entityID + " not found", Microsoft.Xna.Framework.Color.Red);
} }
#endif
msg.Position += msgLength * 8; msg.Position += msgLength * 8;
} }
else else