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

merged

Browse Source
This commit is contained in:
Chris Forbes
2009-11-16 19:24:21 +13:00
parent 5a5cc10bea 4c2171997f
commit 77033977cd
3 changed files with 78 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRa.Game/Game.cs
View File

@@ -41,6 +41,9 @@ namespace OpenRa.Game
public static string Replay;
public static string NetworkHost;
public static int NetworkPort;
public static bool skipMakeAnims = true;
public static void Initialize(string mapName, Renderer renderer, int2 clientSize, int localPlayer)
@@ -79,10 +82,16 @@ namespace OpenRa.Game
soundEngine = new ISoundEngine();
sounds = new Cache<string, ISoundSource>(LoadSound);
orderManager = (Replay == "")
? new OrderManager(new OrderSource[] { new LocalOrderSource(), /*new NetworkOrderSource( new TcpClient( "127.0.0.1", 1235 ) )*/ }, "replay.rep")
: new OrderManager(new OrderSource[] { new ReplayOrderSource( Replay ) });
if( Replay != "" )
orderManager = new OrderManager( new OrderSource[] { new ReplayOrderSource( Replay ) } );
else
{
var orderSources = ( string.IsNullOrEmpty( NetworkHost ) )
? new OrderSource[] { new LocalOrderSource() }
: new OrderSource[] { new LocalOrderSource(), new NetworkOrderSource( new TcpClient( NetworkHost, NetworkPort ) ) };
orderManager = new OrderManager(orderSources, "replay.rep" );
}
PlaySound("intro.aud", false);
@@ -158,8 +167,9 @@ namespace OpenRa.Game
{
lastTime += timestep;
if (orderManager.Tick())
if( orderManager.IsReadyForNextFrame )
{
orderManager.Tick();
if (controller.orderGenerator != null)
controller.orderGenerator.Tick();
@@ -175,6 +185,8 @@ namespace OpenRa.Game
foreach (var player in players.Values)
player.Tick();
}
else if( orderManager.FrameNumber == 0 )
lastTime = Environment.TickCount;
}
PerfHistory.Tick();