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

Clean up ShpTSReader code.

Browse Source
This commit is contained in:
Paul Chote
2013-11-30 10:13:44 +13:00
parent 3f2be59056
commit bfd50b97e2
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.FileFormats/Graphics/ShpTSReader.cs
View File

@@ -44,9 +44,6 @@ namespace OpenRA.FileFormats
public class ShpTSReader : ISpriteSource public class ShpTSReader : ISpriteSource
{ {
public readonly int ImageCount;
public readonly Size Size;
readonly List<FrameHeader> frames = new List<FrameHeader>(); readonly List<FrameHeader> frames = new List<FrameHeader>();
public IEnumerable<ISpriteFrame> Frames { get { return frames.Cast<ISpriteFrame>(); } } public IEnumerable<ISpriteFrame> Frames { get { return frames.Cast<ISpriteFrame>(); } }
@@ -55,13 +52,13 @@ namespace OpenRA.FileFormats
stream.ReadUInt16(); stream.ReadUInt16();
var width = stream.ReadUInt16(); var width = stream.ReadUInt16();
var height = stream.ReadUInt16(); var height = stream.ReadUInt16();
Size = new Size(width, height); var size = new Size(width, height);
ImageCount = stream.ReadUInt16(); var frameCount = stream.ReadUInt16();
for (var i = 0; i < ImageCount; i++) for (var i = 0; i < frameCount; i++)
frames.Add(new FrameHeader(stream, Size)); frames.Add(new FrameHeader(stream, size));
for (var i = 0; i < ImageCount; i++) for (var i = 0; i < frameCount; i++)
{ {
var f = frames[i]; var f = frames[i];
if (f.FileOffset == 0) if (f.FileOffset == 0)