From 5609c8d04159121133e8258eef899651f3af1c5c Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 17 Jul 2011 19:06:14 +1200 Subject: [PATCH] drop format2 support from CursorSheetBuilder --- OpenRA.Game/Graphics/CursorSheetBuilder.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/OpenRA.Game/Graphics/CursorSheetBuilder.cs b/OpenRA.Game/Graphics/CursorSheetBuilder.cs index 2219606c30..ff60b6eda2 100644 --- a/OpenRA.Game/Graphics/CursorSheetBuilder.cs +++ b/OpenRA.Game/Graphics/CursorSheetBuilder.cs @@ -28,16 +28,8 @@ namespace OpenRA.Graphics Sprite[] LoadCursors(string filename) { - try - { - var shp = new Dune2ShpReader(FileSystem.OpenWithExts(filename, exts)); - return shp.Select(a => modData.SheetBuilder.Add(a.Image, a.Size)).ToArray(); - } - catch (IndexOutOfRangeException) // This will occur when loading a custom (RA-format) .shp - { - var shp = new ShpReader(FileSystem.OpenWithExts(filename, exts)); - return shp.Select(a => modData.SheetBuilder.Add(a.Image, shp.Size)).ToArray(); - } + var shp = new ShpReader(FileSystem.OpenWithExts(filename, exts)); + return shp.Select(a => modData.SheetBuilder.Add(a.Image, shp.Size)).ToArray(); } public Sprite[] LoadAllSprites(string filename) { return cursors[filename]; }