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

rename WRange to WDist

Browse Source
This commit is contained in:
Matthias Mailänder
2015-07-06 16:35:15 +02:00
parent 54e1cf866c
commit 7447e0bf93
100 changed files with 244 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs
View File

@@ -35,10 +35,10 @@ namespace OpenRA.Mods.Common.Traits
var range = self.TraitsImplementing<DetectCloaked>()
.Where(a => !a.IsTraitDisabled)
.Select(a => WRange.FromCells(a.Info.Range))
.Append(WRange.Zero).Max();
.Select(a => WDist.FromCells(a.Info.Range))
.Append(WDist.Zero).Max();
if (range == WRange.Zero)
if (range == WDist.Zero)
yield break;
yield return new RangeCircleRenderable(

6
OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly string RangeCircleType = null;
[Desc("Range to draw if no armaments are available")]
public readonly WRange FallbackRange = WRange.Zero;
public readonly WDist FallbackRange = WDist.Zero;
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits
if (armaments.Any())
range = armaments.Select(a => w.Map.Rules.Weapons[a.Weapon.ToLowerInvariant()].Range).Max();
if (range == WRange.Zero)
if (range == WDist.Zero)
yield break;
yield return new RangeCircleRenderable(
@@ -71,7 +71,7 @@ namespace OpenRA.Mods.Common.Traits
yield break;
var range = attack.GetMaximumRange();
if (range == WRange.Zero)
if (range == WDist.Zero)
yield break;
yield return new RangeCircleRenderable(

2
OpenRA.Mods.Common/Traits/Render/WithBarrel.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Traits
WVec BarrelOffset()
{
var localOffset = info.LocalOffset + new WVec(-armament.Recoil, WRange.Zero, WRange.Zero);
var localOffset = info.LocalOffset + new WVec(-armament.Recoil, WDist.Zero, WDist.Zero);
var turretOffset = turreted != null ? turreted.Position(self) : WVec.Zero;
var turretOrientation = turreted != null ? turreted.LocalOrientation(self) : WRot.Zero;

2
OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly Color Color = Color.FromArgb(128, Color.White);
[Desc("Range of the circle")]
public readonly WRange Range = WRange.Zero;
public readonly WDist Range = WDist.Zero;
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{

4
OpenRA.Mods.Common/Traits/Render/WithTurret.cs
View File

@@ -91,8 +91,8 @@ namespace OpenRA.Mods.Common.Traits
if (!Info.Recoils)
return t.Position(self);
var recoil = arms.Aggregate(WRange.Zero, (a, b) => a + b.Recoil);
var localOffset = new WVec(-recoil, WRange.Zero, WRange.Zero);
var recoil = arms.Aggregate(WDist.Zero, (a, b) => a + b.Recoil);
var localOffset = new WVec(-recoil, WDist.Zero, WDist.Zero);
var bodyOrientation = body.QuantizeOrientation(self, self.Orientation);
var turretOrientation = body.QuantizeOrientation(self, t.LocalOrientation(self));
return t.Position(self) + body.LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation));

2
OpenRA.Mods.Common/Traits/Render/WithVoxelBarrel.cs
View File

@@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits
WVec BarrelOffset()
{
var localOffset = info.LocalOffset + new WVec(-armament.Recoil, WRange.Zero, WRange.Zero);
var localOffset = info.LocalOffset + new WVec(-armament.Recoil, WDist.Zero, WDist.Zero);
var turretOffset = turreted != null ? turreted.Position(self) : WVec.Zero;
var turretOrientation = turreted != null ? turreted.LocalOrientation(self) : WRot.Zero;