From 151f5acb2fdf80117bb85cbaa866a7c2265ea96b Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 20 May 2010 12:55:29 +1200 Subject: [PATCH] remove spurious 'set' on IDisable and associated BS implementations --- OpenRA.Game/Traits/CanPowerDown.cs | 16 ++++++---------- OpenRA.Game/Traits/TraitsInterfaces.cs | 4 ++-- OpenRA.Mods.RA/RequiresPower.cs | 3 +-- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/OpenRA.Game/Traits/CanPowerDown.cs b/OpenRA.Game/Traits/CanPowerDown.cs index 785c010572..a36f4f7993 100644 --- a/OpenRA.Game/Traits/CanPowerDown.cs +++ b/OpenRA.Game/Traits/CanPowerDown.cs @@ -28,23 +28,19 @@ namespace OpenRA.Traits public class CanPowerDown : IDisable, IPowerModifier, IResolveOrder { [Sync] - bool IsDisabled = false; + bool disabled = false; + + public bool Disabled { get { return disabled; } } - public bool Disabled - { - get { return IsDisabled; } - set { IsDisabled = value; } - } - - public float GetPowerModifier() { return (IsDisabled) ? 0.0f : 1.0f; } + public float GetPowerModifier() { return (disabled) ? 0.0f : 1.0f; } public void ResolveOrder(Actor self, Order order) { if (order.OrderString == "PowerDown") { - IsDisabled = !IsDisabled; + disabled = !disabled; var eva = self.World.WorldActor.Info.Traits.Get(); - Sound.PlayToPlayer(self.Owner, IsDisabled ? eva.EnablePower : eva.DisablePower); + Sound.PlayToPlayer(self.Owner, disabled ? eva.EnablePower : eva.DisablePower); } } } diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 77ad54236d..30db372366 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -50,8 +50,8 @@ namespace OpenRA.Traits float GetCost(int2 p, UnitMovementType umt); float GetSpeedModifier(int2 p, UnitMovementType umt); } - - public interface IDisable { bool Disabled { get; set; } } + + public interface IDisable { bool Disabled { get; } } interface IProducer { diff --git a/OpenRA.Mods.RA/RequiresPower.cs b/OpenRA.Mods.RA/RequiresPower.cs index 86786e02bf..3014977e75 100644 --- a/OpenRA.Mods.RA/RequiresPower.cs +++ b/OpenRA.Mods.RA/RequiresPower.cs @@ -37,8 +37,7 @@ namespace OpenRA.Mods.RA public bool Disabled { - get { return (self.Owner.PlayerActor.traits.Get().GetPowerState() != PowerState.Normal); } - set {} // Cannot explicity set + get { return (self.Owner.PlayerActor.traits.Get().GetPowerState() != PowerState.Normal); } } } }