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

Flood fill now treats similar grass/snow/desert tiles as the same - fixes #4695

Browse Source
This commit is contained in:
Curtis Shmyr
2014-02-21 17:54:27 -07:00
parent 3ed2053d4a
commit 0052000f7b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -57,6 +57,7 @@ NEW:
Filenames are now listed in alphabetical order Filenames are now listed in alphabetical order
Map Editor: Map Editor:
Removed legacy INI/MPR map import. Removed legacy INI/MPR map import.
Fixed being unable to use the flood fill tool on similar grass/snow/desert tiles.
Utility: Utility:
Added an improved INI/MPR map import. Added an improved INI/MPR map import.
Mod / Custom map compatibility: Mod / Custom map compatibility:

8
OpenRA.Editor/BrushTool.cs
View File

@@ -88,7 +88,7 @@ namespace OpenRA.Editor
while (queue.Count > 0) while (queue.Count > 0)
{ {
var p = queue.Dequeue(); var p = queue.Dequeue();
if (!s.Map.MapTiles.Value[p.X, p.Y].Equals(replace)) if (s.Map.MapTiles.Value[p.X, p.Y].Type != replace.Type)
continue; continue;
var a = FindEdge(s, p, new CVec(-1, 0), replace); var a = FindEdge(s, p, new CVec(-1, 0), replace);
@@ -97,9 +97,9 @@ namespace OpenRA.Editor
for (var x = a.X; x <= b.X; x++) for (var x = a.X; x <= b.X; x++)
{ {
s.Map.MapTiles.Value[x, p.Y] = new TileReference<ushort, byte> { Type = brushTemplate.N, Index = (byte)0 }; s.Map.MapTiles.Value[x, p.Y] = new TileReference<ushort, byte> { Type = brushTemplate.N, Index = (byte)0 };
if (s.Map.MapTiles.Value[x, p.Y - 1].Equals(replace)) if (s.Map.MapTiles.Value[x, p.Y - 1].Type == replace.Type)
maybeEnqueue(x, p.Y - 1); maybeEnqueue(x, p.Y - 1);
if (s.Map.MapTiles.Value[x, p.Y + 1].Equals(replace)) if (s.Map.MapTiles.Value[x, p.Y + 1].Type == replace.Type)
maybeEnqueue(x, p.Y + 1); maybeEnqueue(x, p.Y + 1);
} }
} }
@@ -115,7 +115,7 @@ namespace OpenRA.Editor
{ {
var q = p + d; var q = p + d;
if (!s.Map.IsInMap(q)) return p; if (!s.Map.IsInMap(q)) return p;
if (!s.Map.MapTiles.Value[q.X, q.Y].Equals(replace)) return p; if (s.Map.MapTiles.Value[q.X, q.Y].Type != replace.Type) return p;
p = q; p = q;
} }
} }