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

Merge pull request #6334 from Mailaender/parachute-out-of-map

Browse Source 
Fixed a crash when parachutes were spawned outside of the map
This commit is contained in:
Paul Chote
2014-09-24 22:26:08 +12:00
parent d1b28ad93b 44d134afe0
commit 17702dc057
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Traits/World/ActorMap.cs
View File

@@ -154,13 +154,17 @@ namespace OpenRA.Traits
public void AddInfluence(Actor self, IOccupySpace ios)
{
foreach (var c in ios.OccupiedCells())
influence[c.First] = new InfluenceNode { Next = influence[c.First], SubCell = c.Second, Actor = self };
if (map.Contains(c.First))
influence[c.First] = new InfluenceNode { Next = influence[c.First], SubCell = c.Second, Actor = self };
}
public void RemoveInfluence(Actor self, IOccupySpace ios)
{
foreach (var c in ios.OccupiedCells())
{
if (!map.Contains(c.First))
continue;
var temp = influence[c.First];
RemoveInfluenceInner(ref temp, self);
influence[c.First] = temp;

2
OpenRA.Mods.RA/EjectOnDeath.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA
{
public void Killed(Actor self, AttackInfo e)
{
if (self.Owner.WinState == WinState.Lost)
if (self.Owner.WinState == WinState.Lost || !self.World.Map.Contains(self.Location))
return;
var r = self.World.SharedRandom.Next(1, 100);

3
OpenRA.Mods.RA/ParaDrop.cs
View File

@@ -77,6 +77,9 @@ namespace OpenRA.Mods.RA
if (droppedAt.Contains(self.Location) || checkForSuitableCell && !IsSuitableCell(cargo.Peek(self), self.Location))
return;
if (!self.World.Map.Contains(self.Location))
return;
// unload a dude here
droppedAt.Add(self.Location);