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

Tidy up OutOfSync, Blaming of Tick, ToString in Order

Browse Source
This commit is contained in:
alzeih
2010-04-08 17:30:10 +12:00
committed by Bob
parent c8bc0c51cd
commit 6d2f2378e9
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Network/Order.cs
View File

@@ -131,6 +131,13 @@ namespace OpenRA
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }
public override string ToString()
{
return "OrderString: \"{0}\" \n\t Subject: \"{0}\"." +
"\n\t TargetActor: \"{0}\" \n\t TargetLocation: {0}.\n\t TargetString: \"{0}\".\n\t IsImmediate: {0}.\n".F(
OrderString, Subject, TargetActor, TargetLocation, TargetString, IsImmediate);
}
static uint UIntFromActor(Actor a) static uint UIntFromActor(Actor a)
{ {

46
OpenRA.Game/Network/OrderManager.cs
View File

@@ -1,4 +1,4 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford. * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA. * This file is part of OpenRA.
@@ -34,7 +34,9 @@ namespace OpenRA.Network
public bool GameStarted { get { return FrameNumber != 0; } } public bool GameStarted { get { return FrameNumber != 0; } }
public IConnection Connection { get; private set; } public IConnection Connection { get; private set; }
public readonly int SyncHeaderSize = 5;
Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>(); Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>();
Dictionary<int, Dictionary<int, byte[]>> frameClientData = Dictionary<int, Dictionary<int, byte[]>> frameClientData =
@@ -116,34 +118,42 @@ namespace OpenRA.Network
if( packet.Length != existingSync.Length ) if( packet.Length != existingSync.Length )
OutOfSync( frame ); OutOfSync( frame );
else else
{
for( int i = 0 ; i < packet.Length ; i++ ) for( int i = 0 ; i < packet.Length ; i++ )
{
if( packet[ i ] != existingSync[ i ] ) if( packet[ i ] != existingSync[ i ] )
OutOfSync( frame ); {
if ( i < SyncHeaderSize + sizeof(int) )
OutOfSync(frame, "Tick");
else
OutOfSync( frame , (i - SyncHeaderSize - sizeof(int)) / 4);
}
}
}
} }
else else
syncForFrame.Add( frame, packet ); syncForFrame.Add( frame, packet );
} }
void OutOfSync( int frame ) void OutOfSync( int frame , int index)
{ {
string ErrorString = "out of sync in frame {0}.\n";
var frameData = clientQuitTimes var frameData = clientQuitTimes
.Where( x => frame <= x.Value ) .Where( x => frame <= x.Value )
.OrderBy( x => x.Key ) .OrderBy( x => x.Key )
.ToDictionary( k => k.Key, v => frameClientData[ FrameNumber ][ v.Key ] ); .ToDictionary( k => k.Key, v => frameClientData[ FrameNumber ][ v.Key ] );
foreach( var order in frameData.SelectMany( o => o.Value.ToOrderList( Game.world ).Select( a => new { Client = o.Key, Order = a } ) ) )
{
ErrorString += "OrderString: {0} \n".F(order.Order.OrderString);
ErrorString += (order.Order.Subject != null)? "\t Subject: {0}.\n".F(order.Order.Subject.Info.Name) : "";
ErrorString += (order.Order.TargetActor != null)? "\t TargetActor: {0}.\n".F(order.Order.TargetActor.Info.Name) : "";
ErrorString += (order.Order.TargetLocation != null)? "\t TargetLocation: {0}.\n".F(order.Order.TargetLocation) : "";
ErrorString += (order.Order.TargetString != null)? "\t TargetString: {0}.\n".F(order.Order.TargetString) : "";
ErrorString += (order.Order.IsImmediate)? "\t IsImmediate: true.\n" : "";
}
throw new InvalidOperationException( ErrorString.F( frame ) ); var order = frameData.SelectMany( o => o.Value.ToOrderList( Game.world ).Select( a => new { Client = o.Key, Order = a } ) ).ElementAt(index);
throw new InvalidOperationException("Out of sync in frame {0}.\n {1}".F(frame, order.Order.ToString()));
}
void OutOfSync(int frame)
{
throw new InvalidOperationException("Out of sync in frame {0}.\n".F(frame));
}
void OutOfSync(int frame, string blame)
{
throw new InvalidOperationException("Out of sync in frame {0}: Blame {1}.\n".F(frame, blame));
} }
public bool IsReadyForNextFrame public bool IsReadyForNextFrame