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

remove some plenks

Browse Source 
no logic changes
This commit is contained in:
Matthias Mailänder
2013-06-17 20:46:38 +02:00
parent 875ac468d3
commit 6b261534d8
3 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ namespace OpenRA.Server
t.ServerStarted(this);
Log.Write("server", "Initial mods: ");
foreach( var m in lobbyInfo.GlobalSettings.Mods )
foreach (var m in lobbyInfo.GlobalSettings.Mods)
Log.Write("server","- {0}", m);
Log.Write("server", "Initial map: {0}",lobbyInfo.GlobalSettings.Map);
@@ -118,31 +118,31 @@ namespace OpenRA.Server
new Thread( _ =>
{
var timeout = ServerTraits.WithInterface<ITick>().Min(t => t.TickTimeout);
for( ; ; )
for (;;)
{
var checkRead = new List<Socket>();
checkRead.Add( listener.Server );
foreach( var c in conns ) checkRead.Add( c.socket );
foreach( var c in preConns ) checkRead.Add( c.socket );
checkRead.Add(listener.Server);
foreach (var c in conns) checkRead.Add(c.socket);
foreach (var c in preConns) checkRead.Add(c.socket);
Socket.Select( checkRead, null, null, timeout );
Socket.Select(checkRead, null, null, timeout);
if (State == ServerState.ShuttingDown)
{
EndGame();
break;
}
foreach( var s in checkRead )
if( s == listener.Server ) AcceptConnection();
foreach (var s in checkRead)
if (s == listener.Server) AcceptConnection();
else if (preConns.Count > 0)
{
var p = preConns.SingleOrDefault( c => c.socket == s );
if (p != null) p.ReadData( this );
var p = preConns.SingleOrDefault(c => c.socket == s);
if (p != null) p.ReadData(this);
}
else if (conns.Count > 0)
{
var conn = conns.SingleOrDefault( c => c.socket == s );
if (conn != null) conn.ReadData( this );
var conn = conns.SingleOrDefault(c => c.socket == s);
if (conn != null) conn.ReadData(this);
}
foreach (var t in ServerTraits.WithInterface<ITick>())
@@ -151,8 +151,7 @@ namespace OpenRA.Server
if (State == ServerState.ShuttingDown)
{
EndGame();
if (Settings.AllowPortForward)
UPnP.RemovePortforward();
if (Settings.AllowPortForward) UPnP.RemovePortforward();
break;
}
}
@@ -210,7 +209,7 @@ namespace OpenRA.Server
var request = new HandshakeRequest()
{
Map = lobbyInfo.GlobalSettings.Map,
Mods = lobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m,Mod.AllMods[m].Version)).ToArray()
Mods = lobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m, Mod.AllMods[m].Version)).ToArray()
};
DispatchOrdersToClient(newConn, 0, 0, new ServerOrder("HandshakeRequest", request.Serialize()).Serialize());
}
@@ -376,11 +375,12 @@ namespace OpenRA.Server
try
{
var ms = new MemoryStream();
ms.Write( BitConverter.GetBytes( data.Length + 4 ) );
ms.Write( BitConverter.GetBytes( client ) );
ms.Write( BitConverter.GetBytes( frame ) );
ms.Write( data );
c.socket.Send( ms.ToArray() );
ms.Write(BitConverter.GetBytes(data.Length + 4));
ms.Write(BitConverter.GetBytes(client));
ms.Write(BitConverter.GetBytes(frame));
ms.Write(data);
c.socket.Send(ms.ToArray());
}
catch (Exception e)
{
DropClient(c);
@@ -561,9 +561,9 @@ namespace OpenRA.Server
Console.WriteLine("Game started");
foreach( var c in conns )
foreach( var d in conns )
DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
foreach (var c in conns)
foreach (var d in conns)
DispatchOrdersToClient(c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF });
// Drop any unvalidated clients
foreach (var c in preConns.ToArray())