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

Ints are 4 bytes always (apparently), and Order's ToString is no longer broken

Browse Source
This commit is contained in:
alzeih
2010-04-08 19:20:02 +12:00
committed by Bob
parent 6d2f2378e9
commit bae27fc165
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,9 +134,9 @@ namespace OpenRA
public override string ToString() public override string ToString()
{ {
return "OrderString: \"{0}\" \n\t Subject: \"{0}\"." + return "OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." +
"\n\t TargetActor: \"{0}\" \n\t TargetLocation: {0}.\n\t TargetString: \"{0}\".\n\t IsImmediate: {0}.\n".F( "\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n".F(
OrderString, Subject, TargetActor, TargetLocation, TargetString, IsImmediate); OrderString, Subject, TargetActor.Info.Name , TargetLocation, TargetString, IsImmediate, Player.PlayerName);
} }
static uint UIntFromActor(Actor a) static uint UIntFromActor(Actor a)

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

@@ -35,7 +35,7 @@ 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; public readonly int SyncHeaderSize = 9;
Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>(); Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>();
@@ -123,10 +123,10 @@ namespace OpenRA.Network
{ {
if( packet[ i ] != existingSync[ i ] ) if( packet[ i ] != existingSync[ i ] )
{ {
if ( i < SyncHeaderSize + sizeof(int) ) if ( i < SyncHeaderSize )
OutOfSync(frame, "Tick"); OutOfSync(frame, "Tick");
else else
OutOfSync( frame , (i - SyncHeaderSize - sizeof(int)) / 4); OutOfSync( frame , (i - SyncHeaderSize) / 4);
} }
} }
} }