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

Fixed incorrect sequence frame amount checks using Stride.

Browse Source
This commit is contained in:
Andre Mohren
2019-07-12 19:30:59 +02:00
committed by reaperrr
parent c30bb28210
commit 7f7341a369
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
View File

@@ -204,16 +204,16 @@ namespace OpenRA.Mods.Common.Graphics
"{0}: Sequence {1}.{2}: Length must be <= Frames.Length" "{0}: Sequence {1}.{2}: Length must be <= Frames.Length"
.F(info.Nodes[0].Location, sequence, animation)); .F(info.Nodes[0].Location, sequence, animation));
if (Start < 0 || Start + Facings * Stride > frameCount) if (Start < 0 || Start + (Facings - 1) * Stride + Length > frameCount)
throw new InvalidOperationException( throw new InvalidOperationException(
"{5}: Sequence {0}.{1} uses frames [{2}..{3}], but only 0..{4} actually exist" "{5}: Sequence {0}.{1} uses frames [{2}..{3}], but only 0..{4} actually exist"
.F(sequence, animation, Start, Start + Facings * Stride - 1, frameCount - 1, .F(sequence, animation, Start, Start + (Facings - 1) * Stride + Length - 1, frameCount - 1,
info.Nodes[0].Location)); info.Nodes[0].Location));
if (ShadowStart + Facings * Stride > frameCount) if (ShadowStart + (Facings - 1) * Stride + Length > frameCount)
throw new InvalidOperationException( throw new InvalidOperationException(
"{5}: Sequence {0}.{1}'s shadow frames use frames [{2}..{3}], but only [0..{4}] actually exist" "{5}: Sequence {0}.{1}'s shadow frames use frames [{2}..{3}], but only [0..{4}] actually exist"
.F(sequence, animation, ShadowStart, ShadowStart + Facings * Stride - 1, frameCount - 1, .F(sequence, animation, ShadowStart, ShadowStart + (Facings - 1) * Stride + Length - 1, frameCount - 1,
info.Nodes[0].Location)); info.Nodes[0].Location));
var usedFrames = new List<int>(); var usedFrames = new List<int>();