undo ProjectileArgs stuff

Mailaender · Jul 22, 2010 · 31d5d18 · 31d5d18
1 parent 6d527c3
commit 31d5d18
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -42,7 +42,7 @@ public IEnumerable<Renderable> 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
@@ -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
@@ -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
@@ -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<ScreenShaker>().AddEffect(20, pos, 5);
 		}
 

diff --git 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<Unit>();
 					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
@@ -45,7 +45,7 @@ public void OnCrush(Actor crusher)
 				return;
 
 			var info = self.Info.Traits.Get<MineInfo>();
-			Combat.DoExplosion(self, info.Weapon, Target.FromActor(crusher), 0);
+			Combat.DoExplosion(self, info.Weapon, crusher.CenterLocation, 0);
 			self.QueueActivity(new RemoveSelf());
 		}