move Game.IsStarted to World.GameHasStarted
This commit is contained in:
@@ -129,7 +129,7 @@ namespace OpenRA
|
||||
|
||||
public void Tick(World world)
|
||||
{
|
||||
if (!Game.IsStarted) return;
|
||||
if (!world.GameHasStarted) return;
|
||||
if (world.LocalPlayer == null) return;
|
||||
|
||||
TickPaletteAnimation();
|
||||
|
||||
@@ -125,7 +125,7 @@ namespace OpenRA
|
||||
|
||||
try
|
||||
{
|
||||
if (!Game.IsStarted)
|
||||
if (!world.GameHasStarted)
|
||||
return "default";
|
||||
|
||||
var mi = new MouseInput
|
||||
|
||||
@@ -318,7 +318,7 @@ namespace OpenRA
|
||||
|
||||
LobbyInfo = session;
|
||||
|
||||
if (!IsStarted)
|
||||
if (!world.GameHasStarted)
|
||||
world.SharedRandom = new OpenRA.Thirdparty.Random(LobbyInfo.GlobalSettings.RandomSeed);
|
||||
|
||||
if (Game.orderManager.Connection.ConnectionState == ConnectionState.Connected)
|
||||
@@ -347,8 +347,6 @@ namespace OpenRA
|
||||
|
||||
public static void IssueOrder(Order o) { orderManager.IssueOrder(o); } /* avoid exposing the OM to mod code */
|
||||
|
||||
public static bool IsStarted { get { return orderManager.GameStarted; } }
|
||||
|
||||
public static void LoadShellMap(string map)
|
||||
{
|
||||
LoadMap(map);
|
||||
|
||||
@@ -125,7 +125,7 @@ namespace OpenRA.Graphics
|
||||
|
||||
mapOnlySheet.Texture.SetData(oreLayer);
|
||||
|
||||
if (!Game.IsStarted || !world.Queries.OwnedBy[world.LocalPlayer].WithTrait<ProvidesRadar>().Any())
|
||||
if (!world.GameHasStarted || !world.Queries.OwnedBy[world.LocalPlayer].WithTrait<ProvidesRadar>().Any())
|
||||
return;
|
||||
|
||||
var bitmap = new Bitmap(oreLayer);
|
||||
|
||||
@@ -46,6 +46,8 @@ namespace OpenRA
|
||||
|
||||
public void AddPlayer(Player p) { players[p.Index] = p; }
|
||||
|
||||
public bool GameHasStarted { get { return Game.orderManager.GameStarted; } }
|
||||
|
||||
int localPlayerIndex;
|
||||
public Player LocalPlayer
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user