From eaf15fa6b5ca32ba28ad46a9735b94fbe5b410c2 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Mon, 10 Oct 2011 17:35:52 +1300 Subject: [PATCH] tidy in TileSet --- OpenRA.Editor/Form1.cs | 1 - OpenRA.FileFormats/Map/TileSet.cs | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs index fad9273b35..978f2ad3e6 100755 --- a/OpenRA.Editor/Form1.cs +++ b/OpenRA.Editor/Form1.cs @@ -114,7 +114,6 @@ namespace OpenRA.Editor tileset.LoadTiles(); var palette = new Palette(FileSystem.Open(tileset.Palette), true); - surface1.Bind(map, tileset, palette); // construct the palette of tiles var palettes = new[] { tilePalette, actorPalette, resourcePalette }; diff --git a/OpenRA.FileFormats/Map/TileSet.cs b/OpenRA.FileFormats/Map/TileSet.cs index e2f30a69cd..ad8e2f5491 100644 --- a/OpenRA.FileFormats/Map/TileSet.cs +++ b/OpenRA.FileFormats/Map/TileSet.cs @@ -25,6 +25,7 @@ namespace OpenRA.FileFormats public TerrainTypeInfo() {} public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); } + public MiniYaml Save() { return FieldSaver.Save(this); } } @@ -39,10 +40,7 @@ namespace OpenRA.FileFormats public Dictionary Tiles = new Dictionary(); public TileTemplate() {} - public TileTemplate(MiniYaml my) - { - FieldLoader.Load( this, my ); - } + public TileTemplate(MiniYaml my) { FieldLoader.Load( this, my ); } static object LoadTiles( MiniYaml y ) { @@ -78,9 +76,11 @@ namespace OpenRA.FileFormats public Dictionary Terrain = new Dictionary(); public Dictionary Tiles = new Dictionary(); public Dictionary Templates = new Dictionary(); - static List fields = new List() {"Name", "TileSize", "Id", "Palette", "Extensions"}; + + static readonly string[] fields = {"Name", "TileSize", "Id", "Palette", "Extensions"}; public TileSet() {} + public TileSet( string filepath ) { var yaml = MiniYaml.DictFromFile( filepath );