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

pass world into CheckSync. don't pass world into Widget.DrawInner

Browse Source
This commit is contained in:
Bob
2010-10-11 19:56:28 +13:00
parent ab1e930ba3
commit cb1deacbb2
32 changed files with 83 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ namespace OpenRA.Network
if( packet.Length == 5 && packet[ 4 ] == 0xBF )
frameData.ClientQuit( clientId, frame );
else if( packet.Length >= 5 && packet[ 4 ] == 0x65 )
CheckSync( packet );
CheckSync( world, packet );
else if( frame == 0 )
immediatePackets.Add( Pair.New( clientId, packet ) );
else
@@ -94,7 +94,7 @@ namespace OpenRA.Network
Dictionary<int, byte[]> syncForFrame = new Dictionary<int, byte[]>();
void CheckSync(byte[] packet)
void CheckSync(World world, byte[] packet)
{
var frame = BitConverter.ToInt32(packet, 0);
byte[] existingSync;
@@ -116,7 +116,7 @@ namespace OpenRA.Network
if (i < SyncHeaderSize)
OutOfSync(frame, "Tick");
else
OutOfSync(frame, (i - SyncHeaderSize) / 4);
OutOfSync(world, frame, (i - SyncHeaderSize) / 4);
}
}
}
@@ -125,9 +125,9 @@ namespace OpenRA.Network
syncForFrame.Add(frame, packet);
}
void OutOfSync(int frame, int index)
void OutOfSync( World world, int frame, int index)
{
var order = frameData.OrdersForFrame( Game.world, frame ).ElementAt(index);
var order = frameData.OrdersForFrame( world, frame ).ElementAt(index);
throw new InvalidOperationException("Out of sync in frame {0}.\n {1}".F(frame, order.Order.ToString()));
}
@@ -166,9 +166,9 @@ namespace OpenRA.Network
var ss = sync.SerializeSync( FrameNumber );
Connection.Send( ss );
syncReport.UpdateSyncReport();
syncReport.UpdateSyncReport( world );
CheckSync( ss );
CheckSync( world, ss );
++FrameNumber;
}

10
OpenRA.Game/Network/SyncReport.cs
View File

@@ -19,21 +19,21 @@ namespace OpenRA.Network
syncReports[i] = new SyncReport.Report();
}
internal void UpdateSyncReport()
internal void UpdateSyncReport( World world )
{
if (!Game.Settings.Debug.RecordSyncReports)
return;
GenerateSyncReport(syncReports[curIndex]);
GenerateSyncReport(world, syncReports[curIndex]);
curIndex = ++curIndex % numSyncReports;
}
void GenerateSyncReport(Report report)
void GenerateSyncReport(World world, Report report)
{
report.Frame = Game.orderManager.FrameNumber;
report.SyncedRandom = Game.world.SharedRandom.Last;
report.SyncedRandom = world.SharedRandom.Last;
report.Traits.Clear();
foreach (var a in Game.world.Queries.WithTraitMultiple<object>())
foreach (var a in world.Queries.WithTraitMultiple<object>())
{
var sync = Sync.CalculateSyncHash(a.Trait);
if (sync != 0)