From 31d5d18d65c641b2f0484671bedf636e0947ca5e Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 22 Jul 2010 18:59:41 +1200 Subject: [PATCH] undo ProjectileArgs stuff --- OpenRA.Mods.Aftermath/DemoTruck.cs | 2 +- OpenRA.Mods.Cnc/Effects/IonCannon.cs | 2 +- OpenRA.Mods.RA/Combat.cs | 8 ++++---- OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs | 2 +- OpenRA.Mods.RA/Effects/NukeLaunch.cs | 2 +- OpenRA.Mods.RA/Explodes.cs | 2 +- OpenRA.Mods.RA/Mine.cs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenRA.Mods.Aftermath/DemoTruck.cs b/OpenRA.Mods.Aftermath/DemoTruck.cs index 8aac0de1a127..deae85981dc1 100644 --- a/OpenRA.Mods.Aftermath/DemoTruck.cs +++ b/OpenRA.Mods.Aftermath/DemoTruck.cs @@ -39,7 +39,7 @@ public void Detonate(Actor self, Actor detonatedBy) self.World.AddFrameEndTask( w => { - Combat.DoExplosion(self, info.PrimaryWeapon, Target.FromActor(self), altitude); + Combat.DoExplosion(self, info.PrimaryWeapon, self.CenterLocation, altitude); var report = self.GetPrimaryWeapon().Report; if (report != null) Sound.Play(report + ".aud", self.CenterLocation); diff --git a/OpenRA.Mods.Cnc/Effects/IonCannon.cs b/OpenRA.Mods.Cnc/Effects/IonCannon.cs index 0d86c4b23486..2698101f9d16 100644 --- a/OpenRA.Mods.Cnc/Effects/IonCannon.cs +++ b/OpenRA.Mods.Cnc/Effects/IonCannon.cs @@ -42,7 +42,7 @@ public IEnumerable Render() void Finish( World world ) { world.AddFrameEndTask(w => w.Remove(this)); - Combat.DoExplosion(firedBy, "IonCannon", target, 0); + Combat.DoExplosion(firedBy, "IonCannon", target.CenterLocation, 0); } } } diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs index 18ecd0c68cb4..5d7d8768a206 100755 --- a/OpenRA.Mods.RA/Combat.cs +++ b/OpenRA.Mods.RA/Combat.cs @@ -113,16 +113,16 @@ public static void DoImpacts(ProjectileArgs args) } } - public static void DoExplosion(Actor attacker, string weapontype, Target _target, int altitude) + public static void DoExplosion(Actor attacker, string weapontype, float2 pos, int altitude) { var args = new ProjectileArgs { - src = Util.CellContaining(_target.CenterLocation), - dest = Util.CellContaining(_target.CenterLocation), + src = pos.ToInt2(), + dest = pos.ToInt2(), srcAltitude = altitude, destAltitude = altitude, firedBy = attacker, - target = _target, + target = Target.FromPos(pos), weapon = Rules.Weapons[ weapontype.ToLowerInvariant() ], facing = 0 }; diff --git a/OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs b/OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs index 9401f9b24492..95f389368ccc 100644 --- a/OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs +++ b/OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs @@ -27,7 +27,7 @@ public ExplodeCrateAction(Actor self, ExplodeCrateActionInfo info) public override void Activate(Actor collector) { - Combat.DoExplosion(self, (info as ExplodeCrateActionInfo).Weapon, Target.FromActor(collector), 0); + Combat.DoExplosion(self, (info as ExplodeCrateActionInfo).Weapon, collector.CenterLocation, 0); base.Activate(collector); } } diff --git a/OpenRA.Mods.RA/Effects/NukeLaunch.cs b/OpenRA.Mods.RA/Effects/NukeLaunch.cs index 6a2a771e02a1..973aff753ffd 100755 --- a/OpenRA.Mods.RA/Effects/NukeLaunch.cs +++ b/OpenRA.Mods.RA/Effects/NukeLaunch.cs @@ -76,7 +76,7 @@ public void Tick(World world) void Explode(World world) { world.AddFrameEndTask(w => w.Remove(this)); - Combat.DoExplosion(silo.Owner.PlayerActor, weapon, Target.FromPos(pos), 0); + Combat.DoExplosion(silo.Owner.PlayerActor, weapon, pos, 0); world.WorldActor.traits.Get().AddEffect(20, pos, 5); } diff --git a/OpenRA.Mods.RA/Explodes.cs b/OpenRA.Mods.RA/Explodes.cs index 3cb8183f34a6..7869e5ed845c 100644 --- a/OpenRA.Mods.RA/Explodes.cs +++ b/OpenRA.Mods.RA/Explodes.cs @@ -32,7 +32,7 @@ public void Damaged(Actor self, AttackInfo e) { var unit = self.traits.GetOrDefault(); var altitude = unit != null ? unit.Altitude : 0; - Combat.DoExplosion(e.Attacker, weapon, Target.FromActor(self), altitude); + Combat.DoExplosion(e.Attacker, weapon, self.CenterLocation, altitude); } } } diff --git a/OpenRA.Mods.RA/Mine.cs b/OpenRA.Mods.RA/Mine.cs index 02553bb1afbc..607450f20e1f 100644 --- a/OpenRA.Mods.RA/Mine.cs +++ b/OpenRA.Mods.RA/Mine.cs @@ -45,7 +45,7 @@ public void OnCrush(Actor crusher) return; var info = self.Info.Traits.Get(); - Combat.DoExplosion(self, info.Weapon, Target.FromActor(crusher), 0); + Combat.DoExplosion(self, info.Weapon, crusher.CenterLocation, 0); self.QueueActivity(new RemoveSelf()); }