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

Merge pull request #7976 from pchote/subcell-crash

Browse Source 
Don’t crash when asking for the offset of an invalid subcell.
This commit is contained in:
Pavel Penev
2015-04-19 13:40:47 +03:00
parent 9df371b393 ab7706073b
commit 5676c55082
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Map/Map.cs
View File

@@ -190,7 +190,13 @@ namespace OpenRA
public Bitmap CustomPreview; public Bitmap CustomPreview;
public bool InvalidCustomRules { get; private set; } public bool InvalidCustomRules { get; private set; }
public WVec OffsetOfSubCell(SubCell subCell) { return SubCellOffsets[(int)subCell]; } public WVec OffsetOfSubCell(SubCell subCell)
{
if (subCell == SubCell.Invalid || subCell == SubCell.Any)
return WVec.Zero;
return SubCellOffsets[(int)subCell];
}
[FieldLoader.LoadUsing("LoadOptions")] public MapOptions Options; [FieldLoader.LoadUsing("LoadOptions")] public MapOptions Options;