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

fix some plenks

Browse Source 
no logic changes
This commit is contained in:
Matthias Mailänder
2013-06-21 18:05:30 +02:00
parent 65088ea2d5
commit e9b2bcc579
4 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Game.cs
View File

@@ -162,7 +162,7 @@ namespace OpenRA
if (orderManager.GameStarted) if (orderManager.GameStarted)
++Viewport.TicksSinceLastMove; ++Viewport.TicksSinceLastMove;
Sound.Tick(); Sound.Tick();
Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate(); } ); Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);
if (world != null) if (world != null)
{ {
@@ -315,7 +315,6 @@ namespace OpenRA
Renderer.InitializeFonts(modData.Manifest); Renderer.InitializeFonts(modData.Manifest);
modData.InitializeLoaders(); modData.InitializeLoaders();
PerfHistory.items["render"].hasNormalTick = false; PerfHistory.items["render"].hasNormalTick = false;
PerfHistory.items["batches"].hasNormalTick = false; PerfHistory.items["batches"].hasNormalTick = false;
PerfHistory.items["render_widgets"].hasNormalTick = false; PerfHistory.items["render_widgets"].hasNormalTick = false;

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

@@ -27,6 +27,7 @@ namespace OpenRA.Network
public readonly string Host; public readonly string Host;
public readonly int Port; public readonly int Port;
public string ServerError = "Server is not responding."; public string ServerError = "Server is not responding.";
public int NetFrameNumber { get; private set; } public int NetFrameNumber { get; private set; }
@@ -47,7 +48,7 @@ namespace OpenRA.Network
if (GameStarted) return; if (GameStarted) return;
NetFrameNumber = 1; NetFrameNumber = 1;
for( int i = NetFrameNumber ; i <= FramesAhead ; i++ ) for (var i = NetFrameNumber ; i <= FramesAhead ; i++)
Connection.Send(i, new List<byte[]>()); Connection.Send(i, new List<byte[]>());
} }

2
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -154,8 +154,10 @@ namespace OpenRA.Network
} }
case "ServerError": case "ServerError":
{
orderManager.ServerError = order.TargetString; orderManager.ServerError = order.TargetString;
break; break;
}
case "SyncInfo": case "SyncInfo":
{ {