Specify valid filetypes in tilesets

This commit is contained in:
Paul Chote
2010-06-30 20:08:31 +12:00
parent 9ca9d9a47e
commit 202d1a38d5
9 changed files with 14 additions and 25 deletions

View File

@@ -61,7 +61,7 @@ namespace OpenRA.FileFormats
{
public readonly string Name;
public readonly string Id;
public readonly string TileSuffix;
public readonly string[] Extensions;
public readonly Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
public readonly Dictionary<ushort, Terrain> Tiles = new Dictionary<ushort, Terrain>();
public readonly Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
@@ -83,31 +83,19 @@ namespace OpenRA.FileFormats
// Templates
foreach (var tt in yaml["Templates"].Nodes)
{
// Info
var t = new TileTemplate(tt.Value.Nodes);
Templates.Add(t.Id, t);
// Artwork
using( Stream s = FileSystem.Open( t.Image + "." + TileSuffix ) )
{
if( !Tiles.ContainsKey( t.Id ) )
Tiles.Add( t.Id, new Terrain( s ) );
}
}
}
public void LoadTiles()
{
// Templates
foreach (var t in Templates)
{
// Artwork
using( Stream s = FileSystem.Open( t.Value.Image + "." + TileSuffix ) )
using( Stream s = FileSystem.OpenWithExts(t.Value.Image, Extensions) )
{
if( !Tiles.ContainsKey( t.Key ) )
Tiles.Add( t.Key, new Terrain( s ) );
}
}
}
public byte[] GetBytes(TileReference<ushort,byte> r)