epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12153 from pchote/game-tidy

Browse Source 
Minor Game style fixes.
This commit is contained in:
reaperrr
2016-10-02 18:11:10 +02:00
committed by GitHub
parent 0d54f2994f 1a83b5c0c0
commit 8ecf158b62
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Game.cs
View File

@@ -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;
@@ -304,12 +303,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 +426,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);