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

Changes Weapon.Impact() to use Target (from WPos).

Browse Source
This commit is contained in:
UberWaffe
2014-08-19 21:32:05 +02:00
parent c25c3441fb
commit 76ccb0cf00
15 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/MadTank.cs
View File

@@ -72,7 +72,8 @@ namespace OpenRA.Mods.RA
if (info.ThumpDamageWeapon != null)
{
var weapon = self.World.Map.Rules.Weapons[info.ThumpDamageWeapon.ToLowerInvariant()];
weapon.Impact(self.CenterPosition, self, Enumerable.Empty<int>());
// Use .FromPos since this weapon needs to affect more than just the MadTank actor
weapon.Impact(Target.FromPos(self.CenterPosition), self, Enumerable.Empty<int>());
}
screenShaker.AddEffect(info.ThumpShakeTime, self.CenterPosition, info.ThumpShakeIntensity, info.ThumpShakeMultiplier);
tick = 0;
@@ -111,7 +112,8 @@ namespace OpenRA.Mods.RA
if (info.DetonationWeapon != null)
{
var weapon = self.World.Map.Rules.Weapons[info.DetonationWeapon.ToLowerInvariant()];
weapon.Impact(self.CenterPosition, self, Enumerable.Empty<int>());
// Use .FromPos since this actor is killed. Cannot use Target.FromActor
weapon.Impact(Target.FromPos(self.CenterPosition), self, Enumerable.Empty<int>());
}
self.Kill(self);
});