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

migrating most things to use the Target struct rather than Actor directly.

Browse Source
This commit is contained in:
Chris Forbes
2010-07-05 18:25:10 +12:00
parent 88b705c8ef
commit 5c61c9d3a9
14 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Combat.cs
View File

@@ -147,7 +147,7 @@ namespace OpenRA.Mods.RA
static float GetDamageToInflict(Actor target, ProjectileArgs args, WarheadInfo warhead, float modifier)
{
// don't hit air units with splash from ground explosions, etc
if (!WeaponValidForTarget(args.weapon, target)) return 0f;
if (!WeaponValidForTarget(args.weapon, Target.FromActor(target))) return 0f;
var selectable = target.Info.Traits.GetOrDefault<SelectableInfo>();
var radius = selectable != null ? selectable.Radius : 0;
@@ -159,9 +159,12 @@ namespace OpenRA.Mods.RA
return (float)(rawDamage * multiplier);
}
public static bool WeaponValidForTarget(WeaponInfo weapon, Actor target)
public static bool WeaponValidForTarget(WeaponInfo weapon, Target target)
{
var ownedInfo = target.Info.Traits.GetOrDefault<OwnedActorInfo>();
// todo: fix this properly.
if (!target.IsValid || !target.IsActor) return false;
var ownedInfo = target.Actor.Info.Traits.GetOrDefault<OwnedActorInfo>();
if (!weapon.ValidTargets.Contains(ownedInfo.TargetType))
return false;
@@ -175,7 +178,7 @@ namespace OpenRA.Mods.RA
return true;
}
public static bool HasAnyValidWeapons(Actor self, Actor target)
public static bool HasAnyValidWeapons(Actor self, Target target)
{
var info = self.Info.Traits.Get<AttackBaseInfo>();
if (info.PrimaryWeapon != null &&