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

Merge branch 'master' of git://github.com/beedee/OpenRA

Browse Source
This commit is contained in:
Chris Forbes
2009-11-16 18:40:57 +13:00
parent e30f84d16e a966b31b32
commit 3b48b90841
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRa.Game/Game.cs
View File

@@ -80,11 +80,9 @@ namespace OpenRa.Game
soundEngine = new ISoundEngine(); soundEngine = new ISoundEngine();
sounds = new Cache<string, ISoundSource>(LoadSound); sounds = new Cache<string, ISoundSource>(LoadSound);
var socket = new TcpClient( "127.0.0.1", 1234 );
orderManager = (Replay == "") orderManager = (Replay == "")
? new OrderManager(new[] { new NetworkOrderSource( socket ) }, "replay.rep") ? new OrderManager(new OrderSource[] { new LocalOrderSource(), new NetworkOrderSource( new TcpClient( "127.0.0.1", 1234 ) ) }, "replay.rep")
: new OrderManager(new[] { new ReplayOrderSource(Replay) }); : new OrderManager(new OrderSource[] { new ReplayOrderSource( Replay ) });
PlaySound("intro.aud", false); PlaySound("intro.aud", false);

8
OpenRa.Game/OrderManager.cs
View File

@@ -15,11 +15,17 @@ namespace OpenRa.Game
List<OrderSource> players; List<OrderSource> players;
int frameNumber = 0; int frameNumber = 0;
const int FramesAhead = 3;
public int FrameNumber { get { return frameNumber; } } public int FrameNumber { get { return frameNumber; } }
public OrderManager( IEnumerable<OrderSource> players ) public OrderManager( IEnumerable<OrderSource> players )
{ {
this.players = players.ToList(); this.players = players.ToList();
foreach( var p in this.players )
for( int i = 0 ; i < FramesAhead ; i++ )
p.SendLocalOrders( i, new List<Order>() );
} }
public OrderManager( IEnumerable<OrderSource> players, string replayFilename ) public OrderManager( IEnumerable<OrderSource> players, string replayFilename )
@@ -35,7 +41,7 @@ namespace OpenRa.Game
return false; return false;
foreach( var p in players ) foreach( var p in players )
p.SendLocalOrders( frameNumber, localOrders ); p.SendLocalOrders( frameNumber + FramesAhead, localOrders );
if( savingReplay != null ) if( savingReplay != null )
savingReplay.Write( frameNumber ); savingReplay.Write( frameNumber );