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

moved Game.players, LocalPlayer, localPlayerIndex to World. Setting LocalPlayer via settings is broken.

Browse Source
This commit is contained in:
Bob
2010-01-21 12:19:25 +13:00
parent b037250054
commit d07b782044
36 changed files with 120 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Orders/ChronoshiftDestinationOrderGenerator.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRa.Orders
public Cursor GetCursor(int2 xy, MouseInput mi)
{
if (!Game.LocalPlayer.Shroud.IsExplored(xy))
if (!Game.world.LocalPlayer.Shroud.IsExplored(xy))
return Cursor.MoveBlocked;
var movement = self.traits.GetOrDefault<IMovement>();

4
OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRa.Orders
{
var loc = mi.Location + Game.viewport.Location;
var underCursor = Game.world.FindUnits(loc, loc)
.Where(a => a.Owner == Game.LocalPlayer
.Where(a => a.Owner == Game.world.LocalPlayer
&& a.traits.Contains<Chronoshiftable>()
&& a.traits.Contains<Selectable>()).FirstOrDefault();
@@ -41,7 +41,7 @@ namespace OpenRa.Orders
public void Tick()
{
var hasChronosphere = Game.world.Actors
.Any(a => a.Owner == Game.LocalPlayer && a.traits.Contains<Chronosphere>());
.Any(a => a.Owner == Game.world.LocalPlayer && a.traits.Contains<Chronosphere>());
if (!hasChronosphere)
Game.controller.CancelInputMode();

4
OpenRa.Game/Orders/IronCurtainOrderGenerator.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRa.Orders
{
var loc = mi.Location + Game.viewport.Location;
var underCursor = Game.world.FindUnits(loc, loc)
.Where(a => a.Owner == Game.LocalPlayer
.Where(a => a.Owner == Game.world.LocalPlayer
&& a.traits.Contains<IronCurtainable>()
&& a.traits.Contains<Selectable>()).FirstOrDefault();
@@ -41,7 +41,7 @@ namespace OpenRa.Orders
public void Tick()
{
var hasStructure = Game.world.Actors
.Any(a => a.Owner == Game.LocalPlayer && a.traits.Contains<IronCurtain>());
.Any(a => a.Owner == Game.world.LocalPlayer && a.traits.Contains<IronCurtain>());
if (!hasStructure)
Game.controller.CancelInputMode();

2
OpenRa.Game/Orders/Order.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRa
static Player LookupPlayer(uint index)
{
return Game.players
return Game.world.players
.Where(x => x.Value.Index == index)
.First().Value;
}

2
OpenRa.Game/Orders/PowerDownOrderGenerator.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRa.Orders
{
var loc = mi.Location + Game.viewport.Location;
var underCursor = Game.world.FindUnits(loc, loc)
.Where(a => a.Owner == Game.LocalPlayer
.Where(a => a.Owner == Game.world.LocalPlayer
&& a.traits.Contains<Building>()
&& a.traits.Contains<Selectable>()).FirstOrDefault();

4
OpenRa.Game/Orders/RepairOrderGenerator.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRa.Orders
{
var loc = mi.Location + Game.viewport.Location;
var underCursor = Game.world.FindUnits(loc, loc)
.Where(a => a.Owner == Game.LocalPlayer
.Where(a => a.Owner == Game.world.LocalPlayer
&& a.traits.Contains<Building>()
&& a.traits.Contains<Selectable>()).FirstOrDefault();
@@ -40,7 +40,7 @@ namespace OpenRa.Orders
return;
var hasFact = Game.world.Actors
.Any(a => a.Owner == Game.LocalPlayer && a.traits.Contains<ConstructionYard>());
.Any(a => a.Owner == Game.world.LocalPlayer && a.traits.Contains<ConstructionYard>());
if (!hasFact)
Game.controller.CancelInputMode();

2
OpenRa.Game/Orders/SellOrderGenerator.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRa.Orders
{
var loc = mi.Location + Game.viewport.Location;
var underCursor = Game.world.FindUnits(loc, loc)
.Where(a => a.Owner == Game.LocalPlayer
.Where(a => a.Owner == Game.world.LocalPlayer
&& a.traits.Contains<Building>()
&& a.traits.Contains<Selectable>()).FirstOrDefault();

2
OpenRa.Game/Orders/UnitOrders.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRa.Orders
}
case "AssignPlayer":
{
Game.LocalPlayer = order.Player;
Game.world.LocalPlayer = order.Player;
Game.chat.AddLine(order.Player, "is now YOU.");
break;
}