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

remove ref to Game.world in Combat

Browse Source
This commit is contained in:
Bob
2010-10-11 21:04:50 +13:00
parent 0873741983
commit 1c1483377c
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Weapon.cs
View File

@@ -72,9 +72,12 @@ namespace OpenRA.Mods.RA
Turret.Recoil = Math.Max(0f, Turret.Recoil - .2f);
}
public bool IsValidAgainst(Target target)
public bool IsValidAgainst(World world, Target target)
{
return Combat.WeaponValidForTarget(Info, target);
if( target.IsActor )
return Combat.WeaponValidForTarget( Info, target.Actor );
else
return Combat.WeaponValidForTarget( Info, world, Util.CellContaining( target.CenterLocation ) );
}
public void FiredShot()