Fix RangeMultiplier regression.

This commit is contained in:
Zimmermann Gyula
2017-05-01 14:47:17 +02:00
parent 5a273700bf
commit c48cf51190

View File

@@ -12,20 +12,22 @@
namespace OpenRA.Mods.Common.Traits
{
[Desc("Modifies the range of weapons fired by this actor.")]
public class RangeMultiplierInfo : ConditionalTraitInfo
public class RangeMultiplierInfo : ConditionalTraitInfo, IRangeModifierInfo
{
[FieldLoader.Require]
[Desc("Percentage modifier to apply.")]
public readonly int Modifier = 100;
public override object Create(ActorInitializer init) { return new RangeMultiplier(this); }
int IRangeModifierInfo.GetRangeModifierDefault() { return EnabledByDefault ? Modifier : 100; }
}
public class RangeMultiplier : ConditionalTrait<RangeMultiplierInfo>, IRangeModifierInfo
public class RangeMultiplier : ConditionalTrait<RangeMultiplierInfo>, IRangeModifier
{
public RangeMultiplier(RangeMultiplierInfo info)
: base(info) { }
int IRangeModifierInfo.GetRangeModifierDefault() { return IsTraitDisabled ? 100 : Info.Modifier; }
int IRangeModifier.GetRangeModifier() { return IsTraitDisabled ? 100 : Info.Modifier; }
}
}