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

Merge pull request #3193 from Mailaender/shp-ts

Browse Source 
Added support for Tiberian Sun/Red Alert 2 SHP format
This commit is contained in:
Paul Chote
2013-05-14 22:29:16 -07:00
parent 942946f1b1 2d685ab07d
commit 3500f4b3e3
3 changed files with 631 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/Graphics/SpriteLoader.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System.IO;
using System.Linq;
using OpenRA.FileFormats;
@@ -28,8 +29,19 @@ namespace OpenRA.Graphics
Sprite[] LoadSprites(string filename)
{
var shp = new ShpReader(FileSystem.OpenWithExts(filename, exts));
return shp.Frames.Select(a => SheetBuilder.Add(a.Image, shp.Size)).ToArray();
BinaryReader reader = new BinaryReader(FileSystem.OpenWithExts(filename, exts));
var ImageCount = reader.ReadUInt16();
if (ImageCount == 0)
{
var shp = new ShpTSReader(FileSystem.OpenWithExts(filename, exts));
return shp.Select(a => Game.modData.SheetBuilder.Add(a.Image, shp.Size)).ToArray();
}
else
{
var shp = new ShpReader(FileSystem.OpenWithExts(filename, exts));
return shp.Frames.Select(a => SheetBuilder.Add(a.Image, shp.Size)).ToArray();
}
}
public Sprite[] LoadAllSprites(string filename) { return sprites[filename]; }