From bfd50b97e265617dad81ebb39ded69e6c415baf0 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 30 Nov 2013 10:13:44 +1300 Subject: [PATCH] Clean up ShpTSReader code. --- OpenRA.FileFormats/Graphics/ShpTSReader.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/OpenRA.FileFormats/Graphics/ShpTSReader.cs b/OpenRA.FileFormats/Graphics/ShpTSReader.cs index 2aaaf2ac7f..7fc4a463bf 100644 --- a/OpenRA.FileFormats/Graphics/ShpTSReader.cs +++ b/OpenRA.FileFormats/Graphics/ShpTSReader.cs @@ -44,9 +44,6 @@ namespace OpenRA.FileFormats public class ShpTSReader : ISpriteSource { - public readonly int ImageCount; - public readonly Size Size; - readonly List frames = new List(); public IEnumerable Frames { get { return frames.Cast(); } } @@ -55,13 +52,13 @@ namespace OpenRA.FileFormats stream.ReadUInt16(); var width = stream.ReadUInt16(); var height = stream.ReadUInt16(); - Size = new Size(width, height); - ImageCount = stream.ReadUInt16(); + var size = new Size(width, height); + var frameCount = stream.ReadUInt16(); - for (var i = 0; i < ImageCount; i++) - frames.Add(new FrameHeader(stream, Size)); + for (var i = 0; i < frameCount; i++) + frames.Add(new FrameHeader(stream, size)); - for (var i = 0; i < ImageCount; i++) + for (var i = 0; i < frameCount; i++) { var f = frames[i]; if (f.FileOffset == 0)