From 45214b2c22856397794a2053796a12439b122da3 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 2 Oct 2016 12:47:46 +0100 Subject: [PATCH 1/2] Remove unnecessary Game. references in Game. --- OpenRA.Game/Game.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index e5846ba9dc..42c8316e98 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -304,12 +304,12 @@ namespace OpenRA GeoIP.Initialize(); - if (!Game.Settings.Server.DiscoverNatDevices) - Game.Settings.Server.AllowPortForward = false; + if (!Settings.Server.DiscoverNatDevices) + Settings.Server.AllowPortForward = false; else { discoverNat = UPnP.DiscoverNatDevices(Settings.Server.NatDiscoveryTimeout); - Game.Settings.Server.AllowPortForward = true; + Settings.Server.AllowPortForward = true; } GlobalChat = new GlobalChat(); @@ -427,7 +427,7 @@ namespace OpenRA { Console.WriteLine("NAT discovery failed: {0}", e.Message); Log.Write("nat", e.ToString()); - Game.Settings.Server.AllowPortForward = false; + Settings.Server.AllowPortForward = false; } ModData.LoadScreen.StartGame(args); From 1a83b5c0c057cbc780b8b49936981fcb2a626e62 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 2 Oct 2016 12:48:02 +0100 Subject: [PATCH 2/2] Remove unnecessary using. --- OpenRA.Game/Game.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 42c8316e98..103ece129d 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -22,7 +22,6 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; using OpenRA.Chat; -using OpenRA.FileSystem; using OpenRA.Graphics; using OpenRA.Network; using OpenRA.Primitives;