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

StyleCop clean OrderManager

Browse Source
This commit is contained in:
Matthias Mailänder
2014-11-01 07:55:31 +01:00
parent 2b6295608a
commit 95a4248419
6 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/Game.cs
View File

@@ -139,12 +139,12 @@ namespace OpenRA
map = modData.PrepareMap(mapUID);
using (new PerfTimer("NewWorld"))
{
orderManager.world = new World(map, orderManager, isShellmap);
orderManager.world.Timestep = Timestep;
orderManager.World = new World(map, orderManager, isShellmap);
orderManager.World.Timestep = Timestep;
}
worldRenderer = new WorldRenderer(orderManager.world);
worldRenderer = new WorldRenderer(orderManager.World);
using (new PerfTimer("LoadComplete"))
orderManager.world.LoadComplete(worldRenderer);
orderManager.World.LoadComplete(worldRenderer);
if (orderManager.GameStarted)
return;
@@ -398,7 +398,7 @@ namespace OpenRA
{
var tick = RunTime;
var world = orderManager.world;
var world = orderManager.World;
var uiTickDelta = tick - Ui.LastTickTime;
if (uiTickDelta >= Timestep)
@@ -474,7 +474,7 @@ namespace OpenRA
}
InnerLogicTick(orderManager);
if (worldRenderer != null && orderManager.world != worldRenderer.world)
if (worldRenderer != null && orderManager.World != worldRenderer.world)
InnerLogicTick(worldRenderer.world.orderManager);
}
@@ -506,7 +506,7 @@ namespace OpenRA
}
using (new PerfSample("render_flip"))
Renderer.EndFrame(new DefaultInputHandler(orderManager.world));
Renderer.EndFrame(new DefaultInputHandler(orderManager.World));
}
PerfHistory.items["render"].Tick();
@@ -663,8 +663,8 @@ namespace OpenRA
public static void Disconnect()
{
if (orderManager.world != null)
orderManager.world.traitDict.PrintReport();
if (orderManager.World != null)
orderManager.World.traitDict.PrintReport();
orderManager.Dispose();
CloseServer();
@@ -704,7 +704,7 @@ namespace OpenRA
public static bool IsCurrentWorld(World world)
{
return orderManager != null && orderManager.world == world;
return orderManager != null && orderManager.World == world;
}
}
}