diff --git a/RageCoop.Client/Main.cs b/RageCoop.Client/Main.cs index b91d69b..a853bc4 100644 --- a/RageCoop.Client/Main.cs +++ b/RageCoop.Client/Main.cs @@ -141,7 +141,9 @@ namespace RageCoop.Client } catch (Exception ex) { +#if DEBUG Main.Logger.Error(ex); +#endif } if (Networking.ShowNetworkInfo) @@ -347,7 +349,9 @@ namespace RageCoop.Client } catch (Exception ex) { +#if DEBUG Logger.Error(ex); +#endif QueuedActions.Remove(action); } } diff --git a/RageCoop.Client/Menus/CoopMenu.cs b/RageCoop.Client/Menus/CoopMenu.cs index 026421b..f87b55c 100644 --- a/RageCoop.Client/Menus/CoopMenu.cs +++ b/RageCoop.Client/Menus/CoopMenu.cs @@ -67,13 +67,17 @@ namespace RageCoop.Client.Menus Menu.AddSubMenu(SettingsMenu.Menu); Menu.AddSubMenu(DevToolMenu.Menu); +#if DEBUG Menu.AddSubMenu(DebugMenu.Menu); +#endif MenuPool.Add(Menu); MenuPool.Add(SettingsMenu.Menu); MenuPool.Add(DevToolMenu.Menu); +#if DEBUG MenuPool.Add(DebugMenu.Menu); MenuPool.Add(DebugMenu.DiagnosticMenu); +#endif MenuPool.Add(ServersMenu.Menu); MenuPool.Add(PopUp); diff --git a/RageCoop.Client/Menus/Sub/DebugMenu.cs b/RageCoop.Client/Menus/Sub/DebugMenu.cs index 4dd0b3c..83c8e6f 100644 --- a/RageCoop.Client/Menus/Sub/DebugMenu.cs +++ b/RageCoop.Client/Menus/Sub/DebugMenu.cs @@ -1,4 +1,5 @@ -using GTA; +#if DEBUG +using GTA; using LemonUI.Menus; using System; using System.Drawing; @@ -56,3 +57,4 @@ namespace RageCoop.Client } } +#endif diff --git a/RageCoop.Client/Networking/Networking.cs b/RageCoop.Client/Networking/Networking.cs index 703c779..6feec5d 100644 --- a/RageCoop.Client/Networking/Networking.cs +++ b/RageCoop.Client/Networking/Networking.cs @@ -53,13 +53,14 @@ namespace RageCoop.Client NetPeerConfiguration config = new NetPeerConfiguration("623c92c287cc392406e7aaaac1c0f3b0") { AutoFlushSendQueue = false, - SimulatedMinimumLatency = SimulatedLatency, - SimulatedRandomLatency = 0, AcceptIncomingConnections = true, MaximumConnections = 32, PingInterval = 5 }; - +#if DEBUG + config.SimulatedMinimumLatency = SimulatedLatency; + config.SimulatedRandomLatency = 0; +#endif config.EnableMessageType(NetIncomingMessageType.UnconnectedData); config.EnableMessageType(NetIncomingMessageType.NatIntroductionSuccess); @@ -96,7 +97,12 @@ namespace RageCoop.Client Peer.OnMessageReceived += (s, m) => { try { ProcessMessage(m); } - catch (Exception ex) { Main.Logger.Error(ex); } + catch (Exception ex) + { +#if DEBUG + Main.Logger.Error(ex); +#endif + } }; Main.QueueAction(() => { Notification.Show($"~y~Trying to connect..."); }); Menus.CoopMenu._serverConnectItem.Enabled = false; diff --git a/RageCoop.Client/Networking/Receive.cs b/RageCoop.Client/Networking/Receive.cs index e3b6a37..da05784 100644 --- a/RageCoop.Client/Networking/Receive.cs +++ b/RageCoop.Client/Networking/Receive.cs @@ -149,6 +149,7 @@ namespace RageCoop.Client } catch (Exception ex) { +#if DEBUG Main.QueueAction(() => { GTA.UI.Notification.Show($"~r~~h~Packet Error {ex.Message}"); @@ -157,6 +158,7 @@ namespace RageCoop.Client Main.Logger.Error($"[{packetType}] {ex.Message}"); Main.Logger.Error(ex); Peer.Shutdown($"Packet Error [{packetType}]"); +#endif } break; } diff --git a/RageCoop.Client/Properties/AssemblyInfo.cs b/RageCoop.Client/Properties/AssemblyInfo.cs index 6a66801..2c99ea5 100644 --- a/RageCoop.Client/Properties/AssemblyInfo.cs +++ b/RageCoop.Client/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ using System.Resources; // Version informationr( -[assembly: AssemblyVersion("1.5.4.3")] -[assembly: AssemblyFileVersion("1.5.4.3")] +[assembly: AssemblyVersion("1.5.4.4")] +[assembly: AssemblyFileVersion("1.5.4.4")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/RageCoop.Client/Settings.cs b/RageCoop.Client/Settings.cs index b60293f..654c49e 100644 --- a/RageCoop.Client/Settings.cs +++ b/RageCoop.Client/Settings.cs @@ -51,7 +51,7 @@ namespace RageCoop.Client /// /// Disable world NPC traffic, mission entities won't be affected /// - public bool DisableTraffic { get; set; } = true; + public bool DisableTraffic { get; set; } = false; /// /// Bring up pause menu but don't freeze time when FrontEndPauseAlternate(Esc) is pressed. diff --git a/RageCoop.Server/Properties/AssemblyInfo.cs b/RageCoop.Server/Properties/AssemblyInfo.cs index 6a28ef3..f056db6 100644 --- a/RageCoop.Server/Properties/AssemblyInfo.cs +++ b/RageCoop.Server/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Resources; [assembly: AssemblyCulture("")] // Version information -[assembly: AssemblyVersion("1.5.4.2")] -[assembly: AssemblyFileVersion("1.5.4.2")] +[assembly: AssemblyVersion("1.5.4.3")] +[assembly: AssemblyFileVersion("1.5.4.3")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/libs/Lidgren.Network.dll b/libs/Lidgren.Network.dll index 0e3af9a..74148a9 100644 Binary files a/libs/Lidgren.Network.dll and b/libs/Lidgren.Network.dll differ diff --git a/libs/Lidgren.Network.pdb b/libs/Lidgren.Network.pdb deleted file mode 100644 index 4b90f31..0000000 Binary files a/libs/Lidgren.Network.pdb and /dev/null differ