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

Merge pull request #6510 from pchote/fix-inaccuracy-crash

Browse Source 
Move inaccuracy modifier queries outside the projectile ctors.
This commit is contained in:
obrakmann
2014-09-20 12:24:57 +02:00
parent 5fb2475b3c caecf2d82a
commit 6e349d3052
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -20,6 +20,7 @@ namespace OpenRA.GameRules
{
public WeaponInfo Weapon;
public IEnumerable<int> DamageModifiers;
public IEnumerable<int> InaccuracyModifiers;
public int Facing;
public WPos Source;
public Actor SourceActor;

3
OpenRA.Mods.D2k/ThrowsShrapnel.cs
View File

@@ -52,6 +52,9 @@ namespace OpenRA.Mods.D2k
DamageModifiers = self.TraitsImplementing<IFirepowerModifier>()
.Select(a => a.GetFirepowerModifier()),
InaccuracyModifiers = self.TraitsImplementing<IInaccuracyModifier>()
.Select(a => a.GetInaccuracyModifier()),
Source = self.CenterPosition,
SourceActor = self,
PassiveTarget = self.CenterPosition + new WVec(range, 0, 0).Rotate(rotation)

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

@@ -157,6 +157,9 @@ namespace OpenRA.Mods.RA
DamageModifiers = self.TraitsImplementing<IFirepowerModifier>()
.Select(a => a.GetFirepowerModifier()),
InaccuracyModifiers = self.TraitsImplementing<IInaccuracyModifier>()
.Select(a => a.GetInaccuracyModifier()),
Source = muzzlePosition,
SourceActor = self,
PassiveTarget = target.CenterPosition,

4
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -82,9 +82,7 @@ namespace OpenRA.Mods.RA.Effects
target = args.PassiveTarget;
if (info.Inaccuracy.Range > 0)
{
var modifiers = args.SourceActor.TraitsImplementing<IInaccuracyModifier>()
.Select(m => m.GetInaccuracyModifier());
var inaccuracy = Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, modifiers);
var inaccuracy = Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, args.InaccuracyModifiers);
var maxOffset = inaccuracy * (target - pos).Length / args.Weapon.Range.Range;
target += WVec.FromPDF(world.SharedRandom, 2) * maxOffset / 1024;
}

4
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -96,9 +96,7 @@ namespace OpenRA.Mods.RA.Effects
if (info.Inaccuracy.Range > 0)
{
var modifiers = args.SourceActor.TraitsImplementing<IInaccuracyModifier>()
.Select(m => m.GetInaccuracyModifier());
var inaccuracy = Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, modifiers);
var inaccuracy = Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, args.InaccuracyModifiers);
offset = WVec.FromPDF(world.SharedRandom, 2) * inaccuracy / 1024;
}