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

Remove broken and disabled by default Server.TimeOut setting.

Browse Source
This commit is contained in:
Paul Chote
2016-12-08 20:49:28 +00:00
parent 7827d50e99
commit 5188a08c81
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/Server/Server.cs
View File

@@ -22,8 +22,6 @@ using OpenRA.Network;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Support; using OpenRA.Support;
using XTimer = System.Timers.Timer;
namespace OpenRA.Server namespace OpenRA.Server
{ {
public enum ServerState public enum ServerState
@@ -60,8 +58,6 @@ namespace OpenRA.Server
readonly TcpListener listener; readonly TcpListener listener;
readonly TypeDictionary serverTraits = new TypeDictionary(); readonly TypeDictionary serverTraits = new TypeDictionary();
XTimer gameTimeout;
protected volatile ServerState internalState = ServerState.WaitingPlayers; protected volatile ServerState internalState = ServerState.WaitingPlayers;
public ServerState State public ServerState State
@@ -701,18 +697,6 @@ namespace OpenRA.Server
foreach (var t in serverTraits.WithInterface<IStartGame>()) foreach (var t in serverTraits.WithInterface<IStartGame>())
t.GameStarted(this); t.GameStarted(this);
// Check TimeOut
if (Settings.TimeOut > 10000)
{
gameTimeout = new XTimer(Settings.TimeOut);
gameTimeout.Elapsed += (_, e) =>
{
Console.WriteLine("Timeout at {0}!!!", e.SignalTime);
Environment.Exit(0);
};
gameTimeout.Enabled = true;
}
} }
} }
} }

3
OpenRA.Game/Settings.cs
View File

@@ -68,9 +68,6 @@ namespace OpenRA
[Desc("Takes a comma separated list of IP addresses that are not allowed to join.")] [Desc("Takes a comma separated list of IP addresses that are not allowed to join.")]
public string[] Ban = { }; public string[] Ban = { };
[Desc("Value in milliseconds when to terminate the game. Needs to be at least 10000 (10 s) to enable the timer.")]
public int TimeOut = 0;
[Desc("For dedicated servers only, controls whether a game can be started with just one human player in the lobby.")] [Desc("For dedicated servers only, controls whether a game can be started with just one human player in the lobby.")]
public bool EnableSingleplayer = false; public bool EnableSingleplayer = false;