From aaa9c2e579109f9c2636f56fa016d5ff6ce75fe1 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 16 Apr 2010 11:44:51 +1200 Subject: [PATCH] move SupportPowerInfo.MissileWeapon to NukePowerInfo where it belongs --- OpenRA.Game/Traits/SupportPowers/SupportPower.cs | 1 - OpenRA.Mods.RA/SupportPowers/NukePower.cs | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Traits/SupportPowers/SupportPower.cs b/OpenRA.Game/Traits/SupportPowers/SupportPower.cs index 6954b54ea9..bbf35ede42 100644 --- a/OpenRA.Game/Traits/SupportPowers/SupportPower.cs +++ b/OpenRA.Game/Traits/SupportPowers/SupportPower.cs @@ -33,7 +33,6 @@ namespace OpenRA.Traits public readonly string[] Prerequisites = { }; public readonly int TechLevel = -1; public readonly bool GivenAuto = true; - public readonly string MissileWeapon = ""; public readonly string BeginChargeSound = null; public readonly string EndChargeSound = null; diff --git a/OpenRA.Mods.RA/SupportPowers/NukePower.cs b/OpenRA.Mods.RA/SupportPowers/NukePower.cs index ca0ea1a64c..4373a9eebd 100755 --- a/OpenRA.Mods.RA/SupportPowers/NukePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/NukePower.cs @@ -27,6 +27,7 @@ namespace OpenRA.Mods.RA.SupportPowers { class NukePowerInfo : SupportPowerInfo { + public readonly string MissileWeapon = ""; public override object Create(Actor self) { return new NukePower(self, this); } } @@ -57,7 +58,7 @@ namespace OpenRA.Mods.RA.SupportPowers Sound.Play(Info.LaunchSound); //FIRE ZE MISSILES - w.Add(new NukeLaunch(silo, Info.MissileWeapon, order.TargetLocation)); + w.Add(new NukeLaunch(silo, (Info as NukePowerInfo).MissileWeapon, order.TargetLocation)); }); Game.controller.CancelInputMode();