Target uses int2.
This commit is contained in:
@@ -214,11 +214,11 @@ namespace OpenRA.Traits
|
||||
public struct Target // a target: either an actor, or a fixed location.
|
||||
{
|
||||
Actor actor;
|
||||
float2 pos;
|
||||
int2 pos;
|
||||
bool valid;
|
||||
|
||||
public static Target FromActor(Actor a) { return new Target { actor = a, valid = (a != null) }; }
|
||||
public static Target FromPos(float2 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 FromOrder(Order o)
|
||||
{
|
||||
@@ -230,7 +230,7 @@ namespace OpenRA.Traits
|
||||
public static readonly Target None = new Target();
|
||||
|
||||
public bool IsValid { get { return valid && (actor == null || actor.IsInWorld); } }
|
||||
public int2 PxPosition { get { return IsActor ? actor.Trait<IHasLocation>().PxPosition : pos.ToInt2(); } }
|
||||
public int2 PxPosition { get { return IsActor ? actor.Trait<IHasLocation>().PxPosition : pos; } }
|
||||
public int2 CenterLocation { get { return PxPosition; } }
|
||||
|
||||
public Actor Actor { get { return IsActor ? actor : null; } }
|
||||
|
||||
@@ -112,12 +112,12 @@ namespace OpenRA.Mods.RA
|
||||
}
|
||||
}
|
||||
|
||||
public static void DoExplosion(Actor attacker, string weapontype, float2 pos, int altitude)
|
||||
public static void DoExplosion(Actor attacker, string weapontype, int2 pos, int altitude)
|
||||
{
|
||||
var args = new ProjectileArgs
|
||||
{
|
||||
src = pos.ToInt2(),
|
||||
dest = pos.ToInt2(),
|
||||
src = pos,
|
||||
dest = pos,
|
||||
srcAltitude = altitude,
|
||||
destAltitude = altitude,
|
||||
firedBy = attacker,
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Effects
|
||||
readonly Player firedBy;
|
||||
readonly Actor silo;
|
||||
Animation anim;
|
||||
float2 pos;
|
||||
int2 pos;
|
||||
int2 targetLocation;
|
||||
int altitude;
|
||||
bool goingUp = true;
|
||||
|
||||
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA
|
||||
WaitForIdle();
|
||||
}
|
||||
|
||||
protected void DefendThis(float2 target)
|
||||
protected void DefendThis(int2 target)
|
||||
{
|
||||
DefendTarget = Target.FromPos(target);
|
||||
TargetType = ETargetType.Location;
|
||||
|
||||
Reference in New Issue
Block a user