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

clean up game timeout

Browse Source
This commit is contained in:
Chris Forbes
2012-06-15 15:14:56 +12:00
parent 9862b8ccee
commit 94f7f1c473
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,11 +18,12 @@ using System.Net.Sockets;
using System.Net.NetworkInformation; using System.Net.NetworkInformation;
using UPnP; using UPnP;
using System.Threading; using System.Threading;
using System.Timers;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Network; using OpenRA.Network;
using XTimer = System.Timers.Timer;
namespace OpenRA.Server namespace OpenRA.Server
{ {
public class Server public class Server
@@ -48,6 +49,7 @@ namespace OpenRA.Server
public ServerSettings Settings; public ServerSettings Settings;
public ModData ModData; public ModData ModData;
public Map Map; public Map Map;
XTimer gameTimeout;
volatile bool shutdown = false; volatile bool shutdown = false;
public void Shutdown() { shutdown = true; } public void Shutdown() { shutdown = true; }
@@ -469,20 +471,16 @@ namespace OpenRA.Server
t.GameStarted(this); t.GameStarted(this);
// Check TimeOut // Check TimeOut
if ( Game.Settings.Server.TimeOut > 10000 ) if ( Settings.TimeOut > 10000 )
{ {
aTimer = new System.Timers.Timer(Game.Settings.Server.TimeOut); gameTimeout = new XTimer(Settings.TimeOut);
aTimer.Elapsed += new ElapsedEventHandler(OnTimedEvent); gameTimeout.Elapsed += (_,e) =>
aTimer.Enabled = true; {
Console.WriteLine("Timeout at {0}!!!", e.SignalTime);
Environment.Exit(0);
};
gameTimeout.Enabled = true;
} }
} }
private static System.Timers.Timer aTimer;
private static void OnTimedEvent(object source, ElapsedEventArgs e)
{
Console.WriteLine("Started game has Timed Out at {0} !!!", e.SignalTime);
System.Environment.Exit(0);
}
} }
} }