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

remove spurious 'set' on IDisable and associated BS implementations

Browse Source
This commit is contained in:
Chris Forbes
2010-05-20 12:55:29 +12:00
parent f9a2c20eee
commit 151f5acb2f
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/Traits/CanPowerDown.cs
View File

@@ -28,23 +28,19 @@ namespace OpenRA.Traits
public class CanPowerDown : IDisable, IPowerModifier, IResolveOrder public class CanPowerDown : IDisable, IPowerModifier, IResolveOrder
{ {
[Sync] [Sync]
bool IsDisabled = false; bool disabled = false;
public bool Disabled { get { return disabled; } }
public bool Disabled public float GetPowerModifier() { return (disabled) ? 0.0f : 1.0f; }
{
get { return IsDisabled; }
set { IsDisabled = value; }
}
public float GetPowerModifier() { return (IsDisabled) ? 0.0f : 1.0f; }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "PowerDown") if (order.OrderString == "PowerDown")
{ {
IsDisabled = !IsDisabled; disabled = !disabled;
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>(); var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
Sound.PlayToPlayer(self.Owner, IsDisabled ? eva.EnablePower : eva.DisablePower); Sound.PlayToPlayer(self.Owner, disabled ? eva.EnablePower : eva.DisablePower);
} }
} }
} }

4
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -50,8 +50,8 @@ namespace OpenRA.Traits
float GetCost(int2 p, UnitMovementType umt); float GetCost(int2 p, UnitMovementType umt);
float GetSpeedModifier(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 interface IProducer
{ {

3
OpenRA.Mods.RA/RequiresPower.cs
View File

@@ -37,8 +37,7 @@ namespace OpenRA.Mods.RA
public bool Disabled public bool Disabled
{ {
get { return (self.Owner.PlayerActor.traits.Get<PlayerResources>().GetPowerState() != PowerState.Normal); } get { return (self.Owner.PlayerActor.traits.Get<PlayerResources>().GetPowerState() != PowerState.Normal); }
set {} // Cannot explicity set
} }
} }
} }