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

Improve exception message for bogus tileset definitions.

Browse Source
This commit is contained in:
Paul Chote
2020-08-14 13:13:36 +01:00
committed by abcdefg30
parent 5d6961619d
commit 3e849568ff
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Map/TileSet.cs
View File

@@ -72,8 +72,11 @@ namespace OpenRA
tileInfo = new TerrainTileInfo[Size.X * Size.Y]; tileInfo = new TerrainTileInfo[Size.X * Size.Y];
foreach (var node in nodes) foreach (var node in nodes)
{ {
if (!int.TryParse(node.Key, out var key) || key < 0 || key >= tileInfo.Length) if (!int.TryParse(node.Key, out var key))
throw new InvalidDataException("Invalid tile key '{0}' on template '{1}' of tileset '{2}'.".F(node.Key, Id, tileSet.Id)); throw new InvalidDataException("Tileset `{0}` template `{1}` frame `{2}` is not a valid integer.".F(tileSet.Id, Id, node.Key));
if (key < 0 || key >= tileInfo.Length)
throw new InvalidDataException("Tileset `{0}` template `{1}` frame `{2}` must be between 0 and {3} for a {4}x{5} Size template.".F(tileSet.Id, Id, node.Key, tileInfo.Length, Size.X, Size.Y));
tileInfo[key] = LoadTileInfo(tileSet, node.Value); tileInfo[key] = LoadTileInfo(tileSet, node.Value);
} }