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

Merge pull request #11924 from obrakmann/fix11922_addsmudge-nre

Browse Source 
Fix NRE in SmudgeLayer.AddSmudge
This commit is contained in:
abcdefg30
2016-08-31 14:32:58 +02:00
committed by GitHub
parent b38c1a8623 93dba184a1
commit 887cd61943
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
View File

@@ -142,6 +142,7 @@ namespace OpenRA.Mods.Common.Traits
if (Game.CosmeticRandom.Next(0, 100) <= Info.SmokePercentage)
world.AddFrameEndTask(w => w.Add(new SpriteEffect(world.Map.CenterOfCell(loc), w, Info.SmokeType, Info.SmokeSequence, Info.SmokePalette)));
// A null Sprite indicates a deleted smudge.
if ((!dirty.ContainsKey(loc) || dirty[loc].Sprite == null) && !tiles.ContainsKey(loc))
{
// No smudge; create a new one
@@ -151,7 +152,8 @@ namespace OpenRA.Mods.Common.Traits
else
{
// Existing smudge; make it deeper
var tile = dirty.ContainsKey(loc) ? dirty[loc] : tiles[loc];
// A null Sprite indicates a deleted smudge.
var tile = dirty.ContainsKey(loc) && dirty[loc].Sprite != null ? dirty[loc] : tiles[loc];
var maxDepth = smudges[tile.Type].Length;
if (tile.Depth < maxDepth - 1)
{
@@ -167,6 +169,7 @@ namespace OpenRA.Mods.Common.Traits
{
var tile = dirty.ContainsKey(loc) ? dirty[loc] : new Smudge();
// Setting Sprite to null to indicate a deleted smudge.
tile.Sprite = null;
dirty[loc] = tile;
}
@@ -178,6 +181,7 @@ namespace OpenRA.Mods.Common.Traits
{
if (!self.World.FogObscures(kv.Key))
{
// A null Sprite indicates a deleted smudge.
if (kv.Value.Sprite == null)
tiles.Remove(kv.Key);
else