Standardise Theater -> Tileset.

This commit is contained in:
Paul Chote
2010-11-24 10:09:51 +13:00
parent 8b0255e2f7
commit 00dc91cf49
17 changed files with 44 additions and 45 deletions

View File

@@ -94,7 +94,7 @@ namespace OpenRA.Editor
void PrepareMapResources(Manifest manifest, Map map)
{
Rules.LoadRules(manifest, map);
tileset = Rules.TileSets[map.Theater];
tileset = Rules.TileSets[map.Tileset];
tileset.LoadTiles();
var palette = new Palette(FileSystem.Open(tileset.Palette), true);

View File

@@ -256,7 +256,7 @@
this.lblTheater.Name = "lblTheater";
this.lblTheater.Size = new System.Drawing.Size(47, 13);
this.lblTheater.TabIndex = 11;
this.lblTheater.Text = "Theater:";
this.lblTheater.Text = "Tileset:";
//
// txtAuthor
//

View File

@@ -42,7 +42,7 @@ namespace OpenRA.Editor
var map = new Map(new Folder(Path.Combine(MapFolderPath, MapList.SelectedItems[0].Text), 0));
txtTitle.Text = map.Title;
txtAuthor.Text = map.Author;
txtTheater.Text = map.Theater;
txtTheater.Text = map.Tileset;
txtDesc.Text = map.Description;
pbMinimap.Image = null;
try

View File

@@ -221,7 +221,7 @@
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(44, 13);
this.label4.TabIndex = 14;
this.label4.Text = "Theater";
this.label4.Text = "Tileset";
//
// theater
//

View File

@@ -97,9 +97,9 @@ namespace OpenRA.Editor
{
var ri = info.Traits.Get<RenderSimpleInfo>();
string image = null;
if (ri.OverrideTheater != null)
for (int i = 0; i < ri.OverrideTheater.Length; i++)
if (ri.OverrideTheater[i] == tileset.Id)
if (ri.OverrideTileset != null)
for (int i = 0; i < ri.OverrideTileset.Length; i++)
if (ri.OverrideTileset[i] == tileset.Id)
image = ri.OverrideImage[i];
image = image ?? ri.Image ?? info.Name;