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

Merge pull request #9450 from atlimit8/SpreadDamageWarheadRangeOnRulesetLoaded

Browse Source 
SpreadDamageWarhead Range on ruleset loaded
This commit is contained in:
Oliver Brakmann
2015-10-11 15:28:19 +02:00
parent 244093834c e86eea383a
commit 42b04b8a6f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
View File

@@ -10,12 +10,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Warheads namespace OpenRA.Mods.Common.Warheads
{ {
public class SpreadDamageWarhead : DamageWarhead public class SpreadDamageWarhead : DamageWarhead, IRulesetLoaded<WeaponInfo>
{ {
[Desc("Range between falloff steps.")] [Desc("Range between falloff steps.")]
public readonly WDist Spread = new WDist(43); public readonly WDist Spread = new WDist(43);
@@ -29,7 +30,7 @@ namespace OpenRA.Mods.Common.Warheads
[Desc("Ranges at which each Falloff step is defined. Overrides Spread.")] [Desc("Ranges at which each Falloff step is defined. Overrides Spread.")]
public WDist[] Range = null; public WDist[] Range = null;
public void InitializeRange() public void RulesetLoaded(Ruleset rules, WeaponInfo info)
{ {
if (Range != null) if (Range != null)
{ {
@@ -46,9 +47,6 @@ namespace OpenRA.Mods.Common.Warheads
public override void DoImpact(WPos pos, Actor firedBy, IEnumerable<int> damageModifiers) public override void DoImpact(WPos pos, Actor firedBy, IEnumerable<int> damageModifiers)
{ {
if (Range == null)
InitializeRange();
var world = firedBy.World; var world = firedBy.World;
if (world.LocalPlayer != null) if (world.LocalPlayer != null)