diff --git a/OpenRA.Game/Network/Order.cs b/OpenRA.Game/Network/Order.cs index a60f7a0a20..3861868b10 100755 --- a/OpenRA.Game/Network/Order.cs +++ b/OpenRA.Game/Network/Order.cs @@ -134,9 +134,9 @@ namespace OpenRA 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); + return "OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." + + "\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n".F( + OrderString, Subject, TargetActor.Info.Name , TargetLocation, TargetString, IsImmediate, Player.PlayerName); } static uint UIntFromActor(Actor a) diff --git a/OpenRA.Game/Network/OrderManager.cs b/OpenRA.Game/Network/OrderManager.cs index a8a21b7075..d1db2e0f5d 100755 --- a/OpenRA.Game/Network/OrderManager.cs +++ b/OpenRA.Game/Network/OrderManager.cs @@ -35,7 +35,7 @@ namespace OpenRA.Network public bool GameStarted { get { return FrameNumber != 0; } } public IConnection Connection { get; private set; } - public readonly int SyncHeaderSize = 5; + public readonly int SyncHeaderSize = 9; Dictionary clientQuitTimes = new Dictionary(); @@ -123,10 +123,10 @@ namespace OpenRA.Network { if( packet[ i ] != existingSync[ i ] ) { - if ( i < SyncHeaderSize + sizeof(int) ) + if ( i < SyncHeaderSize ) OutOfSync(frame, "Tick"); else - OutOfSync( frame , (i - SyncHeaderSize - sizeof(int)) / 4); + OutOfSync( frame , (i - SyncHeaderSize) / 4); } } }