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

Fix or prevent bugs in Hovers

Browse Source 
- Clamp fallTickHeight to at least 1,
  to avoid potential DivideByZero crash.
- Prevent modders from setting values that
  are bogus or would trigger other bugs,
  via loadtime YamlExceptions.
This commit is contained in:
reaperrr
2019-05-04 19:01:46 +02:00
committed by Paul Chote
parent b60346abb1
commit d5c66d9474
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/Traits/Render/Hovers.cs
View File

@@ -40,6 +40,26 @@ namespace OpenRA.Mods.Common.Traits.Render
public readonly WDist InitialHeight = new WDist(43);
public override object Create(ActorInitializer init) { return new Hovers(this, init.Self); }
public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
if (OffsetModifier.Length > -1)
throw new YamlException("Hovers.OffsetModifier must be a negative value.");
if (Ticks < 1)
throw new YamlException("Hovers.Ticks must be higher than zero.");
if (FallTicks < 1)
throw new YamlException("Hovers.FallTicks must be higher than zero.");
if (RiseTicks < 1)
throw new YamlException("Hovers.RiseTicks must be higher than zero.");
if (InitialHeight.Length < RiseTicks)
throw new YamlException("Hovers.InitialHeight must be at least as high as RiseTicks.");
base.RulesetLoaded(rules, ai);
}
}
public class Hovers : ConditionalTrait<HoversInfo>, IRenderModifier, ITick
@@ -56,7 +76,9 @@ namespace OpenRA.Mods.Common.Traits.Render
{
this.info = info;
stepPercentage = 256 / info.Ticks;
fallTickHeight = (info.InitialHeight + info.OffsetModifier).Length / info.FallTicks;
// fallTickHeight must be at least 1 to avoid a DivideByZeroException and other potential problems when trait is disabled.
fallTickHeight = (info.InitialHeight.Length + info.OffsetModifier.Length).Clamp(info.FallTicks, int.MaxValue) / info.FallTicks;
}
void ITick.Tick(Actor self)