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

fix targets staying valid across owner changes

Browse Source
This commit is contained in:
Chris Forbes
2011-01-30 21:45:08 +13:00
parent 6e1cb23f10
commit 51ab2b4969
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -215,10 +215,19 @@ namespace OpenRA.Traits
public struct Target // a target: either an actor, or a fixed location. public struct Target // a target: either an actor, or a fixed location.
{ {
Actor actor; Actor actor;
Player owner;
int2 pos; int2 pos;
bool valid; bool valid;
public static Target FromActor(Actor a) { return new Target { actor = a, valid = (a != null) }; } public static Target FromActor(Actor a)
{
return new Target
{
actor = a,
valid = (a != null),
owner = (a != null) ? a.Owner : null
};
}
public static Target FromPos(int2 p) { return new Target { pos = p, valid = true }; } public static Target FromPos(int2 p) { return new Target { pos = p, valid = true }; }
public static Target FromCell(int2 c) { return new Target { pos = Util.CenterOfCell(c), valid = true }; } public static Target FromCell(int2 c) { return new Target { pos = Util.CenterOfCell(c), valid = true }; }
public static Target FromOrder(Order o) public static Target FromOrder(Order o)
@@ -230,7 +239,7 @@ namespace OpenRA.Traits
public static readonly Target None = new Target(); public static readonly Target None = new Target();
public bool IsValid { get { return valid && (actor == null || actor.IsInWorld); } } public bool IsValid { get { return valid && (actor == null || (actor.IsInWorld && actor.Owner == owner)); } }
public int2 PxPosition { get { return IsActor ? actor.Trait<IHasLocation>().PxPosition : pos; } } public int2 PxPosition { get { return IsActor ? actor.Trait<IHasLocation>().PxPosition : pos; } }
public int2 CenterLocation { get { return PxPosition; } } public int2 CenterLocation { get { return PxPosition; } }