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

Reduce duplication.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-02-26 10:49:36 +01:00
parent 3885f0b559
commit 9734054582
5 changed files with 41 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -133,11 +133,7 @@ namespace OpenRA.Mods.Common.Traits
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.AddPosition(self, this);
if (!self.Bounds.Size.IsEmpty)
self.World.ScreenMap.Add(self);
self.World.AddToMaps(self, this);
var altitude = self.World.Map.DistanceAboveTerrain(CenterPosition);
if (altitude.Length >= Info.MinAirborneAltitude)
@@ -355,10 +351,8 @@ namespace OpenRA.Mods.Common.Traits
if (!self.IsInWorld)
return;
if (!self.Bounds.Size.IsEmpty)
self.World.ScreenMap.Update(self);
self.World.UpdateMaps(self, this);
self.World.ActorMap.UpdatePosition(self, this);
var altitude = self.World.Map.DistanceAboveTerrain(CenterPosition);
var isAirborne = altitude.Length >= Info.MinAirborneAltitude;
if (isAirborne && !airborne)
@@ -607,11 +601,7 @@ namespace OpenRA.Mods.Common.Traits
public void RemovedFromWorld(Actor self)
{
UnReserve();
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this);
if (!self.Bounds.Size.IsEmpty)
self.World.ScreenMap.Remove(self);
self.World.RemoveFromMaps(self, this);
OnCruisingAltitudeLeft();
OnAirborneAltitudeLeft();