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

Merge pull request #10795 from Mailaender/screenmap-bounds-crash

Browse Source 
Fixed screen map updates for invisible mobile actors
This commit is contained in:
Oliver Brakmann
2016-02-27 17:52:49 +01:00
parent 0e87b49a61 9734054582
commit 59d9eeaa08
5 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.Game/World.cs
View File

@@ -194,6 +194,35 @@ namespace OpenRA
player.Shroud.ExploreAll(this);
}
public void AddToMaps(Actor self, IOccupySpace ios)
{
ActorMap.AddInfluence(self, ios);
ActorMap.AddPosition(self, ios);
if (!self.Bounds.Size.IsEmpty)
ScreenMap.Add(self);
}
public void UpdateMaps(Actor self, IOccupySpace ios)
{
if (!self.IsInWorld)
return;
if (!self.Bounds.Size.IsEmpty)
ScreenMap.Update(self);
ActorMap.UpdatePosition(self, ios);
}
public void RemoveFromMaps(Actor self, IOccupySpace ios)
{
ActorMap.RemoveInfluence(self, ios);
ActorMap.RemovePosition(self, ios);
if (!self.Bounds.Size.IsEmpty)
ScreenMap.Remove(self);
}
public void LoadComplete(WorldRenderer wr)
{
// ScreenMap must be initialized before anything else

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

@@ -134,9 +134,8 @@ namespace OpenRA.Mods.Common.Traits
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.AddPosition(self, this);
self.World.ScreenMap.Add(self);
self.World.AddToMaps(self, this);
var altitude = self.World.Map.DistanceAboveTerrain(CenterPosition);
if (altitude.Length >= Info.MinAirborneAltitude)
OnAirborneAltitudeReached();
@@ -353,8 +352,8 @@ namespace OpenRA.Mods.Common.Traits
if (!self.IsInWorld)
return;
self.World.ScreenMap.Update(self);
self.World.ActorMap.UpdatePosition(self, this);
self.World.UpdateMaps(self, this);
var altitude = self.World.Map.DistanceAboveTerrain(CenterPosition);
var isAirborne = altitude.Length >= Info.MinAirborneAltitude;
if (isAirborne && !airborne)
@@ -603,9 +602,8 @@ namespace OpenRA.Mods.Common.Traits
public void RemovedFromWorld(Actor self)
{
UnReserve();
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this);
self.World.ScreenMap.Remove(self);
self.World.RemoveFromMaps(self, this);
OnCruisingAltitudeLeft();
OnAirborneAltitudeLeft();
}

14
OpenRA.Mods.Common/Traits/Crates/Crate.cs
View File

@@ -157,11 +157,7 @@ namespace OpenRA.Mods.Common.Traits
public void SetVisualPosition(Actor self, WPos pos)
{
CenterPosition = pos;
if (self.IsInWorld)
{
self.World.ScreenMap.Update(self);
self.World.ActorMap.UpdatePosition(self, this);
}
self.World.UpdateMaps(self, this);
}
// Sets only the location (Location)
@@ -207,9 +203,7 @@ namespace OpenRA.Mods.Common.Traits
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.AddPosition(self, this);
self.World.ScreenMap.Add(self);
self.World.AddToMaps(self, this);
var cs = self.World.WorldActor.TraitOrDefault<CrateSpawner>();
if (cs != null)
@@ -218,9 +212,7 @@ namespace OpenRA.Mods.Common.Traits
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this);
self.World.ScreenMap.Remove(self);
self.World.RemoveFromMaps(self, this);
var cs = self.World.WorldActor.TraitOrDefault<CrateSpawner>();
if (cs != null)

12
OpenRA.Mods.Common/Traits/Husk.cs
View File

@@ -106,22 +106,18 @@ namespace OpenRA.Mods.Common.Traits
CenterPosition = pos;
TopLeft = self.World.Map.CellContaining(pos);
self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.UpdatePosition(self, this);
self.World.ScreenMap.Update(self);
self.World.UpdateMaps(self, this);
}
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.AddPosition(self, this);
self.World.ScreenMap.Add(self);
self.World.AddToMaps(self, this);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this);
self.World.ScreenMap.Remove(self);
self.World.RemoveFromMaps(self, this);
}
public bool Disabled

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

@@ -430,25 +430,17 @@ namespace OpenRA.Mods.Common.Traits
public void SetVisualPosition(Actor self, WPos pos)
{
CenterPosition = pos;
if (self.IsInWorld)
{
self.World.ScreenMap.Update(self);
self.World.ActorMap.UpdatePosition(self, this);
}
self.World.UpdateMaps(self, this);
}
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.AddPosition(self, this);
self.World.ScreenMap.Add(self);
self.World.AddToMaps(self, this);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this);
self.World.ScreenMap.Remove(self);
self.World.RemoveFromMaps(self, this);
}
public IEnumerable<IOrderTargeter> Orders { get { yield return new MoveOrderTargeter(self, this); } }