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

Remove unnecessary this. references.

Browse Source
This commit is contained in:
Paul Chote
2019-06-07 21:07:16 +01:00
committed by abcdefg30
parent ebe37a44ad
commit dabc7ec8dd
15 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Activities/Activity.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Activities
public Activity TickOuter(Actor self)
{
if (State == ActivityState.Done && Game.Settings.Debug.StrictActivityChecking)
throw new InvalidOperationException("Actor {0} attempted to tick activity {1} after it had already completed.".F(self, this.GetType()));
throw new InvalidOperationException("Actor {0} attempted to tick activity {1} after it had already completed.".F(self, GetType()));
if (State == ActivityState.Queued)
{
@@ -147,7 +147,7 @@ namespace OpenRA.Activities
if (origin == this)
Console.Write("*");
Console.WriteLine(this.GetType().ToString().Split('.').Last());
Console.WriteLine(GetType().ToString().Split('.').Last());
if (ChildActivity != null)
ChildActivity.PrintActivityTree(self, origin, level + 1);

2
OpenRA.Game/Actor.cs
View File

@@ -412,7 +412,7 @@ namespace OpenRA
if (enabledTargetablePositionTraits.Any())
return enabledTargetablePositionTraits.SelectMany(tp => tp.TargetablePositions(this));
return new[] { this.CenterPosition };
return new[] { CenterPosition };
}
#region Scripting interface

5
OpenRA.Game/Renderer.cs
View File

@@ -114,9 +114,10 @@ namespace OpenRA
// - a small margin so that tiles rendered partially above the top edge of the screen aren't pushed behind the clip plane
// We need an offset of mapGrid.MaximumTerrainHeight * mapGrid.TileSize.Height / 2 to cover the terrain height
// and choose to use mapGrid.MaximumTerrainHeight * mapGrid.TileSize.Height / 4 for each of the actor and top-edge cases
this.depthScale = mapGrid == null || !mapGrid.EnableDepthBuffer ? 0 :
depthScale = mapGrid == null || !mapGrid.EnableDepthBuffer ? 0 :
(float)Resolution.Height / (Resolution.Height + mapGrid.TileSize.Height * mapGrid.MaximumTerrainHeight);
this.depthOffset = this.depthScale / 2;
depthOffset = depthScale / 2;
}
public void BeginFrame(int2 scroll, float zoom)