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

#657 give a useful error message when a sequence references frames outside the range that actually exist

Browse Source
This commit is contained in:
Chris Forbes
2011-12-03 19:23:14 +13:00
parent 66c59add94
commit 2747fadd96
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Graphics/Sequence.cs
View File

@@ -8,9 +8,10 @@
*/ */
#endregion #endregion
using System;
using System.Xml; using System.Xml;
using OpenRA.FileFormats;
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.FileFormats;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
@@ -33,7 +34,7 @@ namespace OpenRA.Graphics
Name = name; Name = name;
var d = info.NodesDict; var d = info.NodesDict;
sprites = Game.modData.SpriteLoader.LoadAllSprites(string.IsNullOrEmpty(srcOverride) ? unit : srcOverride ); sprites = Game.modData.SpriteLoader.LoadAllSprites(srcOverride ?? unit);
start = int.Parse(d["Start"].Value); start = int.Parse(d["Start"].Value);
if (!d.ContainsKey("Length")) if (!d.ContainsKey("Length"))
@@ -53,6 +54,12 @@ namespace OpenRA.Graphics
tick = int.Parse(d["Tick"].Value); tick = int.Parse(d["Tick"].Value);
else else
tick = 40; tick = 40;
if (start < 0 || start + facings * length > sprites.Length)
throw new InvalidOperationException(
"{6}: Sequence {0}.{1} uses frames [{2}..{3}] of SHP `{4}`, but only 0..{5} actually exist"
.F(unit, name, start, start + facings * length - 1, srcOverride ?? unit, sprites.Length - 1,
info.Nodes[0].Location));
} }
public MiniYaml Save() public MiniYaml Save()