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

Merge pull request #4566 from Mailaender/raed-tile0

Browse Source 
Added RAED tile ID 0 support
This commit is contained in:
Paul Chote
2014-02-07 10:11:22 +13:00
parent e7be3a8dc9 5e8a1710dc
commit c9514e37fc
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Map.cs
View File

@@ -485,6 +485,11 @@ namespace OpenRA
for (var i = Bounds.Left; i < Bounds.Right; i++)
{
var tr = MapTiles.Value[i, j];
if (!tileset.Templates.ContainsKey(tr.Type))
{
Console.WriteLine("Unknown Tile ID {0}".F(tr.Type));
continue;
}
var template = tileset.Templates[tr.Type];
if (!template.PickAny)
continue;

5
OpenRA.Utility/LegacyMapImporter.cs
View File

@@ -240,7 +240,10 @@ namespace OpenRA.Utility
for (int j = 0; j < mapSize; j++)
for (int i = 0; i < mapSize; i++)
map.MapTiles.Value[i, j].Type = ms.ReadUInt16();
{
var tileID = ms.ReadUInt16();
map.MapTiles.Value[i, j].Type = tileID == (ushort)0 ? (ushort)255 : tileID; // RAED weirdness
}
for (int j = 0; j < mapSize; j++)
for (int i = 0; i < mapSize; i++)