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

Merge pull request #6687 from pchote/fix-shellmap

Browse Source 
Revert "Some minor Cargo style fixes."
This commit is contained in:
Matthias Mailänder
2014-10-06 19:50:21 +02:00
parent d288868ca6 ba89eaa50d
commit 1770ce4b60
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Cargo.cs
View File

@@ -37,11 +37,11 @@ namespace OpenRA.Mods.RA
readonly List<Actor> cargo = new List<Actor>(); readonly List<Actor> cargo = new List<Actor>();
readonly HashSet<Actor> reserves = new HashSet<Actor>(); readonly HashSet<Actor> reserves = new HashSet<Actor>();
CPos cachedLocation;
int totalWeight = 0; int totalWeight = 0;
int reservedWeight = 0; int reservedWeight = 0;
Helicopter helicopter; Helicopter helicopter;
CPos currentCell;
public IEnumerable<CPos> CurrentAdjacentCells { get; private set; } public IEnumerable<CPos> CurrentAdjacentCells { get; private set; }
public bool Unloading { get; internal set; } public bool Unloading { get; internal set; }
public IEnumerable<Actor> Passengers { get { return cargo; } } public IEnumerable<Actor> Passengers { get { return cargo; } }
@@ -278,7 +278,7 @@ namespace OpenRA.Mods.RA
public void AddedToWorld(Actor self) public void AddedToWorld(Actor self)
{ {
// Force location update to avoid issues when initial spawn is outside map // Force location update to avoid issues when initial spawn is outside map
cachedLocation = self.Location; currentCell = self.Location;
CurrentAdjacentCells = GetAdjacentCells(); CurrentAdjacentCells = GetAdjacentCells();
} }
@@ -295,13 +295,13 @@ namespace OpenRA.Mods.RA
foreach (var npe in self.TraitsImplementing<INotifyPassengerEntered>()) foreach (var npe in self.TraitsImplementing<INotifyPassengerEntered>())
npe.PassengerEntered(self, c); npe.PassengerEntered(self, c);
} }
initialized = true; initialized = true;
} }
if (cachedLocation != self.Location) var cell = self.World.Map.CellContaining(self.CenterPosition);
if (currentCell != cell)
{ {
cachedLocation = self.Location; currentCell = cell;
CurrentAdjacentCells = GetAdjacentCells(); CurrentAdjacentCells = GetAdjacentCells();
} }
} }