move LobbyInfo onto OrderManager

This commit is contained in:
Bob
2010-10-11 16:00:02 +13:00
parent beecb8aeb1
commit 17990ab8b7
17 changed files with 98 additions and 88 deletions

View File

@@ -18,6 +18,7 @@ using OpenRA.Orders;
using OpenRA.Traits;
using XRandom = OpenRA.Thirdparty.Random;
using OpenRA.Network;
namespace OpenRA
{
@@ -28,6 +29,9 @@ namespace OpenRA
List<IEffect> effects = new List<IEffect>();
Queue<Action<World>> frameEndActions = new Queue<Action<World>>();
readonly OrderManager orderManager;
public Session LobbyInfo { get { return orderManager.LobbyInfo; } }
public XRandom SharedRandom = new XRandom(0);
public readonly Dictionary<int, Player> players = new Dictionary<int, Player>();
@@ -84,8 +88,9 @@ namespace OpenRA
}
}
public World(Manifest manifest, Map map)
internal World(Manifest manifest, Map map, OrderManager orderManager)
{
this.orderManager = orderManager;
orderGenerator_ = new UnitOrderGenerator();
Map = map;