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

Split MuzzleOffset and MuzzleOrientation calcs to protected methods

Browse Source 
To make overriding easier for downstream traits inheriting Armament.
This commit is contained in:
reaperrr
2017-07-06 22:14:00 +02:00
parent 26be2a3e99
commit 8ee742d66a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -336,7 +336,12 @@ namespace OpenRA.Mods.Common.Traits
public virtual bool AllowExplode { get { return !IsReloading; } } public virtual bool AllowExplode { get { return !IsReloading; } }
bool IExplodeModifier.ShouldExplode(Actor self) { return AllowExplode; } bool IExplodeModifier.ShouldExplode(Actor self) { return AllowExplode; }
public virtual WVec MuzzleOffset(Actor self, Barrel b) public WVec MuzzleOffset(Actor self, Barrel b)
{
return CalculateMuzzleOffset(self, b);
}
protected virtual WVec CalculateMuzzleOffset(Actor self, Barrel b)
{ {
var bodyOrientation = coords.QuantizeOrientation(self, self.Orientation); var bodyOrientation = coords.QuantizeOrientation(self, self.Orientation);
var localOffset = b.Offset + new WVec(-Recoil, WDist.Zero, WDist.Zero); var localOffset = b.Offset + new WVec(-Recoil, WDist.Zero, WDist.Zero);
@@ -353,7 +358,12 @@ namespace OpenRA.Mods.Common.Traits
return coords.LocalToWorld(localOffset.Rotate(bodyOrientation)); return coords.LocalToWorld(localOffset.Rotate(bodyOrientation));
} }
public virtual WRot MuzzleOrientation(Actor self, Barrel b) public WRot MuzzleOrientation(Actor self, Barrel b)
{
return CalculateMuzzleOrientation(self, b);
}
protected virtual WRot CalculateMuzzleOrientation(Actor self, Barrel b)
{ {
var orientation = turret != null ? turret.WorldOrientation(self) : var orientation = turret != null ? turret.WorldOrientation(self) :
coords.QuantizeOrientation(self, self.Orientation); coords.QuantizeOrientation(self, self.Orientation);