Retain old deb package naming to avoid breaking the website

.gitignore

@@ -50,3 +50,8 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
 OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 *.config
 *.resources
+
+# other crap
+Logs/
+Replays/
+settings.yaml

AUTHORS

@@ -9,3 +9,5 @@ The OpenRA developers are:
 	* Joakim Lindberg
 	* Andrew Riedi
 	* Tim Mylemans
+	* Curtis Shmyr
+	* Caleb Anderson

CHANGELOG

@@ -1,10 +1,48 @@
-Changes as of adb2ab5ec0aebfe676030223e4badd773f43a670
+NEW:
+	Engine:
+		Fix hotkeys firing on both key down and key up
+		Allow C4 delay to be configurable
+		Text field support for home and end keys
+		Fix world actor being owned by Creeps player (causing Neutral to be hostile) on new maps
+		Include gpu vendor string in graphics.log for unsupported cards
+		Fix crash with some aud files
+		Fix a rare crash when a repairing building is killed
+		Improvements to HackyAI
+		Generalize capture logic to work for any actor types
+		Support RA2-style missile trails
+		Fix helicopters failing to attack targets in some situations
+		Fix 'exploit detected' when using hotkeys on another players units
+		Relinquish spawn point in the game lobby when entering a spectator slot
+		Fix maps with >8 spawnpoints in the game lobby
+		Yaml loader crashes correctly when trying to inherit from a nonexistant actor
+		Yaml loader crashes correctly when trying to remove a nonexistant trait
+		Many other general engine improvements
+		
+	C&C:
+		Fix Viceroid target-scan radius
+		Fix map-placed SAM-sites not being able to attack
+		Commando voice clip when built
+		Commando voice clip after kills
+		Capturable/repairable unit husks with an engineer
+	
+	RA:
+		Fix several bugs related to GPS
+		New unit: Supply truck for donating funds to another player
+		Pilots (sometimes) parachute from shot down planes
+		Bounties on killed units
+		Use RA2 style missile trails
+		New map: Pressure by seru
+		
+	Packaging:
+		Fix several Utility crashes
+		Utility writes a log to support dir when crashing
+		Fix incorrect ownership of files in deb package
+
+20110320
 	Engine:
 		Display range circles when placing defenses
 		Support a hostile creeps player for viceroids / dinosaurs / ants / etc
 		General refactoring and performance fixes
-		Fix crashes caused by blank game title / direct connect server textfields
-		Fix GPS behavior when alliances change.
 		Stop/Scatter/Deploy orders give audio feedback
 		"Allow cheats" option moved into the game lobby, visible to all players
 		"Build anywhere" developer mode option
@@ -30,6 +68,16 @@ Changes as of adb2ab5ec0aebfe676030223e4badd773f43a670
 		Fix crash when spawning map actors owned by a nonexisting player
 		Fix crash when changing mod while playing music
 		Fix crash with perf graph
+		Fix crash in replay viewer if replays directory doesn't exist
+		Fix crash when selling civilian buildings
+		Fix crashes caused by blank game title / direct connect server textfields
+		Oil derricks, harvester unloading, selling structures shows cash indicator
+		Prerequisites system refactoring to allow non-building prerequisites
+		Fix shift+tab not cycling the build tabs
+		Fix bogus keyboard input in text fields
+		Don't change mods if the same one is selected in the dropdown
+		Support for remapping the control group addition modifier (ctrl) to any modifier key
+		Fix helicopters flying 1 cell off the right or bottom of the map
 
 	C&C:
 		Viceroids! Infantry killed by tiberium or chem warriors may turn into viceroids
@@ -43,6 +91,8 @@ Changes as of adb2ab5ec0aebfe676030223e4badd773f43a670
 		Fix a rare crash with stealth tank
 		New Map: East vs West 3 by pchote
 		Removed Maps: Wargames, Yellowstone II
+		Oil Derricks have a small sight range
+		Apaches have a muzzleflash
 	
 	RA:
 		Service depots repair units faster
@@ -68,6 +118,10 @@ Changes as of adb2ab5ec0aebfe676030223e4badd773f43a670
 		Spys are ignored by enemy units when disguised, tooltips show as disguised unit
 		Fix crates being paradropped inside trees, buildings
 		Production hotkey for flame turret changed to t, tesla coil to u
+		Disguised spys now appear correctly on radar and tooltips
+		Fix GPS behavior when alliances change.
+		Aircraft now fly to a target location and circle instead of returning to base
+		Aircraft no longer fly off the map if their Airfield is destroyed
 
 	Editor:
 		New map format (version 5). Maps < Version 4 are no longer supported by the editor or game.
@@ -79,6 +133,7 @@ Changes as of adb2ab5ec0aebfe676030223e4badd773f43a670
 		Default player colours has been returned to neutral grey.
 		Maps can be loaded from the commandline
 		Option to show actor names
+		Support for veteran / elite actors to be defined in the map yaml
 	
 	Packaging:
 		Rename .deb package to use debian naming conventions
@@ -131,7 +186,6 @@ Changes as of adb2ab5ec0aebfe676030223e4badd773f43a670
 		Fixed paradrop flare, spyplane from capturing KOTH points
 		New Map: Nuclear Winter (nudalz)
 		New Map: Seaside (nudalz)
-		
 	Editor:
 		Ability to switch mods after launch
 		Refactor hardcoded tools into a generic interface

FileExtractor/FileExtractor.cs

@@ -1,5 +1,15 @@
-using System;
-using System.IO;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
 using OpenRA.FileFormats;
 
 namespace FileExtractor
@@ -17,7 +27,7 @@ namespace FileExtractor
 			}
 
 			var mods = args[0].Split(',');
-			var manifest = new Manifest(mods);
+			var manifest = new Manifest(mods);
 			FileSystem.LoadFromManifest( manifest );
 			
 			try

FileExtractor/Main.cs

@@ -1,3 +1,13 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
 using System;
 
 namespace FileExtractor

Makefile

@@ -5,9 +5,9 @@ COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll third
 PHONY		= core tools package all mods clean distclean
 
 .SUFFIXES:
-core: game renderers mod_ra mod_cnc
-tools: editor ralint seqed filex tsbuild utility
-package: fixheader core editor utility
+core: game renderers mod_ra mod_cnc utility
+tools: editor ralint seqed filex tsbuild
+package: fixheader core editor
 mods: mod_ra mod_cnc
 all: core tools
 clean: 
@@ -180,6 +180,7 @@ $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
 		$$($(1)_EXTRA) \
 		$$($(1)_SRCS)
 	@test -e fixheader.exe && mono fixheader.exe $$(@) || ``
+	@test `echo $$(@) | sed 's/^.*\.//'` = "dll" && chmod a-x $$(@) || ``
 endef
 
 $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))

OpenRA.Editor/ErrorListDialog.Designer.cs

@@ -1,90 +1,100 @@
-namespace OpenRA.Editor
-{
-	partial class ErrorListDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.label1 = new System.Windows.Forms.Label();
-			this.listBox1 = new System.Windows.Forms.ListBox();
-			this.button1 = new System.Windows.Forms.Button();
-			this.SuspendLayout();
-			// 
-			// label1
-			// 
-			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.label1.Location = new System.Drawing.Point(10, 9);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(610, 23);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Your map import completed, but with errors:";
-			// 
-			// listBox1
-			// 
-			this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.listBox1.FormattingEnabled = true;
-			this.listBox1.Location = new System.Drawing.Point(13, 30);
-			this.listBox1.Name = "listBox1";
-			this.listBox1.Size = new System.Drawing.Size(607, 316);
-			this.listBox1.TabIndex = 1;
-			// 
-			// button1
-			// 
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(545, 359);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Close";
-			this.button1.UseVisualStyleBackColor = true;
-			// 
-			// ErrorListDialog
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(632, 394);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.listBox1);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ErrorListDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Import Errors";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.ListBox listBox1;
-		private System.Windows.Forms.Button button1;
-	}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+namespace OpenRA.Editor
+{
+	partial class ErrorListDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.label1 = new System.Windows.Forms.Label();
+			this.listBox1 = new System.Windows.Forms.ListBox();
+			this.button1 = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.label1.Location = new System.Drawing.Point(10, 9);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(610, 23);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "Your map import completed, but with errors:";
+			// 
+			// listBox1
+			// 
+			this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.listBox1.FormattingEnabled = true;
+			this.listBox1.Location = new System.Drawing.Point(13, 30);
+			this.listBox1.Name = "listBox1";
+			this.listBox1.Size = new System.Drawing.Size(607, 316);
+			this.listBox1.TabIndex = 1;
+			// 
+			// button1
+			// 
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(545, 359);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 2;
+			this.button1.Text = "Close";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// ErrorListDialog
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(632, 394);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.listBox1);
+			this.Controls.Add(this.label1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "ErrorListDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Map Import Errors";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ListBox listBox1;
+		private System.Windows.Forms.Button button1;
+	}
 }

OpenRA.Editor/ErrorListDialog.cs

@@ -1,25 +1,25 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made 
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
  * see COPYING.
- */
+ */
 #endregion
-
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class ErrorListDialog : Form
-	{
-		public ErrorListDialog( IEnumerable<string> errors )
-		{
-			InitializeComponent();
-			foreach (var e in errors)
-				listBox1.Items.Add(e);
-		}
-	}
-}
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class ErrorListDialog : Form
+	{
+		public ErrorListDialog( IEnumerable<string> errors )
+		{
+			InitializeComponent();
+			foreach (var e in errors)
+				listBox1.Items.Add(e);
+		}
+	}
+}

OpenRA.Editor/Form1.cs

@@ -87,8 +87,13 @@ namespace OpenRA.Editor
 			// upgrade maps that have no player definitions. editor doesnt care,
 			// but this breaks the game pretty badly.
 			if (map.Players.Count == 0)
-				map.Players.Add("Neutral", new PlayerReference("Neutral",
-						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+				map.Players.Add("Neutral", new PlayerReference
+				{
+					Name = "Neutral",
+					Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
+					OwnsWorld = true,
+					NonCombatant = true
+				});
 
 			PrepareMapResources(Game.modData.Manifest, map);
 
@@ -321,8 +326,22 @@ namespace OpenRA.Editor
 					map.Resize((int)nmd.width.Value, (int)nmd.height.Value);
 					map.ResizeCordon((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value,
 						(int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
-					map.Players.Add("Neutral", new PlayerReference("Neutral", Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
-					map.Players.Add("Creeps", new PlayerReference("Creeps", Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+					
+					map.Players.Add("Neutral", new PlayerReference
+					{
+						Name = "Neutral",
+						Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
+						OwnsWorld = true,
+						NonCombatant = true
+					});
+					
+					map.Players.Add("Creeps", new PlayerReference
+					{
+						Name = "Creeps",
+						Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
+						NonCombatant = true
+					});
+
 					NewMap(map);
 				}
 			}
@@ -367,23 +386,32 @@ namespace OpenRA.Editor
 					 * but something's not right internally in it, unless loaded via the real maploader */
 
 					var savePath = Path.Combine(Path.GetTempPath(), "OpenRA.Import");
-					Directory.CreateDirectory(savePath);
-
-					var errors = new List<string>();
-
-					var map = LegacyMapImporter.Import(ofd.FileName, a => errors.Add(a));
-
-					if (errors.Count > 0)
-						using (var eld = new ErrorListDialog(errors))
-							eld.ShowDialog();
+					Directory.CreateDirectory(savePath);
 
+					var errors = new List<string>();
+
+					var map = LegacyMapImporter.Import(ofd.FileName, a => errors.Add(a));
+
+					if (errors.Count > 0)
+						using (var eld = new ErrorListDialog(errors))
+							eld.ShowDialog();
+				
 					if (!map.Players.ContainsKey("Neutral"))
-						map.Players.Add("Neutral", new PlayerReference("Neutral",
-							Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
-					
-					map.Players.Add("Creeps", new PlayerReference("Creeps",
-						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+						map.Players.Add("Neutral", new PlayerReference
+						{
+							Name = "Neutral",
+							Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
+							OwnsWorld = true,
+							NonCombatant = true
+						});
 					
+					map.Players.Add("Creeps", new PlayerReference
+					{
+						Name = "Creeps",
+						Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
+						NonCombatant = true
+					});
+				
 					map.Save(savePath);
 					LoadMap(savePath);
 					loadedMapName = null;	/* editor needs to think this hasnt been saved */
@@ -413,12 +441,12 @@ namespace OpenRA.Editor
 
 			if (DialogResult.OK == saveFileDialog.ShowDialog())
 				pmMiniMap.Image.Save(saveFileDialog.FileName);
-		}
-
-		void ShowActorNamesClicked(object sender, EventArgs e)
-		{
-			showActorNamesToolStripMenuItem.Checked ^= true;
-			surface1.ShowActorNames = showActorNamesToolStripMenuItem.Checked;
+		}
+
+		void ShowActorNamesClicked(object sender, EventArgs e)
+		{
+			showActorNamesToolStripMenuItem.Checked ^= true;
+			surface1.ShowActorNames = showActorNamesToolStripMenuItem.Checked;
 		}
 	}
 }

OpenRA.Editor/LegacyMapImporter.cs

@@ -100,17 +100,17 @@ namespace OpenRA.Editor
 		int MapSize;
 		int ActorCount = 0;
 		Map Map = new Map();
-		List<string> Players = new List<string>();
+		List<string> Players = new List<string>();
 		Action<string> errorHandler;
 		
 		LegacyMapImporter(string filename, Action<string> errorHandler)
-		{
+		{
 			this.errorHandler = errorHandler;
 			ConvertIniMap(filename);
 		}
 
 		public static Map Import(string filename, Action<string> errorHandler)
-		{
+		{
 			var converter = new LegacyMapImporter(filename, errorHandler);
 			return converter.Map;
 		}
@@ -364,45 +364,45 @@ namespace OpenRA.Editor
 			{
 				//Structures: num=owner,type,health,location,turret-facing,trigger
 				//Units: num=owner,type,health,location,facing,action,trigger
-				//Infantry: num=owner,type,health,location,subcell,action,facing,trigger
-
-				try
-				{
-
-					var parts = s.Value.Split(',');
-					var loc = int.Parse(parts[3]);
-					if (parts[0] == "")
-						parts[0] = "Neutral";
-
-
-					if (!Players.Contains(parts[0]))
-						Players.Add(parts[0]);
-
-					var stance = ActorStance.Stance.None;
-					switch (parts[5])
-					{
-						case "Area Guard":
-						case "Guard":
-							stance = ActorStance.Stance.Guard;
-							break;
-						case "Defend Base":
-							stance = ActorStance.Stance.Defend;
-							break;
-						case "Hunt":
-						case "Rampage":
-						case "Attack Base":
-						case "Attack Units":
-						case "Attack Civil.":
-						case "Attack Tarcom":
-							stance = ActorStance.Stance.Hunt;
-							break;
-						case "Retreat":
-						case "Return":
-							stance = ActorStance.Stance.Retreat;
-							break;
-						// do we care about `Harvest' and `Sticky'?
-					}
-
+				//Infantry: num=owner,type,health,location,subcell,action,facing,trigger
+
+				try
+				{
+
+					var parts = s.Value.Split(',');
+					var loc = int.Parse(parts[3]);
+					if (parts[0] == "")
+						parts[0] = "Neutral";
+
+
+					if (!Players.Contains(parts[0]))
+						Players.Add(parts[0]);
+
+					var stance = ActorStance.Stance.None;
+					switch (parts[5])
+					{
+						case "Area Guard":
+						case "Guard":
+							stance = ActorStance.Stance.Guard;
+							break;
+						case "Defend Base":
+							stance = ActorStance.Stance.Defend;
+							break;
+						case "Hunt":
+						case "Rampage":
+						case "Attack Base":
+						case "Attack Units":
+						case "Attack Civil.":
+						case "Attack Tarcom":
+							stance = ActorStance.Stance.Hunt;
+							break;
+						case "Retreat":
+						case "Return":
+							stance = ActorStance.Stance.Retreat;
+							break;
+						// do we care about `Harvest' and `Sticky'?
+					}
+
 					var actor = new ActorReference(parts[1].ToLowerInvariant())
 					{
 						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
@@ -410,19 +410,19 @@ namespace OpenRA.Editor
 						new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo)/256),
 						new FacingInit((section == "INFANTRY") ? int.Parse(parts[6]) : int.Parse(parts[4])),
 						new ActorStanceInit(stance),
-					};
-
-					if (section == "INFANTRY")
-						actor.Add(new SubCellInit(int.Parse(parts[4])));
-
-					if (!Rules.Info.ContainsKey(parts[1].ToLowerInvariant()))
-						errorHandler("Ignoring unknown actor type: `{0}`".F(parts[1].ToLowerInvariant()));
-					else
-						Map.Actors.Value.Add("Actor" + ActorCount++, actor);
-				}
-				catch (Exception)
-				{
-					errorHandler("Malformed actor definition: `{0}`".F(s));
+					};
+
+					if (section == "INFANTRY")
+						actor.Add(new SubCellInit(int.Parse(parts[4])));
+
+					if (!Rules.Info.ContainsKey(parts[1].ToLowerInvariant()))
+						errorHandler("Ignoring unknown actor type: `{0}`".F(parts[1].ToLowerInvariant()));
+					else
+						Map.Actors.Value.Add("Actor" + ActorCount++, actor);
+				}
+				catch (Exception)
+				{
+					errorHandler("Malformed actor definition: `{0}`".F(s));
 				}
 			}
 		}

OpenRA.Editor/MapSelect.Designer.cs

@@ -1,375 +1,385 @@
-namespace OpenRA.Editor
-{
-    partial class MapSelect
-    {
-        /// <summary>
-        /// TODO
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// TODO
-        /// </summary>
-        /// <param name="disposing">TODO</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Код, автоматически созданный конструктором форм Windows
-
-        /// <summary>
-        /// TODO
-        /// </summary>
-        private void InitializeComponent()
-        {
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
-			this.MapList = new System.Windows.Forms.ListView();
-			this.colMapName = new System.Windows.Forms.ColumnHeader("(отсутствует)");
-			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.btnOk = new System.Windows.Forms.Button();
-			this.lblNew = new System.Windows.Forms.Label();
-			this.txtNew = new System.Windows.Forms.TextBox();
-			this.pbMinimap = new System.Windows.Forms.PictureBox();
-			this.pnlBottom = new System.Windows.Forms.Panel();
-			this.txtPathOut = new System.Windows.Forms.TextBox();
-			this.lblPathOut = new System.Windows.Forms.Label();
-			this.lblPath = new System.Windows.Forms.Label();
-			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-			this.lblMapList = new System.Windows.Forms.Label();
-			this.txtDesc = new System.Windows.Forms.TextBox();
-			this.lblDesc = new System.Windows.Forms.Label();
-			this.txtTheater = new System.Windows.Forms.TextBox();
-			this.lblTheater = new System.Windows.Forms.Label();
-			this.txtAuthor = new System.Windows.Forms.TextBox();
-			this.lblAuthor = new System.Windows.Forms.Label();
-			this.txtTitle = new System.Windows.Forms.TextBox();
-			this.lblMapName = new System.Windows.Forms.Label();
-			this.lblMinimap = new System.Windows.Forms.Label();
-			this.pictureBox1 = new System.Windows.Forms.PictureBox();
-			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit();
-			this.pnlBottom.SuspendLayout();
-			this.splitContainer1.Panel1.SuspendLayout();
-			this.splitContainer1.Panel2.SuspendLayout();
-			this.splitContainer1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// MapList
-			// 
-			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.colMapName});
-			this.MapList.FullRowSelect = true;
-			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-			this.MapList.LargeImageList = this.MapIconsList;
-			this.MapList.Location = new System.Drawing.Point(15, 25);
-			this.MapList.MultiSelect = false;
-			this.MapList.Name = "MapList";
-			this.MapList.Size = new System.Drawing.Size(273, 294);
-			this.MapList.SmallImageList = this.MapIconsList;
-			this.MapList.StateImageList = this.MapIconsList;
-			this.MapList.TabIndex = 0;
-			this.MapList.UseCompatibleStateImageBehavior = false;
-			this.MapList.View = System.Windows.Forms.View.Details;
-			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
-			// 
-			// colMapName
-			// 
-			this.colMapName.Text = "Map name";
-			this.colMapName.Width = 240;
-			// 
-			// MapIconsList
-			// 
-			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
-			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
-			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(407, 35);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(75, 23);
-			this.btnCancel.TabIndex = 3;
-			this.btnCancel.Text = "Cancel";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			// 
-			// btnOk
-			// 
-			this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.btnOk.Location = new System.Drawing.Point(326, 35);
-			this.btnOk.Name = "btnOk";
-			this.btnOk.Size = new System.Drawing.Size(75, 23);
-			this.btnOk.TabIndex = 2;
-			this.btnOk.Text = "Open";
-			this.btnOk.UseVisualStyleBackColor = true;
-			// 
-			// lblNew
-			// 
-			this.lblNew.AutoSize = true;
-			this.lblNew.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-			this.lblNew.Location = new System.Drawing.Point(12, 40);
-			this.lblNew.Name = "lblNew";
-			this.lblNew.Size = new System.Drawing.Size(69, 13);
-			this.lblNew.TabIndex = 3;
-			this.lblNew.Text = "Map name:";
-			// 
-			// txtNew
-			// 
-			this.txtNew.BackColor = System.Drawing.SystemColors.Window;
-			this.txtNew.Location = new System.Drawing.Point(88, 37);
-			this.txtNew.Name = "txtNew";
-			this.txtNew.ReadOnly = true;
-			this.txtNew.Size = new System.Drawing.Size(232, 20);
-			this.txtNew.TabIndex = 1;
-			// 
-			// pbMinimap
-			// 
-			this.pbMinimap.BackColor = System.Drawing.Color.Black;
-			this.pbMinimap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-			this.pbMinimap.Location = new System.Drawing.Point(32, 25);
-			this.pbMinimap.Name = "pbMinimap";
-			this.pbMinimap.Size = new System.Drawing.Size(124, 124);
-			this.pbMinimap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-			this.pbMinimap.TabIndex = 5;
-			this.pbMinimap.TabStop = false;
-			// 
-			// pnlBottom
-			// 
-			this.pnlBottom.Controls.Add(this.pictureBox1);
-			this.pnlBottom.Controls.Add(this.txtPathOut);
-			this.pnlBottom.Controls.Add(this.lblPathOut);
-			this.pnlBottom.Controls.Add(this.lblPath);
-			this.pnlBottom.Controls.Add(this.btnCancel);
-			this.pnlBottom.Controls.Add(this.btnOk);
-			this.pnlBottom.Controls.Add(this.txtNew);
-			this.pnlBottom.Controls.Add(this.lblNew);
-			this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.pnlBottom.Location = new System.Drawing.Point(0, 332);
-			this.pnlBottom.MaximumSize = new System.Drawing.Size(0, 70);
-			this.pnlBottom.Name = "pnlBottom";
-			this.pnlBottom.Size = new System.Drawing.Size(494, 70);
-			this.pnlBottom.TabIndex = 6;
-			// 
-			// txtPathOut
-			// 
-			this.txtPathOut.BackColor = System.Drawing.SystemColors.Window;
-			this.txtPathOut.Location = new System.Drawing.Point(55, 10);
-			this.txtPathOut.Name = "txtPathOut";
-			this.txtPathOut.ReadOnly = true;
-			this.txtPathOut.Size = new System.Drawing.Size(265, 20);
-			this.txtPathOut.TabIndex = 0;
-			this.txtPathOut.TextChanged += new System.EventHandler(this.txtPathOut_TextChanged);
-			// 
-			// lblPathOut
-			// 
-			this.lblPathOut.AutoSize = true;
-			this.lblPathOut.Location = new System.Drawing.Point(55, 13);
-			this.lblPathOut.Name = "lblPathOut";
-			this.lblPathOut.Size = new System.Drawing.Size(0, 13);
-			this.lblPathOut.TabIndex = 6;
-			// 
-			// lblPath
-			// 
-			this.lblPath.AutoSize = true;
-			this.lblPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-			this.lblPath.Location = new System.Drawing.Point(12, 13);
-			this.lblPath.Name = "lblPath";
-			this.lblPath.Size = new System.Drawing.Size(37, 13);
-			this.lblPath.TabIndex = 5;
-			this.lblPath.Text = "Path:";
-			// 
-			// splitContainer1
-			// 
-			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-			this.splitContainer1.Name = "splitContainer1";
-			// 
-			// splitContainer1.Panel1
-			// 
-			this.splitContainer1.Panel1.Controls.Add(this.lblMapList);
-			this.splitContainer1.Panel1.Controls.Add(this.MapList);
-			// 
-			// splitContainer1.Panel2
-			// 
-			this.splitContainer1.Panel2.Controls.Add(this.txtDesc);
-			this.splitContainer1.Panel2.Controls.Add(this.lblDesc);
-			this.splitContainer1.Panel2.Controls.Add(this.txtTheater);
-			this.splitContainer1.Panel2.Controls.Add(this.lblTheater);
-			this.splitContainer1.Panel2.Controls.Add(this.txtAuthor);
-			this.splitContainer1.Panel2.Controls.Add(this.lblAuthor);
-			this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
-			this.splitContainer1.Panel2.Controls.Add(this.lblMapName);
-			this.splitContainer1.Panel2.Controls.Add(this.lblMinimap);
-			this.splitContainer1.Panel2.Controls.Add(this.pbMinimap);
-			this.splitContainer1.Size = new System.Drawing.Size(494, 332);
-			this.splitContainer1.SplitterDistance = 300;
-			this.splitContainer1.TabIndex = 7;
-			// 
-			// lblMapList
-			// 
-			this.lblMapList.AutoSize = true;
-			this.lblMapList.Location = new System.Drawing.Point(12, 9);
-			this.lblMapList.Name = "lblMapList";
-			this.lblMapList.Size = new System.Drawing.Size(81, 13);
-			this.lblMapList.TabIndex = 1;
-			this.lblMapList.Text = "Available maps:";
-			// 
-			// txtDesc
-			// 
-			this.txtDesc.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.txtDesc.Location = new System.Drawing.Point(16, 289);
-			this.txtDesc.Name = "txtDesc";
-			this.txtDesc.ReadOnly = true;
-			this.txtDesc.Size = new System.Drawing.Size(162, 20);
-			this.txtDesc.TabIndex = 14;
-			// 
-			// lblDesc
-			// 
-			this.lblDesc.AutoSize = true;
-			this.lblDesc.Location = new System.Drawing.Point(13, 273);
-			this.lblDesc.Name = "lblDesc";
-			this.lblDesc.Size = new System.Drawing.Size(63, 13);
-			this.lblDesc.TabIndex = 13;
-			this.lblDesc.Text = "Description:";
-			// 
-			// txtTheater
-			// 
-			this.txtTheater.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.txtTheater.Location = new System.Drawing.Point(16, 252);
-			this.txtTheater.Name = "txtTheater";
-			this.txtTheater.ReadOnly = true;
-			this.txtTheater.Size = new System.Drawing.Size(162, 20);
-			this.txtTheater.TabIndex = 12;
-			// 
-			// lblTheater
-			// 
-			this.lblTheater.AutoSize = true;
-			this.lblTheater.Location = new System.Drawing.Point(13, 236);
-			this.lblTheater.Name = "lblTheater";
-			this.lblTheater.Size = new System.Drawing.Size(47, 13);
-			this.lblTheater.TabIndex = 11;
-			this.lblTheater.Text = "Tileset:";
-			// 
-			// txtAuthor
-			// 
-			this.txtAuthor.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.txtAuthor.Location = new System.Drawing.Point(16, 214);
-			this.txtAuthor.Name = "txtAuthor";
-			this.txtAuthor.ReadOnly = true;
-			this.txtAuthor.Size = new System.Drawing.Size(162, 20);
-			this.txtAuthor.TabIndex = 10;
-			// 
-			// lblAuthor
-			// 
-			this.lblAuthor.AutoSize = true;
-			this.lblAuthor.Location = new System.Drawing.Point(13, 198);
-			this.lblAuthor.Name = "lblAuthor";
-			this.lblAuthor.Size = new System.Drawing.Size(41, 13);
-			this.lblAuthor.TabIndex = 9;
-			this.lblAuthor.Text = "Author:";
-			// 
-			// txtTitle
-			// 
-			this.txtTitle.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.txtTitle.Location = new System.Drawing.Point(16, 177);
-			this.txtTitle.Name = "txtTitle";
-			this.txtTitle.ReadOnly = true;
-			this.txtTitle.Size = new System.Drawing.Size(162, 20);
-			this.txtTitle.TabIndex = 8;
-			// 
-			// lblMapName
-			// 
-			this.lblMapName.AutoSize = true;
-			this.lblMapName.Location = new System.Drawing.Point(13, 161);
-			this.lblMapName.Name = "lblMapName";
-			this.lblMapName.Size = new System.Drawing.Size(30, 13);
-			this.lblMapName.TabIndex = 7;
-			this.lblMapName.Text = "Title:";
-			// 
-			// lblMinimap
-			// 
-			this.lblMinimap.AutoSize = true;
-			this.lblMinimap.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-			this.lblMinimap.Location = new System.Drawing.Point(29, 9);
-			this.lblMinimap.Name = "lblMinimap";
-			this.lblMinimap.Size = new System.Drawing.Size(71, 13);
-			this.lblMinimap.TabIndex = 6;
-			this.lblMinimap.Text = "Map preview:";
-			// 
-			// pictureBox1
-			// 
-			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
-			this.pictureBox1.Name = "pictureBox1";
-			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
-			this.pictureBox1.TabIndex = 7;
-			this.pictureBox1.TabStop = false;
-			this.pictureBox1.Visible = false;
-			// 
-			// MapSelect
-			// 
-			this.AcceptButton = this.btnOk;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.btnCancel;
-			this.ClientSize = new System.Drawing.Size(494, 402);
-			this.Controls.Add(this.splitContainer1);
-			this.Controls.Add(this.pnlBottom);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "MapSelect";
-			this.ShowIcon = false;
-			this.ShowInTaskbar = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Select map";
-			this.Load += new System.EventHandler(this.MapSelect_Load);
-			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).EndInit();
-			this.pnlBottom.ResumeLayout(false);
-			this.pnlBottom.PerformLayout();
-			this.splitContainer1.Panel1.ResumeLayout(false);
-			this.splitContainer1.Panel1.PerformLayout();
-			this.splitContainer1.Panel2.ResumeLayout(false);
-			this.splitContainer1.Panel2.PerformLayout();
-			this.splitContainer1.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-			this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        public System.Windows.Forms.ListView MapList;
-        public System.Windows.Forms.Button btnCancel;
-        public System.Windows.Forms.Button btnOk;
-        public System.Windows.Forms.Label lblNew;
-        public System.Windows.Forms.TextBox txtNew;
-        public System.Windows.Forms.ColumnHeader colMapName;
-        public System.Windows.Forms.ImageList MapIconsList;
-        public System.Windows.Forms.PictureBox pbMinimap;
-        public System.Windows.Forms.Panel pnlBottom;
-        public System.Windows.Forms.SplitContainer splitContainer1;
-        public System.Windows.Forms.Label lblMinimap;
-        public System.Windows.Forms.TextBox txtTheater;
-        public System.Windows.Forms.Label lblTheater;
-        public System.Windows.Forms.TextBox txtAuthor;
-        public System.Windows.Forms.Label lblAuthor;
-        public System.Windows.Forms.TextBox txtTitle;
-        public System.Windows.Forms.Label lblMapName;
-        public System.Windows.Forms.TextBox txtDesc;
-        public System.Windows.Forms.Label lblDesc;
-        public System.Windows.Forms.Label lblMapList;
-        public System.Windows.Forms.Label lblPathOut;
-        public System.Windows.Forms.Label lblPath;
-        public System.Windows.Forms.TextBox txtPathOut;
-		private System.Windows.Forms.PictureBox pictureBox1;
-    }
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+namespace OpenRA.Editor
+{
+    partial class MapSelect
+    {
+        /// <summary>
+        /// TODO
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        /// <param name="disposing">TODO</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Код, автоматически созданный конструктором форм Windows
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        private void InitializeComponent()
+        {
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
+			this.MapList = new System.Windows.Forms.ListView();
+			this.colMapName = new System.Windows.Forms.ColumnHeader("(отсутствует)");
+			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.btnOk = new System.Windows.Forms.Button();
+			this.lblNew = new System.Windows.Forms.Label();
+			this.txtNew = new System.Windows.Forms.TextBox();
+			this.pbMinimap = new System.Windows.Forms.PictureBox();
+			this.pnlBottom = new System.Windows.Forms.Panel();
+			this.txtPathOut = new System.Windows.Forms.TextBox();
+			this.lblPathOut = new System.Windows.Forms.Label();
+			this.lblPath = new System.Windows.Forms.Label();
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.lblMapList = new System.Windows.Forms.Label();
+			this.txtDesc = new System.Windows.Forms.TextBox();
+			this.lblDesc = new System.Windows.Forms.Label();
+			this.txtTheater = new System.Windows.Forms.TextBox();
+			this.lblTheater = new System.Windows.Forms.Label();
+			this.txtAuthor = new System.Windows.Forms.TextBox();
+			this.lblAuthor = new System.Windows.Forms.Label();
+			this.txtTitle = new System.Windows.Forms.TextBox();
+			this.lblMapName = new System.Windows.Forms.Label();
+			this.lblMinimap = new System.Windows.Forms.Label();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit();
+			this.pnlBottom.SuspendLayout();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// MapList
+			// 
+			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colMapName});
+			this.MapList.FullRowSelect = true;
+			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.MapList.LargeImageList = this.MapIconsList;
+			this.MapList.Location = new System.Drawing.Point(15, 25);
+			this.MapList.MultiSelect = false;
+			this.MapList.Name = "MapList";
+			this.MapList.Size = new System.Drawing.Size(273, 294);
+			this.MapList.SmallImageList = this.MapIconsList;
+			this.MapList.StateImageList = this.MapIconsList;
+			this.MapList.TabIndex = 0;
+			this.MapList.UseCompatibleStateImageBehavior = false;
+			this.MapList.View = System.Windows.Forms.View.Details;
+			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
+			// 
+			// colMapName
+			// 
+			this.colMapName.Text = "Map name";
+			this.colMapName.Width = 240;
+			// 
+			// MapIconsList
+			// 
+			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
+			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.Location = new System.Drawing.Point(407, 35);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(75, 23);
+			this.btnCancel.TabIndex = 3;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.UseVisualStyleBackColor = true;
+			// 
+			// btnOk
+			// 
+			this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnOk.Location = new System.Drawing.Point(326, 35);
+			this.btnOk.Name = "btnOk";
+			this.btnOk.Size = new System.Drawing.Size(75, 23);
+			this.btnOk.TabIndex = 2;
+			this.btnOk.Text = "Open";
+			this.btnOk.UseVisualStyleBackColor = true;
+			// 
+			// lblNew
+			// 
+			this.lblNew.AutoSize = true;
+			this.lblNew.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblNew.Location = new System.Drawing.Point(12, 40);
+			this.lblNew.Name = "lblNew";
+			this.lblNew.Size = new System.Drawing.Size(69, 13);
+			this.lblNew.TabIndex = 3;
+			this.lblNew.Text = "Map name:";
+			// 
+			// txtNew
+			// 
+			this.txtNew.BackColor = System.Drawing.SystemColors.Window;
+			this.txtNew.Location = new System.Drawing.Point(88, 37);
+			this.txtNew.Name = "txtNew";
+			this.txtNew.ReadOnly = true;
+			this.txtNew.Size = new System.Drawing.Size(232, 20);
+			this.txtNew.TabIndex = 1;
+			// 
+			// pbMinimap
+			// 
+			this.pbMinimap.BackColor = System.Drawing.Color.Black;
+			this.pbMinimap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.pbMinimap.Location = new System.Drawing.Point(32, 25);
+			this.pbMinimap.Name = "pbMinimap";
+			this.pbMinimap.Size = new System.Drawing.Size(124, 124);
+			this.pbMinimap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.pbMinimap.TabIndex = 5;
+			this.pbMinimap.TabStop = false;
+			// 
+			// pnlBottom
+			// 
+			this.pnlBottom.Controls.Add(this.pictureBox1);
+			this.pnlBottom.Controls.Add(this.txtPathOut);
+			this.pnlBottom.Controls.Add(this.lblPathOut);
+			this.pnlBottom.Controls.Add(this.lblPath);
+			this.pnlBottom.Controls.Add(this.btnCancel);
+			this.pnlBottom.Controls.Add(this.btnOk);
+			this.pnlBottom.Controls.Add(this.txtNew);
+			this.pnlBottom.Controls.Add(this.lblNew);
+			this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.pnlBottom.Location = new System.Drawing.Point(0, 332);
+			this.pnlBottom.MaximumSize = new System.Drawing.Size(0, 70);
+			this.pnlBottom.Name = "pnlBottom";
+			this.pnlBottom.Size = new System.Drawing.Size(494, 70);
+			this.pnlBottom.TabIndex = 6;
+			// 
+			// txtPathOut
+			// 
+			this.txtPathOut.BackColor = System.Drawing.SystemColors.Window;
+			this.txtPathOut.Location = new System.Drawing.Point(55, 10);
+			this.txtPathOut.Name = "txtPathOut";
+			this.txtPathOut.ReadOnly = true;
+			this.txtPathOut.Size = new System.Drawing.Size(265, 20);
+			this.txtPathOut.TabIndex = 0;
+			this.txtPathOut.TextChanged += new System.EventHandler(this.txtPathOut_TextChanged);
+			// 
+			// lblPathOut
+			// 
+			this.lblPathOut.AutoSize = true;
+			this.lblPathOut.Location = new System.Drawing.Point(55, 13);
+			this.lblPathOut.Name = "lblPathOut";
+			this.lblPathOut.Size = new System.Drawing.Size(0, 13);
+			this.lblPathOut.TabIndex = 6;
+			// 
+			// lblPath
+			// 
+			this.lblPath.AutoSize = true;
+			this.lblPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblPath.Location = new System.Drawing.Point(12, 13);
+			this.lblPath.Name = "lblPath";
+			this.lblPath.Size = new System.Drawing.Size(37, 13);
+			this.lblPath.TabIndex = 5;
+			this.lblPath.Text = "Path:";
+			// 
+			// splitContainer1
+			// 
+			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer1.Name = "splitContainer1";
+			// 
+			// splitContainer1.Panel1
+			// 
+			this.splitContainer1.Panel1.Controls.Add(this.lblMapList);
+			this.splitContainer1.Panel1.Controls.Add(this.MapList);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.Controls.Add(this.txtDesc);
+			this.splitContainer1.Panel2.Controls.Add(this.lblDesc);
+			this.splitContainer1.Panel2.Controls.Add(this.txtTheater);
+			this.splitContainer1.Panel2.Controls.Add(this.lblTheater);
+			this.splitContainer1.Panel2.Controls.Add(this.txtAuthor);
+			this.splitContainer1.Panel2.Controls.Add(this.lblAuthor);
+			this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
+			this.splitContainer1.Panel2.Controls.Add(this.lblMapName);
+			this.splitContainer1.Panel2.Controls.Add(this.lblMinimap);
+			this.splitContainer1.Panel2.Controls.Add(this.pbMinimap);
+			this.splitContainer1.Size = new System.Drawing.Size(494, 332);
+			this.splitContainer1.SplitterDistance = 300;
+			this.splitContainer1.TabIndex = 7;
+			// 
+			// lblMapList
+			// 
+			this.lblMapList.AutoSize = true;
+			this.lblMapList.Location = new System.Drawing.Point(12, 9);
+			this.lblMapList.Name = "lblMapList";
+			this.lblMapList.Size = new System.Drawing.Size(81, 13);
+			this.lblMapList.TabIndex = 1;
+			this.lblMapList.Text = "Available maps:";
+			// 
+			// txtDesc
+			// 
+			this.txtDesc.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtDesc.Location = new System.Drawing.Point(16, 289);
+			this.txtDesc.Name = "txtDesc";
+			this.txtDesc.ReadOnly = true;
+			this.txtDesc.Size = new System.Drawing.Size(162, 20);
+			this.txtDesc.TabIndex = 14;
+			// 
+			// lblDesc
+			// 
+			this.lblDesc.AutoSize = true;
+			this.lblDesc.Location = new System.Drawing.Point(13, 273);
+			this.lblDesc.Name = "lblDesc";
+			this.lblDesc.Size = new System.Drawing.Size(63, 13);
+			this.lblDesc.TabIndex = 13;
+			this.lblDesc.Text = "Description:";
+			// 
+			// txtTheater
+			// 
+			this.txtTheater.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtTheater.Location = new System.Drawing.Point(16, 252);
+			this.txtTheater.Name = "txtTheater";
+			this.txtTheater.ReadOnly = true;
+			this.txtTheater.Size = new System.Drawing.Size(162, 20);
+			this.txtTheater.TabIndex = 12;
+			// 
+			// lblTheater
+			// 
+			this.lblTheater.AutoSize = true;
+			this.lblTheater.Location = new System.Drawing.Point(13, 236);
+			this.lblTheater.Name = "lblTheater";
+			this.lblTheater.Size = new System.Drawing.Size(47, 13);
+			this.lblTheater.TabIndex = 11;
+			this.lblTheater.Text = "Tileset:";
+			// 
+			// txtAuthor
+			// 
+			this.txtAuthor.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtAuthor.Location = new System.Drawing.Point(16, 214);
+			this.txtAuthor.Name = "txtAuthor";
+			this.txtAuthor.ReadOnly = true;
+			this.txtAuthor.Size = new System.Drawing.Size(162, 20);
+			this.txtAuthor.TabIndex = 10;
+			// 
+			// lblAuthor
+			// 
+			this.lblAuthor.AutoSize = true;
+			this.lblAuthor.Location = new System.Drawing.Point(13, 198);
+			this.lblAuthor.Name = "lblAuthor";
+			this.lblAuthor.Size = new System.Drawing.Size(41, 13);
+			this.lblAuthor.TabIndex = 9;
+			this.lblAuthor.Text = "Author:";
+			// 
+			// txtTitle
+			// 
+			this.txtTitle.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtTitle.Location = new System.Drawing.Point(16, 177);
+			this.txtTitle.Name = "txtTitle";
+			this.txtTitle.ReadOnly = true;
+			this.txtTitle.Size = new System.Drawing.Size(162, 20);
+			this.txtTitle.TabIndex = 8;
+			// 
+			// lblMapName
+			// 
+			this.lblMapName.AutoSize = true;
+			this.lblMapName.Location = new System.Drawing.Point(13, 161);
+			this.lblMapName.Name = "lblMapName";
+			this.lblMapName.Size = new System.Drawing.Size(30, 13);
+			this.lblMapName.TabIndex = 7;
+			this.lblMapName.Text = "Title:";
+			// 
+			// lblMinimap
+			// 
+			this.lblMinimap.AutoSize = true;
+			this.lblMinimap.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblMinimap.Location = new System.Drawing.Point(29, 9);
+			this.lblMinimap.Name = "lblMinimap";
+			this.lblMinimap.Size = new System.Drawing.Size(71, 13);
+			this.lblMinimap.TabIndex = 6;
+			this.lblMinimap.Text = "Map preview:";
+			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
+			this.pictureBox1.TabIndex = 7;
+			this.pictureBox1.TabStop = false;
+			this.pictureBox1.Visible = false;
+			// 
+			// MapSelect
+			// 
+			this.AcceptButton = this.btnOk;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.btnCancel;
+			this.ClientSize = new System.Drawing.Size(494, 402);
+			this.Controls.Add(this.splitContainer1);
+			this.Controls.Add(this.pnlBottom);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MapSelect";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Select map";
+			this.Load += new System.EventHandler(this.MapSelect_Load);
+			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).EndInit();
+			this.pnlBottom.ResumeLayout(false);
+			this.pnlBottom.PerformLayout();
+			this.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel1.PerformLayout();
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			this.splitContainer1.Panel2.PerformLayout();
+			this.splitContainer1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+			this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public System.Windows.Forms.ListView MapList;
+        public System.Windows.Forms.Button btnCancel;
+        public System.Windows.Forms.Button btnOk;
+        public System.Windows.Forms.Label lblNew;
+        public System.Windows.Forms.TextBox txtNew;
+        public System.Windows.Forms.ColumnHeader colMapName;
+        public System.Windows.Forms.ImageList MapIconsList;
+        public System.Windows.Forms.PictureBox pbMinimap;
+        public System.Windows.Forms.Panel pnlBottom;
+        public System.Windows.Forms.SplitContainer splitContainer1;
+        public System.Windows.Forms.Label lblMinimap;
+        public System.Windows.Forms.TextBox txtTheater;
+        public System.Windows.Forms.Label lblTheater;
+        public System.Windows.Forms.TextBox txtAuthor;
+        public System.Windows.Forms.Label lblAuthor;
+        public System.Windows.Forms.TextBox txtTitle;
+        public System.Windows.Forms.Label lblMapName;
+        public System.Windows.Forms.TextBox txtDesc;
+        public System.Windows.Forms.Label lblDesc;
+        public System.Windows.Forms.Label lblMapList;
+        public System.Windows.Forms.Label lblPathOut;
+        public System.Windows.Forms.Label lblPath;
+        public System.Windows.Forms.TextBox txtPathOut;
+		private System.Windows.Forms.PictureBox pictureBox1;
+    }
 }

OpenRA.Editor/MapSelect.cs

@@ -1,74 +1,84 @@
-using System;
-using System.IO;
-using System.Windows.Forms;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using System.Linq;
-
-namespace OpenRA.Editor
-{
-    public partial class MapSelect : Form
-    {
-        public string MapFolderPath;
-
-        public MapSelect(string currentMod)
-        {
-            MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
-				.Aggregate(Path.Combine);
-			
-			InitializeComponent();
-			MapIconsList.Images.Add(pictureBox1.Image);
-        }
-
-        void MapSelect_Load(object sender, EventArgs e)
-        {
-            MapList.Items.Clear();
-            txtPathOut.Text = MapFolderPath;
-			
-            foreach (var map in ModData.FindMapsIn(MapFolderPath))
-            {
-                ListViewItem map1 = new ListViewItem();
-				map1.Tag = map;
-				map1.Text = Path.GetFileNameWithoutExtension(map);
-                map1.ImageIndex = 0;
-                MapList.Items.Add(map1);
-            }
-            
-			// hack
-			if (txtNew.Text != "unnamed")
-                MapList.Items[0].Selected = true;
-        }
-
-        void MapList_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (MapList.SelectedItems.Count == 1)
-            {
-                txtNew.Text = MapList.SelectedItems[0].Text;
-				txtNew.Tag = MapList.SelectedItems[0].Tag;
-
-				var map = new Map(txtNew.Tag as string);
-                txtTitle.Text = map.Title;
-                txtAuthor.Text = map.Author;
-                txtTheater.Text = map.Tileset;
-                txtDesc.Text = map.Description;
-				pbMinimap.Image = null;
-				
-                try
-                {
-					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
-                }
-                catch (Exception ed)
-                {
-                    Console.WriteLine("No map preview image found: {0}", ed.ToString());
-                }
-                finally { }
-            }
-        }
-
-        void txtPathOut_TextChanged(object sender, EventArgs e)
-        {
-            MapFolderPath = txtPathOut.Text;
-        }
-
-    }
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using System.Linq;
+
+namespace OpenRA.Editor
+{
+    public partial class MapSelect : Form
+    {
+        public string MapFolderPath;
+
+        public MapSelect(string currentMod)
+        {
+            MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+				.Aggregate(Path.Combine);
+			
+			InitializeComponent();
+			MapIconsList.Images.Add(pictureBox1.Image);
+        }
+
+        void MapSelect_Load(object sender, EventArgs e)
+        {
+            MapList.Items.Clear();
+            txtPathOut.Text = MapFolderPath;
+			
+            foreach (var map in ModData.FindMapsIn(MapFolderPath))
+            {
+                ListViewItem map1 = new ListViewItem();
+				map1.Tag = map;
+				map1.Text = Path.GetFileNameWithoutExtension(map);
+                map1.ImageIndex = 0;
+                MapList.Items.Add(map1);
+            }
+            
+			// hack
+			if (txtNew.Text != "unnamed")
+                MapList.Items[0].Selected = true;
+        }
+
+        void MapList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (MapList.SelectedItems.Count == 1)
+            {
+                txtNew.Text = MapList.SelectedItems[0].Text;
+				txtNew.Tag = MapList.SelectedItems[0].Tag;
+
+				var map = new Map(txtNew.Tag as string);
+                txtTitle.Text = map.Title;
+                txtAuthor.Text = map.Author;
+                txtTheater.Text = map.Tileset;
+                txtDesc.Text = map.Description;
+				pbMinimap.Image = null;
+				
+                try
+                {
+					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
+                }
+                catch (Exception ed)
+                {
+                    Console.WriteLine("No map preview image found: {0}", ed.ToString());
+                }
+                finally { }
+            }
+        }
+
+        void txtPathOut_TextChanged(object sender, EventArgs e)
+        {
+            MapFolderPath = txtPathOut.Text;
+        }
+
+    }
+}

OpenRA.Editor/MapSelect.resx

@@ -1,177 +1,177 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
-        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
-        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
-        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
-        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
-        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
-        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
-        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
-        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
-        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
-        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
-        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
-        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
-        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
-        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
-        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
-        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
-        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
-        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
-        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
-        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
-        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
-        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
-        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
-        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
-        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
-        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
-        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
-        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
-        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
-        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
-        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
-        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
-        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
-        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
-        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
-        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
-        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
-        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
-        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
-        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
-        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
-        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
-        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
-        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
-        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
-        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
-        ga8AAAAASUVORK5CYII=
-</value>
-  </data>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
+        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
+        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
+        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
+        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
+        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
+        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
+        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
+        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
+        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
+        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
+        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
+        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
+        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
+        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
+        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
+        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
+        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
+        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
+        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
+        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
+        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
+        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
+        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
+        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
+        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
+        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
+        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
+        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
+        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
+        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
+        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
+        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
+        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
+        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
+        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
+        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
+        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
+        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
+        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
+        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
+        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
+        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
+        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
+        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
+        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
+        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
+        ga8AAAAASUVORK5CYII=
+</value>
+  </data>
 </root>

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -1,286 +1,296 @@
-namespace OpenRA.Editor
-{
-	partial class NewMapDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.label1 = new System.Windows.Forms.Label();
-			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
-			this.cordonTop = new System.Windows.Forms.NumericUpDown();
-			this.cordonRight = new System.Windows.Forms.NumericUpDown();
-			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
-			this.height = new System.Windows.Forms.NumericUpDown();
-			this.width = new System.Windows.Forms.NumericUpDown();
-			this.label4 = new System.Windows.Forms.Label();
-			this.theater = new System.Windows.Forms.ComboBox();
-			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// button2
-			// 
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(229, 160);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 7;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			// 
-			// button1
-			// 
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(310, 160);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 8;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			// 
-			// label3
-			// 
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(31, 77);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(107, 13);
-			this.label3.TabIndex = 9;
-			this.label3.Text = "Cordon Right/Bottom";
-			// 
-			// label2
-			// 
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(31, 51);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(86, 13);
-			this.label2.TabIndex = 11;
-			this.label2.Text = "Cordon Left/Top";
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(31, 25);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 10;
-			this.label1.Text = "Size";
-			// 
-			// cordonBottom
-			// 
-			this.cordonBottom.Location = new System.Drawing.Point(280, 75);
-			this.cordonBottom.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.cordonBottom.Name = "cordonBottom";
-			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
-			this.cordonBottom.TabIndex = 5;
-			this.cordonBottom.Value = new decimal(new int[] {
-            112,
-            0,
-            0,
-            0});
-			this.cordonBottom.Enter += new System.EventHandler(this.SelectText);
-			// 
-			// cordonTop
-			// 
-			this.cordonTop.Location = new System.Drawing.Point(280, 49);
-			this.cordonTop.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.cordonTop.Name = "cordonTop";
-			this.cordonTop.Size = new System.Drawing.Size(105, 20);
-			this.cordonTop.TabIndex = 3;
-			this.cordonTop.Value = new decimal(new int[] {
-            16,
-            0,
-            0,
-            0});
-			this.cordonTop.Enter += new System.EventHandler(this.SelectText);
-			// 
-			// cordonRight
-			// 
-			this.cordonRight.Location = new System.Drawing.Point(169, 75);
-			this.cordonRight.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.cordonRight.Name = "cordonRight";
-			this.cordonRight.Size = new System.Drawing.Size(105, 20);
-			this.cordonRight.TabIndex = 4;
-			this.cordonRight.Value = new decimal(new int[] {
-            112,
-            0,
-            0,
-            0});
-			this.cordonRight.Enter += new System.EventHandler(this.SelectText);
-			// 
-			// cordonLeft
-			// 
-			this.cordonLeft.Location = new System.Drawing.Point(169, 49);
-			this.cordonLeft.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.cordonLeft.Name = "cordonLeft";
-			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
-			this.cordonLeft.TabIndex = 2;
-			this.cordonLeft.Value = new decimal(new int[] {
-            16,
-            0,
-            0,
-            0});
-			this.cordonLeft.Enter += new System.EventHandler(this.SelectText);
-			// 
-			// height
-			// 
-			this.height.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
-			this.height.Location = new System.Drawing.Point(280, 23);
-			this.height.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.height.Name = "height";
-			this.height.Size = new System.Drawing.Size(105, 20);
-			this.height.TabIndex = 1;
-			this.height.Value = new decimal(new int[] {
-            128,
-            0,
-            0,
-            0});
-			this.height.Enter += new System.EventHandler(this.SelectText);
-			// 
-			// width
-			// 
-			this.width.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
-			this.width.Location = new System.Drawing.Point(169, 23);
-			this.width.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.width.Name = "width";
-			this.width.Size = new System.Drawing.Size(105, 20);
-			this.width.TabIndex = 0;
-			this.width.Value = new decimal(new int[] {
-            128,
-            0,
-            0,
-            0});
-			this.width.Enter += new System.EventHandler(this.SelectText);
-			// 
-			// label4
-			// 
-			this.label4.AutoSize = true;
-			this.label4.Location = new System.Drawing.Point(31, 124);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(44, 13);
-			this.label4.TabIndex = 14;
-			this.label4.Text = "Tileset";
-			// 
-			// theater
-			// 
-			this.theater.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.theater.FormattingEnabled = true;
-			this.theater.Location = new System.Drawing.Point(169, 121);
-			this.theater.Name = "theater";
-			this.theater.Size = new System.Drawing.Size(216, 21);
-			this.theater.TabIndex = 6;
-			// 
-			// NewMapDialog
-			// 
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(418, 210);
-			this.Controls.Add(this.theater);
-			this.Controls.Add(this.label4);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.cordonBottom);
-			this.Controls.Add(this.cordonTop);
-			this.Controls.Add(this.cordonRight);
-			this.Controls.Add(this.cordonLeft);
-			this.Controls.Add(this.height);
-			this.Controls.Add(this.width);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "NewMapDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "New Map";
-			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.NumericUpDown cordonBottom;
-		public System.Windows.Forms.NumericUpDown cordonTop;
-		public System.Windows.Forms.NumericUpDown cordonRight;
-		public System.Windows.Forms.NumericUpDown cordonLeft;
-		public System.Windows.Forms.NumericUpDown height;
-		public System.Windows.Forms.NumericUpDown width;
-		private System.Windows.Forms.Label label4;
-		public System.Windows.Forms.ComboBox theater;
-	}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+namespace OpenRA.Editor
+{
+	partial class NewMapDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
+			this.cordonTop = new System.Windows.Forms.NumericUpDown();
+			this.cordonRight = new System.Windows.Forms.NumericUpDown();
+			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
+			this.height = new System.Windows.Forms.NumericUpDown();
+			this.width = new System.Windows.Forms.NumericUpDown();
+			this.label4 = new System.Windows.Forms.Label();
+			this.theater = new System.Windows.Forms.ComboBox();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(229, 160);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 7;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(310, 160);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 8;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(31, 77);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(107, 13);
+			this.label3.TabIndex = 9;
+			this.label3.Text = "Cordon Right/Bottom";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(31, 51);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(86, 13);
+			this.label2.TabIndex = 11;
+			this.label2.Text = "Cordon Left/Top";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(31, 25);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 10;
+			this.label1.Text = "Size";
+			// 
+			// cordonBottom
+			// 
+			this.cordonBottom.Location = new System.Drawing.Point(280, 75);
+			this.cordonBottom.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonBottom.Name = "cordonBottom";
+			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
+			this.cordonBottom.TabIndex = 5;
+			this.cordonBottom.Value = new decimal(new int[] {
+            112,
+            0,
+            0,
+            0});
+			this.cordonBottom.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// cordonTop
+			// 
+			this.cordonTop.Location = new System.Drawing.Point(280, 49);
+			this.cordonTop.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonTop.Name = "cordonTop";
+			this.cordonTop.Size = new System.Drawing.Size(105, 20);
+			this.cordonTop.TabIndex = 3;
+			this.cordonTop.Value = new decimal(new int[] {
+            16,
+            0,
+            0,
+            0});
+			this.cordonTop.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// cordonRight
+			// 
+			this.cordonRight.Location = new System.Drawing.Point(169, 75);
+			this.cordonRight.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonRight.Name = "cordonRight";
+			this.cordonRight.Size = new System.Drawing.Size(105, 20);
+			this.cordonRight.TabIndex = 4;
+			this.cordonRight.Value = new decimal(new int[] {
+            112,
+            0,
+            0,
+            0});
+			this.cordonRight.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// cordonLeft
+			// 
+			this.cordonLeft.Location = new System.Drawing.Point(169, 49);
+			this.cordonLeft.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonLeft.Name = "cordonLeft";
+			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
+			this.cordonLeft.TabIndex = 2;
+			this.cordonLeft.Value = new decimal(new int[] {
+            16,
+            0,
+            0,
+            0});
+			this.cordonLeft.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// height
+			// 
+			this.height.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.height.Location = new System.Drawing.Point(280, 23);
+			this.height.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.height.Name = "height";
+			this.height.Size = new System.Drawing.Size(105, 20);
+			this.height.TabIndex = 1;
+			this.height.Value = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			this.height.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// width
+			// 
+			this.width.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.width.Location = new System.Drawing.Point(169, 23);
+			this.width.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.width.Name = "width";
+			this.width.Size = new System.Drawing.Size(105, 20);
+			this.width.TabIndex = 0;
+			this.width.Value = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			this.width.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(31, 124);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(44, 13);
+			this.label4.TabIndex = 14;
+			this.label4.Text = "Tileset";
+			// 
+			// theater
+			// 
+			this.theater.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.theater.FormattingEnabled = true;
+			this.theater.Location = new System.Drawing.Point(169, 121);
+			this.theater.Name = "theater";
+			this.theater.Size = new System.Drawing.Size(216, 21);
+			this.theater.TabIndex = 6;
+			// 
+			// NewMapDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(418, 210);
+			this.Controls.Add(this.theater);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.cordonBottom);
+			this.Controls.Add(this.cordonTop);
+			this.Controls.Add(this.cordonRight);
+			this.Controls.Add(this.cordonLeft);
+			this.Controls.Add(this.height);
+			this.Controls.Add(this.width);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "NewMapDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "New Map";
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.NumericUpDown cordonBottom;
+		public System.Windows.Forms.NumericUpDown cordonTop;
+		public System.Windows.Forms.NumericUpDown cordonRight;
+		public System.Windows.Forms.NumericUpDown cordonLeft;
+		public System.Windows.Forms.NumericUpDown height;
+		public System.Windows.Forms.NumericUpDown width;
+		private System.Windows.Forms.Label label4;
+		public System.Windows.Forms.ComboBox theater;
+	}
 }

OpenRA.Editor/NewMapDialog.resx

@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>

OpenRA.Editor/OpenRA.Editor.csproj

@@ -1,159 +1,159 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{00038B75-405B-44F5-8691-BD2546DBE224}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.Editor</RootNamespace>
-    <AssemblyName>OpenRA.Editor</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ActorTemplate.cs" />
-    <Compile Include="ActorTool.cs" />
-    <Compile Include="BrushTool.cs" />
-    <Compile Include="ErrorListDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ErrorListDialog.Designer.cs">
-      <DependentUpon>ErrorListDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ITool.cs" />
-    <Compile Include="LegacyMapImporter.cs" />
-    <Compile Include="MapSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MapSelect.Designer.cs">
-      <DependentUpon>MapSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewMapDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NewMapDialog.Designer.cs">
-      <DependentUpon>NewMapDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="PropertiesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PropertiesDialog.Designer.cs">
-      <DependentUpon>PropertiesDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MapSelect.resx">
-      <DependentUpon>MapSelect.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewMapDialog.resx">
-      <DependentUpon>NewMapDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PropertiesDialog.resx">
-      <DependentUpon>PropertiesDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ResizeDialog.resx">
-      <DependentUpon>ResizeDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="RenderUtils.cs" />
-    <Compile Include="ResizeDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ResizeDialog.Designer.cs">
-      <DependentUpon>ResizeDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ResourceTool.cs" />
-    <Compile Include="Surface.cs">
-      <SubType>Component</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
-      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRA.FileFormats</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="OpenRA.Editor.Icon.ico" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{00038B75-405B-44F5-8691-BD2546DBE224}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA.Editor</RootNamespace>
+    <AssemblyName>OpenRA.Editor</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ActorTemplate.cs" />
+    <Compile Include="ActorTool.cs" />
+    <Compile Include="BrushTool.cs" />
+    <Compile Include="ErrorListDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ErrorListDialog.Designer.cs">
+      <DependentUpon>ErrorListDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ITool.cs" />
+    <Compile Include="LegacyMapImporter.cs" />
+    <Compile Include="MapSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MapSelect.Designer.cs">
+      <DependentUpon>MapSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NewMapDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="NewMapDialog.Designer.cs">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="PropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PropertiesDialog.Designer.cs">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MapSelect.resx">
+      <DependentUpon>MapSelect.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NewMapDialog.resx">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PropertiesDialog.resx">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ResizeDialog.resx">
+      <DependentUpon>ResizeDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="RenderUtils.cs" />
+    <Compile Include="ResizeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ResizeDialog.Designer.cs">
+      <DependentUpon>ResizeDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ResourceTool.cs" />
+    <Compile Include="Surface.cs">
+      <SubType>Component</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRA.FileFormats</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+      <Name>OpenRA.Game</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="OpenRA.Editor.Icon.ico" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

OpenRA.Editor/Program.cs

@@ -6,13 +6,13 @@
  * as published by the Free Software Foundation. For more information,
  * see COPYING.
  */
-#endregion
-
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
+#endregion
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
 using OpenRA.FileFormats;
 
 namespace OpenRA.Editor
@@ -46,10 +46,10 @@ namespace OpenRA.Editor
 			foreach (var path in ModData.FindMapsIn(MapFolderPath))
             {
                 var map = new Map(path);
-				// Touch the lazy bits to initialize them
-                map.Actors.Force();
-                map.Smudges.Force();
-                map.MapTiles.Force();
+				// Touch the lazy bits to initialize them
+                map.Actors.Force();
+                map.Smudges.Force();
+                map.MapTiles.Force();
                 map.MapResources.Force();
 				map.Save(path);
             }

OpenRA.Editor/Properties/AssemblyInfo.cs

@@ -1,36 +1,46 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenRA.Editor")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("OpenRA.Editor")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e18ea68f-f344-46c9-b026-8bda76fa91f8")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenRA.Editor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("OpenRA.Editor")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("e18ea68f-f344-46c9-b026-8bda76fa91f8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

OpenRA.Editor/Properties/Resources.Designer.cs

@@ -1,71 +1,71 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenRA.Editor.Properties
-{
-
-
-	/// <summary>
-	///   A strongly-typed resource class, for looking up localized strings, etc.
-	/// </summary>
-	// This class was auto-generated by the StronglyTypedResourceBuilder
-	// class via a tool like ResGen or Visual Studio.
-	// To add or remove a member, edit your .ResX file then rerun ResGen
-	// with the /str option, or rebuild your VS project.
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
-	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	internal class Resources
-	{
-
-		private static global::System.Resources.ResourceManager resourceMan;
-
-		private static global::System.Globalization.CultureInfo resourceCulture;
-
-		[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-		internal Resources()
-		{
-		}
-
-		/// <summary>
-		///   Returns the cached ResourceManager instance used by this class.
-		/// </summary>
-		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-		internal static global::System.Resources.ResourceManager ResourceManager
-		{
-			get
-			{
-				if ((resourceMan == null))
-				{
-					global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.Editor.Properties.Resources", typeof(Resources).Assembly);
-					resourceMan = temp;
-				}
-				return resourceMan;
-			}
-		}
-
-		/// <summary>
-		///   Overrides the current thread's CurrentUICulture property for all
-		///   resource lookups using this strongly typed resource class.
-		/// </summary>
-		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-		internal static global::System.Globalization.CultureInfo Culture
-		{
-			get
-			{
-				return resourceCulture;
-			}
-			set
-			{
-				resourceCulture = value;
-			}
-		}
-	}
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenRA.Editor.Properties
+{
+
+
+	/// <summary>
+	///   A strongly-typed resource class, for looking up localized strings, etc.
+	/// </summary>
+	// This class was auto-generated by the StronglyTypedResourceBuilder
+	// class via a tool like ResGen or Visual Studio.
+	// To add or remove a member, edit your .ResX file then rerun ResGen
+	// with the /str option, or rebuild your VS project.
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+	internal class Resources
+	{
+
+		private static global::System.Resources.ResourceManager resourceMan;
+
+		private static global::System.Globalization.CultureInfo resourceCulture;
+
+		[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+		internal Resources()
+		{
+		}
+
+		/// <summary>
+		///   Returns the cached ResourceManager instance used by this class.
+		/// </summary>
+		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+		internal static global::System.Resources.ResourceManager ResourceManager
+		{
+			get
+			{
+				if ((resourceMan == null))
+				{
+					global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.Editor.Properties.Resources", typeof(Resources).Assembly);
+					resourceMan = temp;
+				}
+				return resourceMan;
+			}
+		}
+
+		/// <summary>
+		///   Overrides the current thread's CurrentUICulture property for all
+		///   resource lookups using this strongly typed resource class.
+		/// </summary>
+		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+		internal static global::System.Globalization.CultureInfo Culture
+		{
+			get
+			{
+				return resourceCulture;
+			}
+			set
+			{
+				resourceCulture = value;
+			}
+		}
+	}
+}

OpenRA.Editor/Properties/Settings.Designer.cs

@@ -1,30 +1,30 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenRA.Editor.Properties
-{
-
-
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
-	internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-	{
-
-		private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-		public static Settings Default
-		{
-			get
-			{
-				return defaultInstance;
-			}
-		}
-	}
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenRA.Editor.Properties
+{
+
+
+	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+	internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+	{
+
+		private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+		public static Settings Default
+		{
+			get
+			{
+				return defaultInstance;
+			}
+		}
+	}
+}

OpenRA.Editor/Properties/Settings.settings

@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -1,172 +1,182 @@
-namespace OpenRA.Editor
-{
-	partial class PropertiesDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.button2 = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.title = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.desc = new System.Windows.Forms.TextBox();
-            this.selectable = new System.Windows.Forms.CheckBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.author = new System.Windows.Forms.TextBox();
-            this.useAsShellmap = new System.Windows.Forms.CheckBox();
-            this.SuspendLayout();
-            // 
-            // button2
-            // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.button2.Location = new System.Drawing.Point(196, 193);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(75, 23);
-            this.button2.TabIndex = 14;
-            this.button2.Text = "OK";
-            this.button2.UseVisualStyleBackColor = true;
-            // 
-            // button1
-            // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.button1.Location = new System.Drawing.Point(277, 193);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 15;
-            this.button1.Text = "Cancel";
-            this.button1.UseVisualStyleBackColor = true;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 50);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(27, 13);
-            this.label1.TabIndex = 16;
-            this.label1.Text = "Title";
-            // 
-            // title
-            // 
-            this.title.Location = new System.Drawing.Point(66, 47);
-            this.title.Name = "title";
-            this.title.Size = new System.Drawing.Size(286, 20);
-            this.title.TabIndex = 17;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(12, 76);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(32, 13);
-            this.label2.TabIndex = 16;
-            this.label2.Text = "Desc";
-            // 
-            // desc
-            // 
-            this.desc.Location = new System.Drawing.Point(66, 73);
-            this.desc.Name = "desc";
-            this.desc.Size = new System.Drawing.Size(286, 20);
-            this.desc.TabIndex = 17;
-            // 
-            // selectable
-            // 
-            this.selectable.AutoSize = true;
-            this.selectable.Location = new System.Drawing.Point(118, 138);
-            this.selectable.Name = "selectable";
-            this.selectable.Size = new System.Drawing.Size(130, 17);
-            this.selectable.TabIndex = 18;
-            this.selectable.Text = "Show in Map Chooser";
-            this.selectable.UseVisualStyleBackColor = true;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(12, 102);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(38, 13);
-            this.label3.TabIndex = 16;
-            this.label3.Text = "Author";
-            // 
-            // author
-            // 
-            this.author.Location = new System.Drawing.Point(66, 99);
-            this.author.Name = "author";
-            this.author.Size = new System.Drawing.Size(286, 20);
-            this.author.TabIndex = 17;
-            // 
-            // checkBox1
-            // 
-            this.useAsShellmap.AutoSize = true;
-            this.useAsShellmap.Location = new System.Drawing.Point(118, 161);
-            this.useAsShellmap.Name = "checkBox1";
-            this.useAsShellmap.Size = new System.Drawing.Size(105, 17);
-            this.useAsShellmap.TabIndex = 18;
-            this.useAsShellmap.Text = "Use as Shellmap";
-            this.useAsShellmap.UseVisualStyleBackColor = true;
-            // 
-            // PropertiesDialog
-            // 
-            this.AcceptButton = this.button2;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.button1;
-            this.ClientSize = new System.Drawing.Size(370, 228);
-            this.Controls.Add(this.useAsShellmap);
-            this.Controls.Add(this.selectable);
-            this.Controls.Add(this.author);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.desc);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.title);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.button2);
-            this.Controls.Add(this.button1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Name = "PropertiesDialog";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "PropertiesDialog";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.TextBox title;
-		private System.Windows.Forms.Label label2;
-		public System.Windows.Forms.TextBox desc;
-		public System.Windows.Forms.CheckBox selectable;
-		private System.Windows.Forms.Label label3;
-		public System.Windows.Forms.TextBox author;
-        public System.Windows.Forms.CheckBox useAsShellmap;
-	}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+namespace OpenRA.Editor
+{
+	partial class PropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+            this.button2 = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.title = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.desc = new System.Windows.Forms.TextBox();
+            this.selectable = new System.Windows.Forms.CheckBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.author = new System.Windows.Forms.TextBox();
+            this.useAsShellmap = new System.Windows.Forms.CheckBox();
+            this.SuspendLayout();
+            // 
+            // button2
+            // 
+            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.button2.Location = new System.Drawing.Point(196, 193);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 23);
+            this.button2.TabIndex = 14;
+            this.button2.Text = "OK";
+            this.button2.UseVisualStyleBackColor = true;
+            // 
+            // button1
+            // 
+            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.button1.Location = new System.Drawing.Point(277, 193);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 15;
+            this.button1.Text = "Cancel";
+            this.button1.UseVisualStyleBackColor = true;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 50);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(27, 13);
+            this.label1.TabIndex = 16;
+            this.label1.Text = "Title";
+            // 
+            // title
+            // 
+            this.title.Location = new System.Drawing.Point(66, 47);
+            this.title.Name = "title";
+            this.title.Size = new System.Drawing.Size(286, 20);
+            this.title.TabIndex = 17;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 76);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(32, 13);
+            this.label2.TabIndex = 16;
+            this.label2.Text = "Desc";
+            // 
+            // desc
+            // 
+            this.desc.Location = new System.Drawing.Point(66, 73);
+            this.desc.Name = "desc";
+            this.desc.Size = new System.Drawing.Size(286, 20);
+            this.desc.TabIndex = 17;
+            // 
+            // selectable
+            // 
+            this.selectable.AutoSize = true;
+            this.selectable.Location = new System.Drawing.Point(118, 138);
+            this.selectable.Name = "selectable";
+            this.selectable.Size = new System.Drawing.Size(130, 17);
+            this.selectable.TabIndex = 18;
+            this.selectable.Text = "Show in Map Chooser";
+            this.selectable.UseVisualStyleBackColor = true;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(12, 102);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(38, 13);
+            this.label3.TabIndex = 16;
+            this.label3.Text = "Author";
+            // 
+            // author
+            // 
+            this.author.Location = new System.Drawing.Point(66, 99);
+            this.author.Name = "author";
+            this.author.Size = new System.Drawing.Size(286, 20);
+            this.author.TabIndex = 17;
+            // 
+            // checkBox1
+            // 
+            this.useAsShellmap.AutoSize = true;
+            this.useAsShellmap.Location = new System.Drawing.Point(118, 161);
+            this.useAsShellmap.Name = "checkBox1";
+            this.useAsShellmap.Size = new System.Drawing.Size(105, 17);
+            this.useAsShellmap.TabIndex = 18;
+            this.useAsShellmap.Text = "Use as Shellmap";
+            this.useAsShellmap.UseVisualStyleBackColor = true;
+            // 
+            // PropertiesDialog
+            // 
+            this.AcceptButton = this.button2;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.button1;
+            this.ClientSize = new System.Drawing.Size(370, 228);
+            this.Controls.Add(this.useAsShellmap);
+            this.Controls.Add(this.selectable);
+            this.Controls.Add(this.author);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.desc);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.title);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.button2);
+            this.Controls.Add(this.button1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Name = "PropertiesDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "PropertiesDialog";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.TextBox title;
+		private System.Windows.Forms.Label label2;
+		public System.Windows.Forms.TextBox desc;
+		public System.Windows.Forms.CheckBox selectable;
+		private System.Windows.Forms.Label label3;
+		public System.Windows.Forms.TextBox author;
+        public System.Windows.Forms.CheckBox useAsShellmap;
+	}
 }

OpenRA.Editor/PropertiesDialog.resx

@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>

OpenRA.Editor/RenderUtils.cs

@@ -95,7 +95,6 @@ namespace OpenRA.Editor
 
 		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
 		{
-			var ri = info.Traits.Get<RenderSimpleInfo>();
             var image = RenderSimple.GetImage(info, tileset.Id);
 			
             using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))

OpenRA.Editor/ResizeDialog.Designer.cs

@@ -1,226 +1,236 @@
-namespace OpenRA.Editor
-{
-	partial class ResizeDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.width = new System.Windows.Forms.NumericUpDown();
-			this.label1 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
-			this.cordonTop = new System.Windows.Forms.NumericUpDown();
-			this.cordonRight = new System.Windows.Forms.NumericUpDown();
-			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
-			this.label3 = new System.Windows.Forms.Label();
-			this.button1 = new System.Windows.Forms.Button();
-			this.button2 = new System.Windows.Forms.Button();
-			this.height = new System.Windows.Forms.NumericUpDown();
-			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// width
-			// 
-			this.width.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
-			this.width.Location = new System.Drawing.Point(161, 18);
-			this.width.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.width.Name = "width";
-			this.width.Size = new System.Drawing.Size(105, 20);
-			this.width.TabIndex = 0;
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(23, 20);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 1;
-			this.label1.Text = "Size";
-			// 
-			// label2
-			// 
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(23, 46);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(86, 13);
-			this.label2.TabIndex = 1;
-			this.label2.Text = "Cordon Left/Top";
-			// 
-			// cordonLeft
-			// 
-			this.cordonLeft.Location = new System.Drawing.Point(161, 44);
-			this.cordonLeft.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.cordonLeft.Name = "cordonLeft";
-			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
-			this.cordonLeft.TabIndex = 0;
-			// 
-			// cordonTop
-			// 
-			this.cordonTop.Location = new System.Drawing.Point(272, 44);
-			this.cordonTop.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.cordonTop.Name = "cordonTop";
-			this.cordonTop.Size = new System.Drawing.Size(105, 20);
-			this.cordonTop.TabIndex = 0;
-			// 
-			// cordonRight
-			// 
-			this.cordonRight.Location = new System.Drawing.Point(161, 70);
-			this.cordonRight.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.cordonRight.Name = "cordonRight";
-			this.cordonRight.Size = new System.Drawing.Size(105, 20);
-			this.cordonRight.TabIndex = 0;
-			// 
-			// cordonBottom
-			// 
-			this.cordonBottom.Location = new System.Drawing.Point(272, 70);
-			this.cordonBottom.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.cordonBottom.Name = "cordonBottom";
-			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
-			this.cordonBottom.TabIndex = 0;
-			// 
-			// label3
-			// 
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(23, 72);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(107, 13);
-			this.label3.TabIndex = 1;
-			this.label3.Text = "Cordon Right/Bottom";
-			// 
-			// button1
-			// 
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(302, 111);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			// 
-			// button2
-			// 
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(221, 111);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 2;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			// 
-			// height
-			// 
-			this.height.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
-			this.height.Location = new System.Drawing.Point(272, 18);
-			this.height.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
-			this.height.Name = "height";
-			this.height.Size = new System.Drawing.Size(105, 20);
-			this.height.TabIndex = 0;
-			// 
-			// ResizeDialog
-			// 
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(409, 146);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.cordonBottom);
-			this.Controls.Add(this.cordonTop);
-			this.Controls.Add(this.cordonRight);
-			this.Controls.Add(this.cordonLeft);
-			this.Controls.Add(this.height);
-			this.Controls.Add(this.width);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ResizeDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Resize Map";
-			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Button button2;
-		public System.Windows.Forms.NumericUpDown width;
-		public System.Windows.Forms.NumericUpDown cordonLeft;
-		public System.Windows.Forms.NumericUpDown cordonTop;
-		public System.Windows.Forms.NumericUpDown cordonRight;
-		public System.Windows.Forms.NumericUpDown cordonBottom;
-		public System.Windows.Forms.NumericUpDown height;
-	}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+namespace OpenRA.Editor
+{
+	partial class ResizeDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.width = new System.Windows.Forms.NumericUpDown();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
+			this.cordonTop = new System.Windows.Forms.NumericUpDown();
+			this.cordonRight = new System.Windows.Forms.NumericUpDown();
+			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
+			this.label3 = new System.Windows.Forms.Label();
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.height = new System.Windows.Forms.NumericUpDown();
+			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// width
+			// 
+			this.width.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.width.Location = new System.Drawing.Point(161, 18);
+			this.width.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.width.Name = "width";
+			this.width.Size = new System.Drawing.Size(105, 20);
+			this.width.TabIndex = 0;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(23, 20);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Size";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(23, 46);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(86, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "Cordon Left/Top";
+			// 
+			// cordonLeft
+			// 
+			this.cordonLeft.Location = new System.Drawing.Point(161, 44);
+			this.cordonLeft.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonLeft.Name = "cordonLeft";
+			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
+			this.cordonLeft.TabIndex = 0;
+			// 
+			// cordonTop
+			// 
+			this.cordonTop.Location = new System.Drawing.Point(272, 44);
+			this.cordonTop.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonTop.Name = "cordonTop";
+			this.cordonTop.Size = new System.Drawing.Size(105, 20);
+			this.cordonTop.TabIndex = 0;
+			// 
+			// cordonRight
+			// 
+			this.cordonRight.Location = new System.Drawing.Point(161, 70);
+			this.cordonRight.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonRight.Name = "cordonRight";
+			this.cordonRight.Size = new System.Drawing.Size(105, 20);
+			this.cordonRight.TabIndex = 0;
+			// 
+			// cordonBottom
+			// 
+			this.cordonBottom.Location = new System.Drawing.Point(272, 70);
+			this.cordonBottom.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonBottom.Name = "cordonBottom";
+			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
+			this.cordonBottom.TabIndex = 0;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(23, 72);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(107, 13);
+			this.label3.TabIndex = 1;
+			this.label3.Text = "Cordon Right/Bottom";
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(302, 111);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 2;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(221, 111);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 2;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// height
+			// 
+			this.height.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.height.Location = new System.Drawing.Point(272, 18);
+			this.height.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.height.Name = "height";
+			this.height.Size = new System.Drawing.Size(105, 20);
+			this.height.TabIndex = 0;
+			// 
+			// ResizeDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(409, 146);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.cordonBottom);
+			this.Controls.Add(this.cordonTop);
+			this.Controls.Add(this.cordonRight);
+			this.Controls.Add(this.cordonLeft);
+			this.Controls.Add(this.height);
+			this.Controls.Add(this.width);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "ResizeDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Resize Map";
+			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		public System.Windows.Forms.NumericUpDown width;
+		public System.Windows.Forms.NumericUpDown cordonLeft;
+		public System.Windows.Forms.NumericUpDown cordonTop;
+		public System.Windows.Forms.NumericUpDown cordonRight;
+		public System.Windows.Forms.NumericUpDown cordonBottom;
+		public System.Windows.Forms.NumericUpDown height;
+	}
 }

OpenRA.Editor/ResizeDialog.resx

@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>

OpenRA.Editor/Surface.cs

@@ -34,7 +34,7 @@ namespace OpenRA.Editor
 
 		ITool Tool;
 		
-		public bool IsPanning;
+		public bool IsPanning;
 		public bool ShowActorNames;
 
 		public event Action AfterChange = () => { };
@@ -338,22 +338,22 @@ namespace OpenRA.Editor
 				Map.Bounds.Left * TileSet.TileSize * Zoom + Offset.X,
 				Map.Bounds.Top * TileSet.TileSize * Zoom + Offset.Y,
 				Map.Bounds.Width * TileSet.TileSize * Zoom,
-				Map.Bounds.Height * TileSet.TileSize * Zoom);
-
-			foreach (var ar in Map.Actors.Value)
-			{
-				if (ActorTemplates.ContainsKey(ar.Value.Type))
-					DrawActor(e.Graphics, ar.Value.Location(), ActorTemplates[ar.Value.Type],
-						GetPaletteForActor(ar.Value));
-			}
-
-			if (ShowActorNames)
-				foreach (var ar in Map.Actors.Value)
-					if (!ar.Key.StartsWith("Actor"))	// if it has a custom name
-						e.Graphics.DrawStringContrast(Font, ar.Key,
-							(int)(ar.Value.Location().X * TileSet.TileSize * Zoom + Offset.X),
-							(int)(ar.Value.Location().Y * TileSet.TileSize * Zoom + Offset.Y),
-							Brushes.White,
+				Map.Bounds.Height * TileSet.TileSize * Zoom);
+
+			foreach (var ar in Map.Actors.Value)
+			{
+				if (ActorTemplates.ContainsKey(ar.Value.Type))
+					DrawActor(e.Graphics, ar.Value.Location(), ActorTemplates[ar.Value.Type],
+						GetPaletteForActor(ar.Value));
+			}
+
+			if (ShowActorNames)
+				foreach (var ar in Map.Actors.Value)
+					if (!ar.Key.StartsWith("Actor"))	// if it has a custom name
+						e.Graphics.DrawStringContrast(Font, ar.Key,
+							(int)(ar.Value.Location().X * TileSet.TileSize * Zoom + Offset.X),
+							(int)(ar.Value.Location().Y * TileSet.TileSize * Zoom + Offset.Y),
+							Brushes.White,
 							Brushes.Black);
 
 			if (Tool != null)
@@ -373,16 +373,16 @@ namespace OpenRA.Editor
 		public static int2 Location(this ActorReference ar)
 		{
 			return ar.InitDict.Get<LocationInit>().value;
-		}
-
-		public static void DrawStringContrast(this SGraphics g, Font f, string s, int x, int y, Brush fg, Brush bg)
-		{
-			g.DrawString(s, f, bg, x - 1, y - 1);
-			g.DrawString(s, f, bg, x + 1, y - 1);
-			g.DrawString(s, f, bg, x - 1, y + 1);
-			g.DrawString(s, f, bg, x + 1, y + 1);
-
-			g.DrawString(s, f, fg, x, y);
+		}
+
+		public static void DrawStringContrast(this SGraphics g, Font f, string s, int x, int y, Brush fg, Brush bg)
+		{
+			g.DrawString(s, f, bg, x - 1, y - 1);
+			g.DrawString(s, f, bg, x + 1, y - 1);
+			g.DrawString(s, f, bg, x - 1, y + 1);
+			g.DrawString(s, f, bg, x + 1, y + 1);
+
+			g.DrawString(s, f, fg, x, y);
 		}
 	}
 }

OpenRA.FileFormats/Exts.cs

@@ -105,42 +105,54 @@ namespace OpenRA
 		public static bool Contains(this RectangleF r, int2 p)
 		{
 			return r.Contains(p.ToPointF());
-		}
-
-        public static bool HasModifier(this Modifiers k, Modifiers mod)
-        {
-            return (k & mod) == mod;
-        }
-
-        public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
-            where V : new()
-        {
-            return d.GetOrAdd(k, _ => new V());
-        }
-
-        public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
-        {
-            V ret;
-            if (!d.TryGetValue(k, out ret))
-                d.Add(k, ret = createFn(k));
-            return ret;
-        }
-
-        public static T Random<T>(this IEnumerable<T> ts, Thirdparty.Random r)
-        {
-            var xs = ts.ToArray();
-            return xs[r.Next(xs.Length)];
-        }
-
-        public static float Product(this IEnumerable<float> xs)
-        {
-            return xs.Aggregate(1f, (a, x) => a * x);
-        }
-
-        public static IEnumerable<T> SymmetricDifference<T>(this IEnumerable<T> xs, IEnumerable<T> ys)
-        {
-            // this is probably a shockingly-slow way to do this, but it's concise.
-            return xs.Except(ys).Concat(ys.Except(xs));
+		}
+
+        public static bool HasModifier(this Modifiers k, Modifiers mod)
+        {
+            return (k & mod) == mod;
         }
+		
+		public static bool IsValidInput(this KeyInput key)
+		{
+			return char.IsLetter(key.UnicodeChar) || char.IsDigit(key.UnicodeChar) || 
+					char.IsSymbol(key.UnicodeChar) || char.IsSeparator(key.UnicodeChar) || 
+					char.IsPunctuation(key.UnicodeChar);
+		}
+
+        public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
+            where V : new()
+        {
+            return d.GetOrAdd(k, _ => new V());
+        }
+
+        public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
+        {
+            V ret;
+            if (!d.TryGetValue(k, out ret))
+                d.Add(k, ret = createFn(k));
+            return ret;
+        }
+
+        public static T Random<T>(this IEnumerable<T> ts, Thirdparty.Random r)
+        {
+            var xs = ts.ToArray();
+            return xs[r.Next(xs.Length)];
+        }
+
+        public static float Product(this IEnumerable<float> xs)
+        {
+            return xs.Aggregate(1f, (a, x) => a * x);
+        }
+
+        public static IEnumerable<T> SymmetricDifference<T>(this IEnumerable<T> xs, IEnumerable<T> ys)
+        {
+            // this is probably a shockingly-slow way to do this, but it's concise.
+            return xs.Except(ys).Concat(ys.Except(xs));
+        }
+		
+		public static IEnumerable<T> Iterate<T>( this T t, Func<T,T> f )
+		{
+			for(;;) { yield return t; t = f(t); }
+		}
 	}
 }

OpenRA.FileFormats/FileFormats/AudLoader.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made 
@@ -141,9 +141,13 @@ namespace OpenRA.FileFormats
 					output[offset++] = (byte)t;
 					output[offset++] = (byte)(t >> 8);
 		
-					t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
-					output[offset++] = (byte)t;
-					output[offset++] = (byte)(t >> 8);
+					if (offset < outputSize)
+					{ 
+						/* possible that only half of the final byte is used! */
+						t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+						output[offset++] = (byte)t;
+						output[offset++] = (byte)(t >> 8);
+					}
 				}
 
 				dataSize -= 8 + chunk.CompressedSize;

OpenRA.FileFormats/Filesystem/FileSystem.cs

@@ -11,8 +11,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Linq;
+using System.Reflection;
 
 namespace OpenRA.FileFormats
 {

OpenRA.FileFormats/Filesystem/Folder.cs

@@ -63,8 +63,8 @@ namespace OpenRA.FileFormats
 		}
 		
 		public void Write(Dictionary<string, byte[]> contents)
-		{
-			if (!Directory.Exists(path))
+		{
+			if (!Directory.Exists(path))
 				Directory.CreateDirectory(path);
 
 			foreach (var file in contents)

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -35,7 +35,7 @@ namespace OpenRA.FileFormats.Graphics
 		ITexture CreateTexture();
 		IShader CreateShader( string name );
 
-		Size WindowSize { get; }
+		Size WindowSize { get; }
 		int GpuMemoryUsed { get; }
 
 		void Clear( Color color );

OpenRA.FileFormats/Graphics/IInputHandler.cs

@@ -57,13 +57,14 @@ namespace OpenRA
 		Shift = 1,
 		Alt = 2,
 		Ctrl = 4,
+		Meta = 8,
 	}
 
 	public enum KeyInputEvent { Down, Up };
 	public struct KeyInput
 	{
 		public KeyInputEvent Event;
-		public char KeyChar;
+		public char UnicodeChar;
 		public string KeyName;
 		public Modifiers Modifiers;
 		public int VirtKey;

OpenRA.FileFormats/Graphics/PngLoader.cs

@@ -1,181 +1,181 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.IO.Compression;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	public static class PngLoader
-	{
-		public static Bitmap Load(string filename)
-		{
-			return Load(File.OpenRead(filename));
-		}
-
-		public static Bitmap Load(Stream s)
-		{
-			using (var br = new BinaryReader(s))
-			{
-				var signature = new byte[] { 137, 80, 78, 71, 13, 10, 26, 10 };
-				foreach (var b in signature)
-					if (br.ReadByte() != b)
-						throw new InvalidDataException("PNG Signature is bogus");
-
-				Bitmap bitmap = null;
-				Color[] palette = null;
-				List<byte> data = new List<byte>();
-
-				for (; ; )
-				{
-					var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
-					var type = Encoding.UTF8.GetString(br.ReadBytes(4));
-					var content = br.ReadBytes(length);
-					var crc = br.ReadInt32();
-
-					using (var ms = new MemoryStream(content))
-					using (var cr = new BinaryReader(ms))
-						switch (type)
-						{
-							case "IHDR":
-								{
-
-									var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-									var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-									var bitDepth = cr.ReadByte();
-									var colorType = (PngColorType)cr.ReadByte();
-									var compression = cr.ReadByte();
-									var filter = cr.ReadByte();
-									var interlace = cr.ReadByte();
-
-									if (compression != 0) throw new InvalidDataException("Compression method not supported");
-									if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
-
-									bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
-
-								}
-								break;
-
-							case "PLTE":
-								{
-									palette = new Color[256];
-									for (var i = 0; i < 256; i++)
-									{
-										var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
-										palette[i] = Color.FromArgb(r, g, b);
-									}
-								}
-								break;
-
-							case "tRNS":
-								{
-									for (var i = 0; i < length; i++)
-										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
-								}
-								break;
-
-							case "IDAT":
-								{
-									data.AddRange(content);
-								}
-								break;
-
-							case "IEND":
-								{
-									var bits = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-									using (var ns = new MemoryStream(data.ToArray()))
-									{
-										// 'zlib' flags bytes; confuses the DeflateStream.
-										var flags = (byte)ns.ReadByte();
-										var moreFlags = (byte)ns.ReadByte();
-
-										using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
-										using (var dr = new BinaryReader(ds))
-										{
-											var prevLine = new byte[bitmap.Width];	// all zero
-											for (var y = 0; y < bitmap.Height; y++)
-											{
-												var filter = (PngFilter)dr.ReadByte();
-												var line = dr.ReadBytes(bitmap.Width);
-
-												for (var i = 0; i < bitmap.Width; i++)
-													line[i] = i > 0
-														? UnapplyFilter(filter, line[i], line[i - 1], prevLine[i], prevLine[i - 1])
-														: UnapplyFilter(filter, line[i], 0, prevLine[i], 0);
-
-												Marshal.Copy(line, 0, new IntPtr(bits.Scan0.ToInt64() + y * bits.Stride), line.Length);
-												prevLine = line;
-											}
-										}
-									}
-
-									bitmap.UnlockBits(bits);
-
-									using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-									{
-										var cp = temp.Palette;
-										for (var i = 0; i < 256; i++)
-											cp.Entries[i] = palette[i];		// finalize the palette.
-										bitmap.Palette = cp;
-										return bitmap;
-									}
-								}
-						}
-				}
-			}
-		}
-
-		static byte UnapplyFilter(PngFilter f, byte x, byte a, byte b, byte c)
-		{
-			switch (f)
-			{
-				case PngFilter.None: return x;
-				case PngFilter.Sub: return (byte)(x + a);
-				case PngFilter.Up: return (byte)(x + b);
-				case PngFilter.Average: return (byte)(x + (a + b) / 2);
-				case PngFilter.Paeth: return (byte)(x + Paeth(a, b, c));
-				default:
-					throw new InvalidOperationException("Unsupported Filter");
-			}
-		}
-
-		static byte Paeth(byte a, byte b, byte c)
-		{
-			var p = a + b - c;
-			var pa = Math.Abs(p - a);
-			var pb = Math.Abs(p - b);
-			var pc = Math.Abs(p - c);
-
-			return (pa <= pb && pa <= pc) ? a :
-				(pb <= pc) ? b : c;
-		}
-
-		[Flags]
-		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 };
-		enum PngFilter { None, Sub, Up, Average, Paeth };
-
-		static PixelFormat MakePixelFormat(byte bitDepth, PngColorType colorType)
-		{
-			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
-				return PixelFormat.Format8bppIndexed;
-
-			throw new InvalidDataException("Unknown pixelformat");
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.IO.Compression;
+using System.Net;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	public static class PngLoader
+	{
+		public static Bitmap Load(string filename)
+		{
+			return Load(File.OpenRead(filename));
+		}
+
+		public static Bitmap Load(Stream s)
+		{
+			using (var br = new BinaryReader(s))
+			{
+				var signature = new byte[] { 137, 80, 78, 71, 13, 10, 26, 10 };
+				foreach (var b in signature)
+					if (br.ReadByte() != b)
+						throw new InvalidDataException("PNG Signature is bogus");
+
+				Bitmap bitmap = null;
+				Color[] palette = null;
+				List<byte> data = new List<byte>();
+
+				for (; ; )
+				{
+					var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
+					var type = Encoding.UTF8.GetString(br.ReadBytes(4));
+					var content = br.ReadBytes(length);
+					/*var crc = */br.ReadInt32();
+
+					using (var ms = new MemoryStream(content))
+					using (var cr = new BinaryReader(ms))
+						switch (type)
+						{
+							case "IHDR":
+								{
+
+									var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
+									var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
+									var bitDepth = cr.ReadByte();
+									var colorType = (PngColorType)cr.ReadByte();
+									var compression = cr.ReadByte();
+									/*var filter = */cr.ReadByte();
+									var interlace = cr.ReadByte();
+
+									if (compression != 0) throw new InvalidDataException("Compression method not supported");
+									if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
+
+									bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
+
+								}
+								break;
+
+							case "PLTE":
+								{
+									palette = new Color[256];
+									for (var i = 0; i < 256; i++)
+									{
+										var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
+										palette[i] = Color.FromArgb(r, g, b);
+									}
+								}
+								break;
+
+							case "tRNS":
+								{
+									for (var i = 0; i < length; i++)
+										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
+								}
+								break;
+
+							case "IDAT":
+								{
+									data.AddRange(content);
+								}
+								break;
+
+							case "IEND":
+								{
+									var bits = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+									using (var ns = new MemoryStream(data.ToArray()))
+									{
+										// 'zlib' flags bytes; confuses the DeflateStream.
+										/*var flags = (byte)*/ns.ReadByte();
+										/*var moreFlags = (byte)*/ns.ReadByte();
+
+										using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
+										using (var dr = new BinaryReader(ds))
+										{
+											var prevLine = new byte[bitmap.Width];	// all zero
+											for (var y = 0; y < bitmap.Height; y++)
+											{
+												var filter = (PngFilter)dr.ReadByte();
+												var line = dr.ReadBytes(bitmap.Width);
+
+												for (var i = 0; i < bitmap.Width; i++)
+													line[i] = i > 0
+														? UnapplyFilter(filter, line[i], line[i - 1], prevLine[i], prevLine[i - 1])
+														: UnapplyFilter(filter, line[i], 0, prevLine[i], 0);
+
+												Marshal.Copy(line, 0, new IntPtr(bits.Scan0.ToInt64() + y * bits.Stride), line.Length);
+												prevLine = line;
+											}
+										}
+									}
+
+									bitmap.UnlockBits(bits);
+
+									using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
+									{
+										var cp = temp.Palette;
+										for (var i = 0; i < 256; i++)
+											cp.Entries[i] = palette[i];		// finalize the palette.
+										bitmap.Palette = cp;
+										return bitmap;
+									}
+								}
+						}
+				}
+			}
+		}
+
+		static byte UnapplyFilter(PngFilter f, byte x, byte a, byte b, byte c)
+		{
+			switch (f)
+			{
+				case PngFilter.None: return x;
+				case PngFilter.Sub: return (byte)(x + a);
+				case PngFilter.Up: return (byte)(x + b);
+				case PngFilter.Average: return (byte)(x + (a + b) / 2);
+				case PngFilter.Paeth: return (byte)(x + Paeth(a, b, c));
+				default:
+					throw new InvalidOperationException("Unsupported Filter");
+			}
+		}
+
+		static byte Paeth(byte a, byte b, byte c)
+		{
+			var p = a + b - c;
+			var pa = Math.Abs(p - a);
+			var pb = Math.Abs(p - b);
+			var pc = Math.Abs(p - c);
+
+			return (pa <= pb && pa <= pc) ? a :
+				(pb <= pc) ? b : c;
+		}
+
+		[Flags]
+		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 };
+		enum PngFilter { None, Sub, Up, Average, Paeth };
+
+		static PixelFormat MakePixelFormat(byte bitDepth, PngColorType colorType)
+		{
+			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
+				return PixelFormat.Format8bppIndexed;
+
+			throw new InvalidDataException("Unknown pixelformat");
+		}
+	}
+}

OpenRA.FileFormats/Graphics/ShpWriter.cs

@@ -1,46 +1,56 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	// format80-only SHP writer
-
-	public static class ShpWriter
-	{
-		public static void Write(Stream s, int width, int height, IEnumerable<byte[]> frames)
-		{
-			var compressedFrames = frames.Select(f => Format80.Encode(f)).ToArray();
-
-			// note: end-of-file and all-zeroes headers
-			var dataOffset = 14 + (compressedFrames.Length + 2) * ImageHeader.SizeOnDisk;
-
-			using (var bw = new BinaryWriter(s))
-			{
-				bw.Write((ushort)compressedFrames.Length);
-				bw.Write((ushort)0);	// unused
-				bw.Write((ushort)0);	// unused
-				bw.Write((ushort)width);
-				bw.Write((ushort)height);
-				bw.Write((uint)0);		// unused
-
-				foreach (var f in compressedFrames)
-				{
-					var ih = new ImageHeader { Format = Format.Format80, Offset = (uint)dataOffset };
-					dataOffset += f.Length;
-
-					ih.WriteTo(bw);
-				}
-
-				var eof = new ImageHeader { Offset = (uint)dataOffset };
-				eof.WriteTo(bw);
-
-				var allZeroes = new ImageHeader { };
-				allZeroes.WriteTo(bw);
-
-				foreach (var f in compressedFrames)
-					bw.Write(f);
-			}
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	// format80-only SHP writer
+
+	public static class ShpWriter
+	{
+		public static void Write(Stream s, int width, int height, IEnumerable<byte[]> frames)
+		{
+			var compressedFrames = frames.Select(f => Format80.Encode(f)).ToArray();
+
+			// note: end-of-file and all-zeroes headers
+			var dataOffset = 14 + (compressedFrames.Length + 2) * ImageHeader.SizeOnDisk;
+
+			using (var bw = new BinaryWriter(s))
+			{
+				bw.Write((ushort)compressedFrames.Length);
+				bw.Write((ushort)0);	// unused
+				bw.Write((ushort)0);	// unused
+				bw.Write((ushort)width);
+				bw.Write((ushort)height);
+				bw.Write((uint)0);		// unused
+
+				foreach (var f in compressedFrames)
+				{
+					var ih = new ImageHeader { Format = Format.Format80, Offset = (uint)dataOffset };
+					dataOffset += f.Length;
+
+					ih.WriteTo(bw);
+				}
+
+				var eof = new ImageHeader { Offset = (uint)dataOffset };
+				eof.WriteTo(bw);
+
+				var allZeroes = new ImageHeader { };
+				allZeroes.WriteTo(bw);
+
+				foreach (var f in compressedFrames)
+					bw.Write(f);
+			}
+		}
+	}
+}

OpenRA.FileFormats/Manifest.cs

@@ -29,7 +29,7 @@ namespace OpenRA.FileFormats
 			Mods = mods;
 			var yaml = mods
 				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
-				.Aggregate(MiniYaml.Merge);
+				.Aggregate(MiniYaml.MergeLiberal);
 			
 			// Todo: Use fieldloader
 			Folders = YamlList(yaml, "Folders");

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -38,13 +38,5 @@ namespace OpenRA.FileFormats
 		{
 			FieldLoader.Load(this, my);
 		}
-		
-		public PlayerReference(string name, string race, bool ownsworld, bool noncombatant)
-		{
-			Name = name;
-			Race = race;
-			OwnsWorld = ownsworld;
-			NonCombatant = noncombatant;
-		}
 	}
 }

OpenRA.FileFormats/MiniYaml.cs

@@ -22,6 +22,7 @@ namespace OpenRA.FileFormats
 		public struct SourceLocation
 		{
 			public string Filename; public int Line;
+            public override string ToString() { return "{0}:{1}".F(Filename, Line); }
 		}
 
 		public SourceLocation Location;
@@ -53,6 +54,11 @@ namespace OpenRA.FileFormats
 			: this( k, new MiniYaml( v, n ), loc )
 		{
 		}
+
+        public override string ToString()
+        {
+            return "{{YamlNode: {0} @ {1}}}".F(Key, Location);
+        }
 	}
 
 	public class MiniYaml
@@ -95,7 +101,7 @@ namespace OpenRA.FileFormats
 				var level = line.Length - t.Length;
 
 				if (levels.Count <= level)
-					throw new InvalidOperationException("Bad indent in miniyaml");
+					throw new YamlException("Bad indent in miniyaml");
 				while (levels.Count > level + 1)
 					levels.RemoveAt(levels.Count - 1);
 
@@ -158,7 +164,17 @@ namespace OpenRA.FileFormats
 			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), "<no filename available>");
 		}
 
-		public static List<MiniYamlNode> Merge( List<MiniYamlNode> a, List<MiniYamlNode> b )
+        public static List<MiniYamlNode> MergeLiberal(List<MiniYamlNode> a, List<MiniYamlNode> b)
+        {
+            return Merge(a, b, false);
+        }
+
+        public static List<MiniYamlNode> MergeStrict(List<MiniYamlNode> a, List<MiniYamlNode> b)
+        {
+            return Merge(a, b, true);
+        }
+
+		static List<MiniYamlNode> Merge( List<MiniYamlNode> a, List<MiniYamlNode> b, bool throwErrors )
 		{
 			if( a.Count == 0 )
 				return b;
@@ -171,7 +187,8 @@ namespace OpenRA.FileFormats
 			var bDict = b.ToDictionary( x => x.Key );
 			var keys = aDict.Keys.Union( bDict.Keys ).ToList();
 
-			var noInherit = keys.Where( x => x.Length > 0 && x[ 0 ] == '-' ).Select( x => x.Substring( 1 ) ).ToList();
+            var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-')
+                .ToDictionary(x => x.Substring(1), x => false);
 
 			foreach( var key in keys )
 			{
@@ -179,30 +196,48 @@ namespace OpenRA.FileFormats
 				aDict.TryGetValue( key, out aa );
 				bDict.TryGetValue( key, out bb );
 
-				if( noInherit.Contains( key ) )
+				if( noInherit.ContainsKey( key ) )
 				{
-					if( aa != null )
-						ret.Add( aa );
+                    if (!throwErrors)
+                        if (aa != null)
+                            ret.Add(aa);
+
+                    noInherit[key] = true;
 				}
 				else
 				{
 					var loc = aa == null ? default( MiniYamlNode.SourceLocation ) : aa.Location;
-					var merged = ( aa == null || bb == null ) ? aa ?? bb : new MiniYamlNode( key, Merge( aa.Value, bb.Value ), loc );
+					var merged = ( aa == null || bb == null ) ? aa ?? bb : new MiniYamlNode( key, Merge( aa.Value, bb.Value, throwErrors ), loc );
 					ret.Add( merged );
 				}
 			}
 
+            if (throwErrors)
+            if (noInherit.ContainsValue(false))
+                throw new YamlException("Bogus yaml removals: {0}".F(
+                    string.Join(", ", noInherit.Where(x => !x.Value).Select(x => x.Key).ToArray())));
+
 			return ret;
 		}
 
-		public static MiniYaml Merge( MiniYaml a, MiniYaml b )
+        public static MiniYaml MergeLiberal(MiniYaml a, MiniYaml b)
+        {
+            return Merge(a, b, false);
+        }
+
+        public static MiniYaml MergeStrict(MiniYaml a, MiniYaml b)
+        {
+            return Merge(a, b, true);
+        }
+
+		static MiniYaml Merge( MiniYaml a, MiniYaml b, bool throwErrors )
 		{
 			if( a == null )
 				return b;
 			if( b == null )
 				return a;
 
-			return new MiniYaml( a.Value ?? b.Value, Merge( a.Nodes, b.Nodes ) );
+			return new MiniYaml( a.Value ?? b.Value, Merge( a.Nodes, b.Nodes, throwErrors ) );
 		}
 
 		public IEnumerable<string> ToLines(string name)
@@ -237,4 +272,9 @@ namespace OpenRA.FileFormats
 			}
 		}
 	}
+
+    public class YamlException : Exception
+    {
+        public YamlException(string s) : base(s) { }
+    }
 }

OpenRA.FileFormats/Mod.cs

@@ -1,47 +1,47 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made 
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
  * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public class Mod
-	{
-		public string Title;
-		public string Description;
-		public string Version;
-		public string Author;
-		public string Requires;
-		public bool Standalone = false;
-
-		public static readonly Dictionary<string, Mod> AllMods = ValidateMods(Directory.GetDirectories("mods").Select(x => x.Substring(5)).ToArray());
-
-		public static Dictionary<string, Mod> ValidateMods(string[] mods)
-		{
-			var ret = new Dictionary<string, Mod>();
-			foreach (var m in mods)
-			{
-				if (!File.Exists("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"))
-					continue;
-
-				var yaml = new MiniYaml(null, MiniYaml.FromFile("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"));
-				if (!yaml.NodesDict.ContainsKey("Metadata"))
-					continue;
-
-				ret.Add(m, FieldLoader.Load<Mod>(yaml.NodesDict["Metadata"]));
-			}
-			return ret;
-		}
-	}
-}
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class Mod
+	{
+		public string Title;
+		public string Description;
+		public string Version;
+		public string Author;
+		public string Requires;
+		public bool Standalone = false;
+
+		public static readonly Dictionary<string, Mod> AllMods = ValidateMods(Directory.GetDirectories("mods").Select(x => x.Substring(5)).ToArray());
+
+		public static Dictionary<string, Mod> ValidateMods(string[] mods)
+		{
+			var ret = new Dictionary<string, Mod>();
+			foreach (var m in mods)
+			{
+				if (!File.Exists("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"))
+					continue;
+
+				var yaml = new MiniYaml(null, MiniYaml.FromFile("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"));
+				if (!yaml.NodesDict.ContainsKey("Metadata"))
+					continue;
+
+				ret.Add(m, FieldLoader.Load<Mod>(yaml.NodesDict["Metadata"]));
+			}
+			return ret;
+		}
+	}
+}

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.FileFormats</RootNamespace>
-    <AssemblyName>OpenRA.FileFormats</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ColorHSLR.cs" />
-    <Compile Include="Evaluator.cs" />
-    <Compile Include="Exts.cs" />
-    <Compile Include="FieldLoader.cs" />
-    <Compile Include="Graphics\IGraphicsDevice.cs" />
-    <Compile Include="Graphics\IInputHandler.cs" />
-    <Compile Include="Graphics\PngLoader.cs" />
-    <Compile Include="Graphics\ShpWriter.cs" />
-    <Compile Include="Graphics\Vertex.cs" />
-    <Compile Include="HttpUtil.cs" />
-    <Compile Include="Manifest.cs" />
-    <Compile Include="MiniYaml.cs" />
-    <Compile Include="Mod.cs" />
-    <Compile Include="PackageEntry.cs" />
-    <Compile Include="Palette.cs" />
-    <Compile Include="PlayerColorRemap.cs" />
-    <Compile Include="Primitives\ActionQueue.cs" />
-    <Compile Include="Primitives\DisposableAction.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Thirdparty\Random.cs" />
-    <Compile Include="Support\Log.cs" />
-    <Compile Include="Support\Stopwatch.cs" />
-    <Compile Include="Support\Timer.cs" />
-    <Compile Include="TypeDictionary.cs" />
-    <Compile Include="Map\TileReference.cs" />
-    <Compile Include="Map\Terrain.cs" />
-    <Compile Include="Primitives\Cache.cs" />
-    <Compile Include="Primitives\float2.cs" />
-    <Compile Include="Primitives\Pair.cs" />
-    <Compile Include="Map\TileSet.cs" />
-    <Compile Include="Primitives\PriorityQueue.cs" />
-    <Compile Include="Primitives\Lazy.cs" />
-    <Compile Include="FileFormats\AudLoader.cs" />
-    <Compile Include="FileFormats\Blowfish.cs" />
-    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
-    <Compile Include="Primitives\Set.cs" />
-    <Compile Include="Graphics\Dune2ShpReader.cs" />
-    <Compile Include="FileFormats\Format2.cs" />
-    <Compile Include="FileFormats\Format40.cs" />
-    <Compile Include="FileFormats\Format80.cs" />
-    <Compile Include="FileFormats\IniFile.cs" />
-    <Compile Include="Graphics\ShpReader.cs" />
-    <Compile Include="Primitives\int2.cs" />
-    <Compile Include="Map\SmudgeReference.cs" />
-    <Compile Include="Map\PlayerReference.cs" />
-    <Compile Include="Graphics\VqaReader.cs" />
-    <Compile Include="Filesystem\MixFile.cs" />
-    <Compile Include="Filesystem\FileSystem.cs" />
-    <Compile Include="Filesystem\Folder.cs" />
-    <Compile Include="Filesystem\InstallShieldPackage.cs" />
-    <Compile Include="FileFormats\Blast.cs" />
-    <Compile Include="Filesystem\ZipFile.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA.FileFormats</RootNamespace>
+    <AssemblyName>OpenRA.FileFormats</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ColorHSLR.cs" />
+    <Compile Include="Evaluator.cs" />
+    <Compile Include="Exts.cs" />
+    <Compile Include="FieldLoader.cs" />
+    <Compile Include="Graphics\IGraphicsDevice.cs" />
+    <Compile Include="Graphics\IInputHandler.cs" />
+    <Compile Include="Graphics\PngLoader.cs" />
+    <Compile Include="Graphics\ShpWriter.cs" />
+    <Compile Include="Graphics\Vertex.cs" />
+    <Compile Include="HttpUtil.cs" />
+    <Compile Include="Manifest.cs" />
+    <Compile Include="MiniYaml.cs" />
+    <Compile Include="Mod.cs" />
+    <Compile Include="PackageEntry.cs" />
+    <Compile Include="Palette.cs" />
+    <Compile Include="PlayerColorRemap.cs" />
+    <Compile Include="Primitives\ActionQueue.cs" />
+    <Compile Include="Primitives\DisposableAction.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Thirdparty\Random.cs" />
+    <Compile Include="Support\Log.cs" />
+    <Compile Include="Support\Stopwatch.cs" />
+    <Compile Include="Support\Timer.cs" />
+    <Compile Include="TypeDictionary.cs" />
+    <Compile Include="Map\TileReference.cs" />
+    <Compile Include="Map\Terrain.cs" />
+    <Compile Include="Primitives\Cache.cs" />
+    <Compile Include="Primitives\float2.cs" />
+    <Compile Include="Primitives\Pair.cs" />
+    <Compile Include="Map\TileSet.cs" />
+    <Compile Include="Primitives\PriorityQueue.cs" />
+    <Compile Include="Primitives\Lazy.cs" />
+    <Compile Include="FileFormats\AudLoader.cs" />
+    <Compile Include="FileFormats\Blowfish.cs" />
+    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
+    <Compile Include="Primitives\Set.cs" />
+    <Compile Include="Graphics\Dune2ShpReader.cs" />
+    <Compile Include="FileFormats\Format2.cs" />
+    <Compile Include="FileFormats\Format40.cs" />
+    <Compile Include="FileFormats\Format80.cs" />
+    <Compile Include="FileFormats\IniFile.cs" />
+    <Compile Include="Graphics\ShpReader.cs" />
+    <Compile Include="Primitives\int2.cs" />
+    <Compile Include="Map\SmudgeReference.cs" />
+    <Compile Include="Map\PlayerReference.cs" />
+    <Compile Include="Graphics\VqaReader.cs" />
+    <Compile Include="Filesystem\MixFile.cs" />
+    <Compile Include="Filesystem\FileSystem.cs" />
+    <Compile Include="Filesystem\Folder.cs" />
+    <Compile Include="Filesystem\InstallShieldPackage.cs" />
+    <Compile Include="FileFormats\Blast.cs" />
+    <Compile Include="Filesystem\ZipFile.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

OpenRA.FileFormats/Primitives/Cache.cs

@@ -15,7 +15,7 @@ using System.Collections.Generic;
 namespace OpenRA.FileFormats
 {
 	public class Cache<T, U> : IEnumerable<KeyValuePair<T, U>>
-	{
+	{
 		Dictionary<T, U> hax;
 		Func<T,U> loader;
 
@@ -26,10 +26,10 @@ namespace OpenRA.FileFormats
 				throw new ArgumentNullException();
 
 			this.loader = loader;
-		}
-
-		public Cache(Func<T, U> loader)
-			: this(loader, EqualityComparer<T>.Default) { }
+		}
+
+		public Cache(Func<T, U> loader)
+			: this(loader, EqualityComparer<T>.Default) { }
 
 		public U this[T key]
 		{

OpenRA.FileFormats/Primitives/Lazy.cs

@@ -36,11 +36,13 @@ namespace OpenRA.FileFormats
 				p = null;
 				return value;
 			}
-		}
-
-        public void Force()
-        {
-            var ignored = Value;
+		}
+
+        public void Force()
+        {
+            #pragma warning disable 0168
+			var ignored = Value;
+			#pragma warning restore 0168
         }
 	}
 

OpenRA.FileFormats/Primitives/Pair.cs

@@ -8,8 +8,8 @@
  */
 #endregion
 
-using System.Collections.Generic;
-using System;
+using System.Collections.Generic;
+using System;
 using System.Drawing;
 
 namespace OpenRA.FileFormats
@@ -25,7 +25,7 @@ namespace OpenRA.FileFormats
 			Second = second;
 		}
 
-		internal static IEqualityComparer<T> tc = EqualityComparer<T>.Default;
+		internal static IEqualityComparer<T> tc = EqualityComparer<T>.Default;
 		internal static IEqualityComparer<U> uc = EqualityComparer<U>.Default;
 
 		public static bool operator ==(Pair<T, U> a, Pair<T, U> b)
@@ -60,31 +60,31 @@ namespace OpenRA.FileFormats
 		public override string ToString()
 		{
 			return "({0},{1})".F(First, Second);
-		}
-
-		class PairEqualityComparer : IEqualityComparer<Pair<T, U>>
-		{
-			public bool Equals(Pair<T, U> x, Pair<T, U> y) { return x == y; }
-			public int GetHashCode(Pair<T, U> obj) { return obj.GetHashCode(); }
-		}
-
+		}
+
+		class PairEqualityComparer : IEqualityComparer<Pair<T, U>>
+		{
+			public bool Equals(Pair<T, U> x, Pair<T, U> y) { return x == y; }
+			public int GetHashCode(Pair<T, U> obj) { return obj.GetHashCode(); }
+		}
+
 		public static IEqualityComparer<Pair<T, U>> EqualityComparer { get { return new PairEqualityComparer(); } }
 	}
 
     public static class Pair
-    {
-		public static Pair<T, U> New<T, U>(T t, U u) { return new Pair<T, U>(t, u); }
-		
-		static Pair()
-		{
-			Pair<char,Color>.uc = new ColorEqualityComparer();
-		}
-
-		// avoid the default crappy one
-		class ColorEqualityComparer : IEqualityComparer<Color>
-		{
-			public bool Equals(Color x, Color y) { return x.ToArgb() == y.ToArgb(); }
-			public int GetHashCode(Color obj) { return obj.GetHashCode(); }
-		}
+    {
+		public static Pair<T, U> New<T, U>(T t, U u) { return new Pair<T, U>(t, u); }
+		
+		static Pair()
+		{
+			Pair<char,Color>.uc = new ColorEqualityComparer();
+		}
+
+		// avoid the default crappy one
+		class ColorEqualityComparer : IEqualityComparer<Color>
+		{
+			public bool Equals(Color x, Color y) { return x.ToArgb() == y.ToArgb(); }
+			public int GetHashCode(Color obj) { return obj.GetHashCode(); }
+		}
     }
 }

OpenRA.FileFormats/Primitives/Set.cs

@@ -45,22 +45,4 @@ namespace OpenRA.Collections
 			return GetEnumerator();
 		}
 	}
-
-	public class CachedView<T,U> : Set<U>
-	{
-		public CachedView( Set<T> set, Func<T, bool> include, Func<T, U> store )
-			: this( set, include, x => new[] { store( x ) } )
-		{
-		}
-
-		public CachedView( Set<T> set, Func<T,bool> include, Func<T,IEnumerable<U>> store )
-		{
-			foreach( var t in set )
-				if( include( t ) )
-					store( t ).Do( x => Add( x ) );
-
-			set.OnAdd += obj => { if( include( obj ) ) store( obj ).Do( x => Add( x ) ); };
-			set.OnRemove += obj => { if( include( obj ) ) store( obj ).Do( x => Remove( x ) ); };
-		}
-	}
 }

OpenRA.FileFormats/Properties/AssemblyInfo.cs

@@ -1,36 +1,26 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("OpenRA.FileFormats")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenRA.FileFormats")]
-[assembly: AssemblyCopyright("Copyright ©  2007,2009,2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("OpenRA.FileFormats")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenRA.FileFormats")]
+[assembly: AssemblyCopyright("Copyright ©  2007,2009,2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

OpenRA.FileFormats/Support/Log.cs

@@ -34,33 +34,38 @@ namespace OpenRA
 			set
 			{
 				LogPathPrefix = value;				
-				if (!Directory.Exists(LogPathPrefix))
-					Directory.CreateDirectory(LogPathPrefix);
+				Directory.CreateDirectory(LogPathPrefix);
 			}
 		}
-		
-		public static void AddChannel(string channelName, string filename)
-		{
-			if (channels.ContainsKey(channelName)) return;
-			
-			var i = 0;
-			var f = filename;
-			while (File.Exists(LogPathPrefix + filename))
-				try 
-				{
-					StreamWriter writer = File.CreateText(LogPathPrefix + filename);
-					writer.AutoFlush = true;
-					channels.Add(channelName, new ChannelInfo() { Filename = filename, Writer = writer });
-					return;
-				}
-				catch (IOException) { filename = f + ".{0}".F(++i); }
-			
-			//if no logs exist, just make it
-			StreamWriter w = File.CreateText(LogPathPrefix + filename);
-			w.AutoFlush = true;
-			channels.Add(channelName, new ChannelInfo() { Filename = filename, Writer = w });
-			
-		}
+
+        static IEnumerable<string> FilenamesForChannel(string channelName, string baseFilename)
+        {
+            for(var i = 0;; i++ )
+                yield return Path.Combine(LogPathPrefix, 
+                    i > 0 ? "{0}.{1}".F(baseFilename, i) : baseFilename);
+        }
+
+        public static void AddChannel(string channelName, string baseFilename)
+        {
+            if (channels.ContainsKey(channelName)) return;
+
+            foreach (var filename in FilenamesForChannel(channelName, baseFilename))
+                try
+                {
+                    var writer = File.CreateText(filename);
+                    writer.AutoFlush = true;
+
+                    channels.Add(channelName,
+                        new ChannelInfo()
+                        {
+                            Filename = filename,
+                            Writer = writer
+                        });
+
+                    return;
+                }
+                catch (IOException) { }
+        }
 
 		public static void Write(string channel, string format, params object[] args)
 		{

OpenRA.Game/Actor.cs

@@ -31,7 +31,7 @@ namespace OpenRA
 		[Sync]
 		public Player Owner;
 
-		private IActivity currentActivity;
+		private Activity currentActivity;
 		public Group Group;
 
 		internal Actor(World world, string name, TypeDictionary initDict )
@@ -65,7 +65,7 @@ namespace OpenRA
                 return firstSprite.Sprite.size * firstSprite.Scale;
 			});
 
-			ApplyIRender = x => x.Render(this);
+			ApplyIRender = x => x.Render(this);
 			ApplyRenderModifier = (m, p) => p.ModifyRender(this, m);
 		}
 
@@ -83,14 +83,14 @@ namespace OpenRA
 			get { return currentActivity == null; }
 		}
 
-        OpenRA.FileFormats.Lazy<float2> Size;
-
-		// note: these delegates are cached to avoid massive allocation.
-		Func<IRender, IEnumerable<Renderable>> ApplyIRender;
+        OpenRA.FileFormats.Lazy<float2> Size;
+
+		// note: these delegates are cached to avoid massive allocation.
+		Func<IRender, IEnumerable<Renderable>> ApplyIRender;
 		Func<IEnumerable<Renderable>, IRenderModifier, IEnumerable<Renderable>> ApplyRenderModifier;
 		public IEnumerable<Renderable> Render()
 		{
-			var mods = TraitsImplementing<IRenderModifier>();
+			var mods = TraitsImplementing<IRenderModifier>();
 			var sprites = TraitsImplementing<IRender>().SelectMany(ApplyIRender);
 			return mods.Aggregate(sprites, ApplyRenderModifier);
 		}
@@ -121,14 +121,14 @@ namespace OpenRA
 
 		public bool IsInWorld { get; internal set; }
 
-		public void QueueActivity( bool queued, IActivity nextActivity )
+		public void QueueActivity( bool queued, Activity nextActivity )
 		{
 			if( !queued )
 				CancelActivity();
 			QueueActivity( nextActivity );
 		}
 
-		public void QueueActivity( IActivity nextActivity )
+		public void QueueActivity( Activity nextActivity )
 		{
 			if( currentActivity == null )
 				currentActivity = nextActivity;
@@ -142,7 +142,7 @@ namespace OpenRA
 				currentActivity.Cancel( this );
 		}
 
-		public IActivity GetCurrentActivity()
+		public Activity GetCurrentActivity()
 		{
 			return currentActivity;
 		}

OpenRA.Game/Game.cs

@@ -266,11 +266,11 @@ namespace OpenRA
 			var mm = mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
 			Console.WriteLine("Loading mods: {0}",string.Join(",",mm));
 			Settings.Game.Mods = mm;
-			Settings.Save();
-
-			Sound.StopMusic();
+			Settings.Save();
+
+			Sound.StopMusic();
 			Sound.StopVideo();
-			Sound.Initialize();
+			Sound.Initialize();
 			
 			modData = new ModData( mm );
 			modData.LoadInitialAssets();
@@ -326,6 +326,8 @@ namespace OpenRA
 
 		public static void Disconnect()
 		{
+			orderManager.world.traitDict.PrintReport();
+			
 			if (IsHost && server != null)
 				server.Shutdown();
 
@@ -366,11 +368,11 @@ namespace OpenRA
 		{
 			server = new Server.Server(modData, settings, map);
 			JoinServer(IPAddress.Loopback.ToString(), settings.Server.ListenPort);
-		}
-
-		public static bool IsCurrentWorld(World world)
-		{
-			return orderManager != null && orderManager.world == world;
-		}
+		}
+
+		public static bool IsCurrentWorld(World world)
+		{
+			return orderManager != null && orderManager.world == world;
+		}
 	}
 }

OpenRA.Game/GameRules/ActorInfo.cs

@@ -23,14 +23,30 @@ namespace OpenRA
 
 		public ActorInfo( string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
-			var mergedNode = MergeWithParent( node, allUnits ).NodesDict;
+            try
+            {
+                var mergedNode = MergeWithParent(node, allUnits).NodesDict;
 
-			Name = name;
-			foreach( var t in mergedNode )
-				if( t.Key != "Inherits" && !t.Key.StartsWith("-") )
-					Traits.Add( LoadTraitInfo( t.Key.Split('@')[0], t.Value ) );
+                Name = name;
+                foreach (var t in mergedNode)
+                    if (t.Key != "Inherits" && !t.Key.StartsWith("-"))
+                        Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+            }
+            catch (YamlException e)
+            {
+                throw new YamlException("Actor type {0}: {1}".F(name, e.Message));
+            }
 		}
 
+        static IEnumerable<MiniYaml> GetInheritanceChain(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
+        {
+            while (node != null)
+            {
+                yield return node;
+                node = GetParent(node, allUnits);
+            }
+        }
+
 		static MiniYaml GetParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
 			MiniYaml inherits;
@@ -40,8 +56,9 @@ namespace OpenRA
 
 			MiniYaml parent;
 			allUnits.TryGetValue( inherits.Value, out parent );
-			if( parent == null )
-				return null;
+            if (parent == null)
+                throw new InvalidOperationException(
+                    "Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
 
 			return parent;
 		}
@@ -49,8 +66,14 @@ namespace OpenRA
 		static MiniYaml MergeWithParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
 			var parent = GetParent( node, allUnits );
-			if( parent != null )
-				return MiniYaml.Merge( node, MergeWithParent( parent, allUnits ) );
+            if (parent != null)
+            {
+                var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
+
+                // strip the '-'
+                result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
+                return result;
+            }
 			return node;
 		}
 

OpenRA.Game/GameRules/Rules.cs

@@ -44,7 +44,7 @@ namespace OpenRA
 		
 		static Dictionary<string, T> LoadYamlRules<T>(string[] files, List<MiniYamlNode> dict, Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> f)
 		{
-			var y = files.Select(a => MiniYaml.FromFile(a)).Aggregate(dict,MiniYaml.Merge);
+			var y = files.Select(a => MiniYaml.FromFile(a)).Aggregate(dict,MiniYaml.MergeLiberal);
 			var yy = y.ToDictionary( x => x.Key, x => x.Value );
 			return y.ToDictionary(kv => kv.Key.ToLowerInvariant(), kv => f(kv, yy));
 		}

OpenRA.Game/GameRules/Settings.cs

@@ -82,6 +82,11 @@ namespace OpenRA.GameRules
 		public int SheetSize = 2048;
 	}
 	
+	public class KeyboardSettings
+	{
+		public Modifiers ControlGroupModifier = Modifiers.Ctrl;
+	}
+	
 	public class Settings
 	{
 		string SettingsFile;
@@ -92,7 +97,7 @@ namespace OpenRA.GameRules
 		public GraphicSettings Graphics = new GraphicSettings();
 		public ServerSettings Server = new ServerSettings();
 		public DebugSettings Debug = new DebugSettings();
-		
+		public KeyboardSettings Keyboard = new KeyboardSettings();
 		public Dictionary<string, object> Sections;
 		public Settings(string file, Arguments args)
 		{			
@@ -104,7 +109,8 @@ namespace OpenRA.GameRules
 				{"Sound", Sound},
 				{"Graphics", Graphics},
 				{"Server", Server},
-				{"Debug", Debug}
+				{"Debug", Debug},
+				{"Keyboard",Keyboard}
 			};
 			
 			

OpenRA.Game/Graphics/Animation.cs

@@ -53,15 +53,15 @@ namespace OpenRA.Graphics
 
 		public void PlayRepeating( string sequenceName )
 		{
-			backwards = false;
-			tickAlways = false;
-			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
-			frame = 0;
-			tickFunc = () =>
-			{
-				++frame;
-				if (frame >= CurrentSequence.Length)
-					frame = 0;
+			backwards = false;
+			tickAlways = false;
+			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
+			frame = 0;
+			tickFunc = () =>
+			{
+				++frame;
+				if (frame >= CurrentSequence.Length)
+					frame = 0;
 			};
 		}
 

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -36,7 +36,7 @@ namespace OpenRA.Graphics
 			if (chromeFiles.Length == 0)
 				return;
 
-			var chrome = chromeFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.Merge);
+			var chrome = chromeFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal);
 
 			foreach (var c in chrome)
 				LoadCollection(c.Key, c.Value);

OpenRA.Game/Graphics/CursorProvider.cs

@@ -24,7 +24,7 @@ namespace OpenRA.Graphics
 		public static void Initialize(string[] sequenceFiles)
 		{	
 			cursors = new Dictionary<string, CursorSequence>();
-			var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.Merge));
+			var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal));
 			
 			foreach (var s in sequences.NodesDict["Palettes"].Nodes)
 				Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), false));

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -19,7 +19,7 @@ namespace OpenRA.Graphics
 {
 	public class HardwarePalette
 	{
-		public const int MaxPalettes = 64;
+		public const int MaxPalettes = 256;
 		int allocated = 0;
 		
 		ITexture texture;
@@ -56,8 +56,8 @@ namespace OpenRA.Graphics
 			
 			palettes.Add(name, p);
 			indices.Add(name, allocated++);
-		}
-
+		}
+
 		uint[,] data = new uint[MaxPalettes, 256];
 		public void Update(IEnumerable<IPaletteModifier> paletteMods)
 		{

OpenRA.Game/Graphics/Minimap.cs

@@ -136,7 +136,7 @@ namespace OpenRA.Graphics
 			{
 				int* c = (int*)bitmapData.Scan0;
 
-				foreach (var t in world.Queries.WithTrait<IRadarSignature>())
+				foreach (var t in world.ActorsWithTrait<IRadarSignature>())
 				{
 					if (!world.LocalShroud.IsVisible(t.Actor))
 						continue;

OpenRA.Game/Graphics/Renderer.cs

@@ -35,7 +35,7 @@ namespace OpenRA.Graphics
 
 		public ITexture PaletteTexture;
 
-        public readonly SpriteFont RegularFont, BoldFont, TitleFont, TinyFont;
+        public readonly SpriteFont RegularFont, BoldFont, TitleFont, TinyFont, TinyBoldFont;
 
 		internal const int TempBufferSize = 8192;
 		const int TempBufferCount = 8;
@@ -59,7 +59,8 @@ namespace OpenRA.Graphics
 			BoldFont = new SpriteFont("FreeSansBold.ttf", 14);
 			TitleFont = new SpriteFont("titles.ttf", 48);
             TinyFont = new SpriteFont("FreeSans.ttf", 10);
-
+			TinyBoldFont = new SpriteFont("FreeSansBold.ttf", 10);
+			
 			for( int i = 0 ; i < TempBufferCount ; i++ )
 			{
 				tempBuffersV.Enqueue( device.CreateVertexBuffer( TempBufferSize ) );

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -26,7 +26,7 @@ namespace OpenRA.Graphics
 			if (sequenceFiles.Length == 0)
 				return;
 
-			var sequences = sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(sequenceNodes, MiniYaml.Merge);
+			var sequences = sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(sequenceNodes, MiniYaml.MergeLiberal);
 
 			foreach (var s in sequences)
 				LoadSequencesForUnit(s.Key, s.Value);

OpenRA.Game/Graphics/Util.cs

@@ -55,20 +55,20 @@ namespace OpenRA.Graphics
 			vertices[nv + 2] = new Vertex(new float2(o.X, o.Y + size.Y), 
 				r.FastMapTextureCoords(2), attrib);
 			vertices[nv + 3] = new Vertex(new float2(o.X + size.X, o.Y + size.Y), 
-				r.FastMapTextureCoords(3), attrib);
-
-			indices[ni] = (uint)(nv);
-			indices[ni + 1] = indices[ni + 3] = (uint)(nv + 1);
+				r.FastMapTextureCoords(3), attrib);
+
+			indices[ni] = (uint)(nv);
+			indices[ni + 1] = indices[ni + 3] = (uint)(nv + 1);
 			indices[ni + 2] = indices[ni + 5] = (uint)(nv + 2);
 			indices[ni + 4] = (uint)(nv + 3);
-		}
-
+		}
+
 		static readonly int[] channelMasks = { 2, 1, 0, 3 };	// yes, our channel order is nuts.
 		public static void FastCopyIntoChannel(Sprite dest, byte[] src)
 		{
 			var data = dest.sheet.Data;
 			var srcStride = dest.bounds.Width;
-			var destStride = dest.sheet.Size.Width * 4;
+			var destStride = dest.sheet.Size.Width * 4;
 			var destOffset = destStride * dest.bounds.Top + dest.bounds.Left * 4 + channelMasks[(int)dest.channel];
 			var destSkip = destStride - 4 * srcStride;
 			var height = dest.bounds.Height;

OpenRA.Game/Graphics/Viewport.cs

@@ -86,11 +86,11 @@ namespace OpenRA.Graphics
 				wr.Draw();
 			
 			Widget.DoDraw();
-			var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-            var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
-
-            cursorSequence.GetSprite((int)cursorFrame).DrawAt(
-                Viewport.LastMousePos + Location - cursorSequence.Hotspot,
+			var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
+            var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
+
+            cursorSequence.GetSprite((int)cursorFrame).DrawAt(
+                Viewport.LastMousePos + Location - cursorSequence.Hotspot,
                 Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette));
 
 			renderer.EndFrame( inputHandler );

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -122,33 +122,33 @@ namespace OpenRA.Graphics
 			Game.Renderer.LineRenderer.DrawLine(a + b, a + b + c, color, color);
 			Game.Renderer.LineRenderer.DrawLine(a + b + c, a + c, color, color);
 			Game.Renderer.LineRenderer.DrawLine(a, a + c, color, color);
-		}
-
-		public void DrawSelectionBox(Actor selectedUnit, Color c)
-		{
-			var bounds = selectedUnit.GetBounds(false);
-
-			var xy = new float2(bounds.Left, bounds.Top);
-			var Xy = new float2(bounds.Right, bounds.Top);
-			var xY = new float2(bounds.Left, bounds.Bottom);
-			var XY = new float2(bounds.Right, bounds.Bottom);
-
-			Game.Renderer.LineRenderer.DrawLine(xy, xy + new float2(4, 0), c, c);
-			Game.Renderer.LineRenderer.DrawLine(xy, xy + new float2(0, 4), c, c);
-			Game.Renderer.LineRenderer.DrawLine(Xy, Xy + new float2(-4, 0), c, c);
-			Game.Renderer.LineRenderer.DrawLine(Xy, Xy + new float2(0, 4), c, c);
-
-			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(4, 0), c, c);
-			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(0, -4), c, c);
-			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(-4, 0), c, c);
-			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(0, -4), c, c);
-		}
-
-		public void DrawRollover(Actor unit)
-		{
-			var selectable = unit.TraitOrDefault<Selectable>();
-			if (selectable != null)
-				selectable.DrawRollover(this, unit);
+		}
+
+		public void DrawSelectionBox(Actor selectedUnit, Color c)
+		{
+			var bounds = selectedUnit.GetBounds(false);
+
+			var xy = new float2(bounds.Left, bounds.Top);
+			var Xy = new float2(bounds.Right, bounds.Top);
+			var xY = new float2(bounds.Left, bounds.Bottom);
+			var XY = new float2(bounds.Right, bounds.Bottom);
+
+			Game.Renderer.LineRenderer.DrawLine(xy, xy + new float2(4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xy, xy + new float2(0, 4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(Xy, Xy + new float2(-4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(Xy, Xy + new float2(0, 4), c, c);
+
+			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(0, -4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(-4, 0), c, c);
+			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(0, -4), c, c);
+		}
+
+		public void DrawRollover(Actor unit)
+		{
+			var selectable = unit.TraitOrDefault<Selectable>();
+			if (selectable != null)
+				selectable.DrawRollover(this, unit);
 		}
 
 		public void DrawLocus(Color c, int2[] cells)

OpenRA.Game/Map.cs

@@ -375,11 +375,11 @@ namespace OpenRA
 				// File header consists of a version byte, followed by 2 ushorts for width and height
 				writer.Write(TileFormat);
 				writer.Write((ushort)MapSize.X);
-				writer.Write((ushort)MapSize.Y);
-
-				if (!OpenRA.Rules.TileSets.ContainsKey(Tileset))
-					throw new InvalidOperationException(
-						"Tileset used by the map ({0}) does not exist in this mod. Valid tilesets are: {1}"
+				writer.Write((ushort)MapSize.Y);
+
+				if (!OpenRA.Rules.TileSets.ContainsKey(Tileset))
+					throw new InvalidOperationException(
+						"Tileset used by the map ({0}) does not exist in this mod. Valid tilesets are: {1}"
 						.F(Tileset, string.Join(",", OpenRA.Rules.TileSets.Keys.ToArray())));
 
 				// Tile data
@@ -423,11 +423,11 @@ namespace OpenRA
 		}
 
 		public void Resize(int width, int height)		// editor magic.
-		{
-			var oldMapTiles = MapTiles.Value;
-			var oldMapResources = MapResources.Value;
-
-			MapTiles = Lazy.New(() => ResizeArray(oldMapTiles, oldMapTiles[0, 0], width, height));
+		{
+			var oldMapTiles = MapTiles.Value;
+			var oldMapResources = MapResources.Value;
+
+			MapTiles = Lazy.New(() => ResizeArray(oldMapTiles, oldMapTiles[0, 0], width, height));
 			MapResources = Lazy.New(() => ResizeArray(oldMapResources, oldMapResources[0, 0], width, height));
 			MapSize = new int2(width, height);
 		}

OpenRA.Game/Network/FrameData.cs

@@ -1,61 +1,71 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA.Network
-{
-	class FrameData
-	{
-		public struct ClientOrder
-		{
-			public int Client;
-			public Order Order;
-		}
-
-		readonly Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>();
-		readonly Dictionary<int, Dictionary<int, byte[]>> framePackets = new Dictionary<int, Dictionary<int, byte[]>>();
-
-		public IEnumerable<int> ClientsPlayingInFrame( int frame )
-		{
-			return clientQuitTimes
-				.Where( x => frame <= x.Value )
-				.Select( x => x.Key )
-				.OrderBy( x => x );
-		}
-
-		public void ClientQuit( int clientId, int lastClientFrame )
-		{
-			clientQuitTimes[clientId] = lastClientFrame;
-		}
-
-		public void AddFrameOrders( int clientId, int frame, byte[] orders )
-		{
-			var frameData = framePackets.GetOrAdd( frame );
-			frameData.Add( clientId, orders );
-		}
-
-        public bool IsReadyForFrame(int frame)
-        {
-            return !ClientsNotReadyForFrame(frame).Any();
-        }
-
-        public IEnumerable<int> ClientsNotReadyForFrame(int frame)
-        {
-            var frameData = framePackets.GetOrAdd(frame);
-            return ClientsPlayingInFrame(frame)
-                .Where(client => !frameData.ContainsKey(client));
-        }
-
-		public IEnumerable<ClientOrder> OrdersForFrame( World world, int frame )
-		{
-			var frameData = framePackets[ frame ];
-			var clientData = ClientsPlayingInFrame( frame )
-				.ToDictionary( k => k, v => frameData[ v ] );
-
-			return clientData
-				.SelectMany( x => x.Value
-					.ToOrderList( world )
-					.Select( o => new ClientOrder { Client = x.Key, Order = o } ) );
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.Network
+{
+	class FrameData
+	{
+		public struct ClientOrder
+		{
+			public int Client;
+			public Order Order;
+		}
+
+		readonly Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>();
+		readonly Dictionary<int, Dictionary<int, byte[]>> framePackets = new Dictionary<int, Dictionary<int, byte[]>>();
+
+		public IEnumerable<int> ClientsPlayingInFrame( int frame )
+		{
+			return clientQuitTimes
+				.Where( x => frame <= x.Value )
+				.Select( x => x.Key )
+				.OrderBy( x => x );
+		}
+
+		public void ClientQuit( int clientId, int lastClientFrame )
+		{
+			clientQuitTimes[clientId] = lastClientFrame;
+		}
+
+		public void AddFrameOrders( int clientId, int frame, byte[] orders )
+		{
+			var frameData = framePackets.GetOrAdd( frame );
+			frameData.Add( clientId, orders );
+		}
+
+        public bool IsReadyForFrame(int frame)
+        {
+            return !ClientsNotReadyForFrame(frame).Any();
+        }
+
+        public IEnumerable<int> ClientsNotReadyForFrame(int frame)
+        {
+            var frameData = framePackets.GetOrAdd(frame);
+            return ClientsPlayingInFrame(frame)
+                .Where(client => !frameData.ContainsKey(client));
+        }
+
+		public IEnumerable<ClientOrder> OrdersForFrame( World world, int frame )
+		{
+			var frameData = framePackets[ frame ];
+			var clientData = ClientsPlayingInFrame( frame )
+				.ToDictionary( k => k, v => frameData[ v ] );
+
+			return clientData
+				.SelectMany( x => x.Value
+					.ToOrderList( world )
+					.Select( o => new ClientOrder { Client = x.Key, Order = o } ) );
+		}
+	}
+}

OpenRA.Game/Network/Order.cs

@@ -61,7 +61,7 @@ namespace OpenRA
 		// For scripting special powers
 		public Order() 
 			: this(null, null, null, int2.Zero, null, false, int2.Zero) { }
-		
+				 
 		public Order(string orderString, Actor subject, bool queued) 
 			: this(orderString, subject, null, int2.Zero, null, queued, int2.Zero) { }
 		

OpenRA.Game/Network/OrderManager.cs

@@ -155,18 +155,18 @@ namespace OpenRA.Network
 		public bool IsReadyForNextFrame
 		{
 			get { return NetFrameNumber >= 1 && frameData.IsReadyForFrame( NetFrameNumber ); }
-		}
-
-        static readonly IEnumerable<Session.Client> NoClients = new Session.Client[] {};
-        public IEnumerable<Session.Client> GetClientsNotReadyForNextFrame
-        {
-            get
-            {
-                return NetFrameNumber >= 1
-                    ? frameData.ClientsNotReadyForFrame(NetFrameNumber)
-                        .Select(a => LobbyInfo.ClientWithIndex(a))
-                    : NoClients;
-            }
+		}
+
+        static readonly IEnumerable<Session.Client> NoClients = new Session.Client[] {};
+        public IEnumerable<Session.Client> GetClientsNotReadyForNextFrame
+        {
+            get
+            {
+                return NetFrameNumber >= 1
+                    ? frameData.ClientsNotReadyForFrame(NetFrameNumber)
+                        .Select(a => LobbyInfo.ClientWithIndex(a))
+                    : NoClients;
+            }
         }
 
 		public void Tick()

OpenRA.Game/Network/ReplayConnection.cs

@@ -1,110 +1,120 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
-
-namespace OpenRA.Network
-{
-	public class ReplayConnection : IConnection
-	{
-		//uint nextFrame = 1;
-		FileStream replayStream;
-
-		public ReplayConnection( string replayFilename )
-		{
-			replayStream = File.OpenRead( replayFilename );
-		}
-
-		public int LocalClientId
-		{
-			get { return 0; }
-		}
-
-		public ConnectionState ConnectionState
-		{
-			get { return ConnectionState.Connected; }
-		}
-
-		// do nothing; ignore locally generated orders
-		public void Send( int frame, List<byte[]> orders ) { }
-		public void SendImmediate( List<byte[]> orders ) { }
-		public void SendSync( int frame, byte[] syncData )
-		{
-			var ms = new MemoryStream();
-			ms.Write( BitConverter.GetBytes( frame ) );
-			ms.Write( syncData );
-			sync.Add( ms.ToArray() );
-		}
-
-		List<byte[]> sync = new List<byte[]>();
-
-		public void Receive( Action<int, byte[]> packetFn )
-		{
-			while( sync.Count != 0 )
-			{
-				packetFn( LocalClientId, sync[ 0 ] );
-				sync.RemoveAt( 0 );
-			}
-			if( replayStream == null ) return;
-
-			var reader = new BinaryReader( replayStream );
-			while( replayStream.Position < replayStream.Length )
-			{
-				var client = reader.ReadInt32();
-				var packetLen = reader.ReadInt32();
-				var packet = reader.ReadBytes( packetLen );
-				packetFn( client, packet );
-			}
-			replayStream = null;
-		}
-
-		public void Dispose() { }
-	}
-
-	class ReplayRecorderConnection : IConnection
-	{
-		IConnection inner;
-		BinaryWriter writer;
-
-		public ReplayRecorderConnection( IConnection inner, FileStream replayFile )
-		{
-			this.inner = inner;
-			this.writer = new BinaryWriter( replayFile );
-		}
-
-		public int LocalClientId { get { return inner.LocalClientId; } }
-		public ConnectionState ConnectionState { get { return inner.ConnectionState; } }
-
-		public void Send( int frame, List<byte[]> orders ) { inner.Send( frame, orders ); }
-		public void SendImmediate( List<byte[]> orders ) { inner.SendImmediate( orders ); }
-		public void SendSync( int frame, byte[] syncData ) { inner.SendSync( frame, syncData ); }
-
-		public void Receive( Action<int, byte[]> packetFn )
-		{
-			inner.Receive( ( client, data ) =>
-				{
-					writer.Write( client );
-					writer.Write( data.Length );
-					writer.Write( data );
-					packetFn( client, data );
-				} );
-		}
-
-		bool disposed;
-
-		public void Dispose()
-		{
-			if( disposed )
-				return;
-
-			writer.Close();
-			disposed = true;
-		}
-
-		~ReplayRecorderConnection()
-		{
-			Dispose();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+
+namespace OpenRA.Network
+{
+	public class ReplayConnection : IConnection
+	{
+		//uint nextFrame = 1;
+		FileStream replayStream;
+
+		public ReplayConnection( string replayFilename )
+		{
+			replayStream = File.OpenRead( replayFilename );
+		}
+
+		public int LocalClientId
+		{
+			get { return 0; }
+		}
+
+		public ConnectionState ConnectionState
+		{
+			get { return ConnectionState.Connected; }
+		}
+
+		// do nothing; ignore locally generated orders
+		public void Send( int frame, List<byte[]> orders ) { }
+		public void SendImmediate( List<byte[]> orders ) { }
+		public void SendSync( int frame, byte[] syncData )
+		{
+			var ms = new MemoryStream();
+			ms.Write( BitConverter.GetBytes( frame ) );
+			ms.Write( syncData );
+			sync.Add( ms.ToArray() );
+		}
+
+		List<byte[]> sync = new List<byte[]>();
+
+		public void Receive( Action<int, byte[]> packetFn )
+		{
+			while( sync.Count != 0 )
+			{
+				packetFn( LocalClientId, sync[ 0 ] );
+				sync.RemoveAt( 0 );
+			}
+			if( replayStream == null ) return;
+
+			var reader = new BinaryReader( replayStream );
+			while( replayStream.Position < replayStream.Length )
+			{
+				var client = reader.ReadInt32();
+				var packetLen = reader.ReadInt32();
+				var packet = reader.ReadBytes( packetLen );
+				packetFn( client, packet );
+			}
+			replayStream = null;
+		}
+
+		public void Dispose() { }
+	}
+
+	class ReplayRecorderConnection : IConnection
+	{
+		IConnection inner;
+		BinaryWriter writer;
+
+		public ReplayRecorderConnection( IConnection inner, FileStream replayFile )
+		{
+			this.inner = inner;
+			this.writer = new BinaryWriter( replayFile );
+		}
+
+		public int LocalClientId { get { return inner.LocalClientId; } }
+		public ConnectionState ConnectionState { get { return inner.ConnectionState; } }
+
+		public void Send( int frame, List<byte[]> orders ) { inner.Send( frame, orders ); }
+		public void SendImmediate( List<byte[]> orders ) { inner.SendImmediate( orders ); }
+		public void SendSync( int frame, byte[] syncData ) { inner.SendSync( frame, syncData ); }
+
+		public void Receive( Action<int, byte[]> packetFn )
+		{
+			inner.Receive( ( client, data ) =>
+				{
+					writer.Write( client );
+					writer.Write( data.Length );
+					writer.Write( data );
+					packetFn( client, data );
+				} );
+		}
+
+		bool disposed;
+
+		public void Dispose()
+		{
+			if( disposed )
+				return;
+
+			writer.Close();
+			disposed = true;
+		}
+
+		~ReplayRecorderConnection()
+		{
+			Dispose();
+		}
+	}
+}

OpenRA.Game/Network/SyncReport.cs

@@ -37,7 +37,7 @@ namespace OpenRA.Network
 			report.Frame = orderManager.NetFrameNumber;
 			report.SyncedRandom = orderManager.world.SharedRandom.Last;
 			report.Traits.Clear();
-			foreach (var a in orderManager.world.Queries.WithTrait<ISync>())
+			foreach (var a in orderManager.world.ActorsWithTrait<ISync>())
 			{
 				var sync = Sync.CalculateSyncHash(a.Trait);
 				if (sync != 0)

OpenRA.Game/Network/UnitOrders.cs

@@ -188,9 +188,9 @@ namespace OpenRA.Network
 			var oldStance = p.Stances[target];
 			p.Stances[target] = s;
 			if (target == w.LocalPlayer)
-				w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, p, oldStance, s);
-
-			foreach (var nsc in w.Queries.WithTrait<INotifyStanceChanged>())
+				w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, p, oldStance, s);
+
+			foreach (var nsc in w.ActorsWithTrait<INotifyStanceChanged>())
 				nsc.Trait.StanceChanged(nsc.Actor, p, target, oldStance, s);
 		}
 	}

OpenRA.Game/ObjectCreator.cs

@@ -84,6 +84,14 @@ namespace OpenRA
 			return ctor.Invoke( a );
 		}
 
+        public IEnumerable<Type> GetTypesImplementing<T>()
+        {
+            var it = typeof(T);
+            return ModAssemblies.Select( ma => ma.First ).Distinct()
+                .SelectMany(ma => ma.GetTypes()
+                .Where(t => t != it && it.IsAssignableFrom(t)));
+        }
+
 		[AttributeUsage( AttributeTargets.Parameter )]
 		public class ParamAttribute : Attribute
 		{

OpenRA.Game/OpenRA.Game.csproj

@@ -1,241 +1,241 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA</RootNamespace>
-    <AssemblyName>OpenRA.Game</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <ApplicationIcon>OpenRA.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Tao.FreeType, Version=2.3.5.0, Culture=neutral, PublicKeyToken=e499629dc69cd531">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\Tao\Tao.FreeType.dll</HintPath>
-    </Reference>
-    <Reference Include="Tao.OpenAl, Version=1.1.0.1, Culture=neutral, PublicKeyToken=a7579dda88828311">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\Tao\Tao.OpenAl.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GameRules\WeaponInfo.cs" />
-    <Compile Include="Group.cs" />
-    <Compile Include="Orders\GenericSelectTarget.cs" />
-    <Compile Include="Server\ProtocolVersion.cs" />
-    <Compile Include="Traits\LintAttributes.cs" />
-    <Compile Include="Traits\Player\PlayerResources.cs" />
-    <Compile Include="Traits\World\Shroud.cs" />
-    <Compile Include="Widgets\ChatEntryWidget.cs" />
-    <Compile Include="Widgets\MapPreviewWidget.cs" />
-    <Compile Include="Widgets\WidgetUtils.cs" />
-    <Compile Include="Effects\DelayedAction.cs" />
-    <Compile Include="Effects\FlashTarget.cs" />
-    <Compile Include="GameRules\ActorInfo.cs" />
-    <Compile Include="GameRules\VoiceInfo.cs" />
-    <Compile Include="Effects\IEffect.cs" />
-    <Compile Include="Graphics\ChromeProvider.cs" />
-    <Compile Include="Graphics\MappedImage.cs" />
-    <Compile Include="Graphics\Minimap.cs" />
-    <Compile Include="Graphics\SpriteFont.cs" />
-    <Compile Include="Network\Connection.cs" />
-    <Compile Include="Network\OrderIO.cs" />
-    <Compile Include="Network\OrderManager.cs" />
-    <Compile Include="Selection.cs" />
-    <Compile Include="Server\Connection.cs" />
-    <Compile Include="Server\Exts.cs" />
-    <Compile Include="Server\MasterServerQuery.cs" />
-    <Compile Include="Server\Server.cs" />
-    <Compile Include="Server\ServerOrder.cs" />
-    <Compile Include="Sound.cs" />
-    <Compile Include="Support\PerfHistory.cs" />
-    <Compile Include="Sync.cs" />
-    <Compile Include="Traits\World\SpatialBins.cs" />
-    <Compile Include="Traits\World\Country.cs" />
-    <Compile Include="Actor.cs" />
-    <Compile Include="GameRules\Rules.cs" />
-    <Compile Include="Graphics\Animation.cs" />
-    <Compile Include="Game.cs" />
-    <Compile Include="Graphics\CursorSequence.cs" />
-    <Compile Include="Graphics\CursorSheetBuilder.cs" />
-    <Compile Include="Graphics\LineRenderer.cs" />
-    <Compile Include="Graphics\WorldRenderer.cs" />
-    <Compile Include="Orders\IOrderGenerator.cs" />
-    <Compile Include="Player.cs" />
-    <Compile Include="Graphics\Sheet.cs" />
-    <Compile Include="Graphics\Sequence.cs" />
-    <Compile Include="Network\Order.cs" />
-    <Compile Include="Graphics\SequenceProvider.cs" />
-    <Compile Include="Graphics\SheetBuilder.cs" />
-    <Compile Include="Graphics\HardwarePalette.cs" />
-    <Compile Include="Support\Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Graphics\Renderer.cs" />
-    <Compile Include="Graphics\Sprite.cs" />
-    <Compile Include="Graphics\SpriteRenderer.cs" />
-    <Compile Include="Graphics\SpriteLoader.cs" />
-    <Compile Include="Graphics\TerrainRenderer.cs" />
-    <Compile Include="Traits\World\PlayerColorPalette.cs" />
-    <Compile Include="Traits\World\ResourceLayer.cs" />
-    <Compile Include="Traits\World\ResourceType.cs" />
-    <Compile Include="Traits\Selectable.cs" />
-    <Compile Include="Traits\Render\RenderSimple.cs" />
-    <Compile Include="Traits\TraitsInterfaces.cs" />
-    <Compile Include="Traits\World\UnitInfluence.cs" />
-    <Compile Include="Network\UnitOrders.cs" />
-    <Compile Include="Traits\Util.cs" />
-    <Compile Include="UiOverlay.cs" />
-    <Compile Include="Graphics\Util.cs" />
-    <Compile Include="Graphics\Viewport.cs" />
-    <Compile Include="Orders\UnitOrderGenerator.cs" />
-    <Compile Include="World.cs" />
-    <Compile Include="WorldUtils.cs" />
-    <Compile Include="Traits\Player\EvaAlerts.cs" />
-    <Compile Include="Traits\World\ScreenShaker.cs" />
-    <Compile Include="Widgets\WidgetLoader.cs" />
-    <Compile Include="Widgets\ButtonWidget.cs" />
-    <Compile Include="Widgets\Widget.cs" />
-    <Compile Include="Widgets\BackgroundWidget.cs" />
-    <Compile Include="Widgets\LabelWidget.cs" />
-    <Compile Include="Widgets\CheckboxWidget.cs" />
-    <Compile Include="Widgets\PerfGraphWidget.cs" />
-    <Compile Include="Widgets\ColorBlockWidget.cs" />
-    <Compile Include="GameRules\MusicInfo.cs" />
-    <Compile Include="Widgets\ImageWidget.cs" />
-    <Compile Include="Widgets\TextFieldWidget.cs" />
-    <Compile Include="Widgets\ChatDisplayWidget.cs" />
-    <Compile Include="Widgets\SliderWidget.cs" />
-    <Compile Include="Widgets\TimerWidget.cs" />
-    <Compile Include="Widgets\ShpImageWidget.cs" />
-    <Compile Include="Traits\DrawLineToTarget.cs" />
-    <Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
-    <Compile Include="Widgets\ViewportScrollControllerWidget.cs" />
-    <Compile Include="Traits\Player\DeveloperMode.cs" />
-    <Compile Include="Traits\RevealsShroud.cs" />
-    <Compile Include="Traits\Health.cs" />
-    <Compile Include="Widgets\VqaPlayerWidget.cs" />
-    <Compile Include="GameRules\Settings.cs" />
-    <Compile Include="Support\Arguments.cs" />
-    <Compile Include="Traits\ActorStance.cs" />
-    <Compile Include="Traits\Armor.cs" />
-    <Compile Include="Graphics\CursorProvider.cs" />
-    <Compile Include="Server\TraitInterfaces.cs" />
-    <Compile Include="Widgets\ScrollPanelWidget.cs" />
-    <Compile Include="Graphics\ShroudRenderer.cs" />
-    <Compile Include="Network\Handshake.cs" />
-    <Compile Include="Widgets\ProgressBarWidget.cs" />
-    <Compile Include="Utilities.cs" />
-    <Compile Include="Traits\Waypoint.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
-      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRA.FileFormats</Name>
-    </ProjectReference>
-    <Compile Include="ActorInitializer.cs" />
-    <Compile Include="ActorReference.cs" />
-    <Compile Include="InputHandler.cs" />
-    <Compile Include="ModData.cs" />
-    <Compile Include="Map.cs" />
-    <Compile Include="Network\FrameData.cs" />
-    <Compile Include="Network\ReplayConnection.cs" />
-    <Compile Include="Network\Session.cs" />
-    <Compile Include="ObjectCreator.cs" />
-    <Compile Include="Network\SyncReport.cs" />
-    <Compile Include="Traits\EditorAppearance.cs" />
-    <Compile Include="Traits\SubcellInit.cs" />
-    <Compile Include="Traits\Target.cs" />
-    <Compile Include="Traits\ValidateOrder.cs" />
-    <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\Activities\CancelableActivity.cs" />
-    <Compile Include="Widgets\PasswordFieldWidget.cs" />
-    <Compile Include="Widgets\ScrollingTextWidget.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="OpenRA.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Widgets\Delegates\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA</RootNamespace>
+    <AssemblyName>OpenRA.Game</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <ApplicationIcon>OpenRA.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Tao.FreeType, Version=2.3.5.0, Culture=neutral, PublicKeyToken=e499629dc69cd531">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\Tao\Tao.FreeType.dll</HintPath>
+    </Reference>
+    <Reference Include="Tao.OpenAl, Version=1.1.0.1, Culture=neutral, PublicKeyToken=a7579dda88828311">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\Tao\Tao.OpenAl.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GameRules\WeaponInfo.cs" />
+    <Compile Include="Group.cs" />
+    <Compile Include="Orders\GenericSelectTarget.cs" />
+    <Compile Include="Server\ProtocolVersion.cs" />
+    <Compile Include="Traits\LintAttributes.cs" />
+    <Compile Include="Traits\Player\PlayerResources.cs" />
+    <Compile Include="Traits\World\Shroud.cs" />
+    <Compile Include="Widgets\ChatEntryWidget.cs" />
+    <Compile Include="Widgets\MapPreviewWidget.cs" />
+    <Compile Include="Widgets\WidgetUtils.cs" />
+    <Compile Include="Effects\DelayedAction.cs" />
+    <Compile Include="Effects\FlashTarget.cs" />
+    <Compile Include="GameRules\ActorInfo.cs" />
+    <Compile Include="GameRules\VoiceInfo.cs" />
+    <Compile Include="Effects\IEffect.cs" />
+    <Compile Include="Graphics\ChromeProvider.cs" />
+    <Compile Include="Graphics\MappedImage.cs" />
+    <Compile Include="Graphics\Minimap.cs" />
+    <Compile Include="Graphics\SpriteFont.cs" />
+    <Compile Include="Network\Connection.cs" />
+    <Compile Include="Network\OrderIO.cs" />
+    <Compile Include="Network\OrderManager.cs" />
+    <Compile Include="Selection.cs" />
+    <Compile Include="Server\Connection.cs" />
+    <Compile Include="Server\Exts.cs" />
+    <Compile Include="Server\MasterServerQuery.cs" />
+    <Compile Include="Server\Server.cs" />
+    <Compile Include="Server\ServerOrder.cs" />
+    <Compile Include="Sound.cs" />
+    <Compile Include="Support\PerfHistory.cs" />
+    <Compile Include="Sync.cs" />
+    <Compile Include="Traits\World\SpatialBins.cs" />
+    <Compile Include="Traits\World\Country.cs" />
+    <Compile Include="Actor.cs" />
+    <Compile Include="GameRules\Rules.cs" />
+    <Compile Include="Graphics\Animation.cs" />
+    <Compile Include="Game.cs" />
+    <Compile Include="Graphics\CursorSequence.cs" />
+    <Compile Include="Graphics\CursorSheetBuilder.cs" />
+    <Compile Include="Graphics\LineRenderer.cs" />
+    <Compile Include="Graphics\WorldRenderer.cs" />
+    <Compile Include="Orders\IOrderGenerator.cs" />
+    <Compile Include="Player.cs" />
+    <Compile Include="Graphics\Sheet.cs" />
+    <Compile Include="Graphics\Sequence.cs" />
+    <Compile Include="Network\Order.cs" />
+    <Compile Include="Graphics\SequenceProvider.cs" />
+    <Compile Include="Graphics\SheetBuilder.cs" />
+    <Compile Include="Graphics\HardwarePalette.cs" />
+    <Compile Include="Support\Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Graphics\Renderer.cs" />
+    <Compile Include="Graphics\Sprite.cs" />
+    <Compile Include="Graphics\SpriteRenderer.cs" />
+    <Compile Include="Graphics\SpriteLoader.cs" />
+    <Compile Include="Graphics\TerrainRenderer.cs" />
+    <Compile Include="Traits\World\PlayerColorPalette.cs" />
+    <Compile Include="Traits\World\ResourceLayer.cs" />
+    <Compile Include="Traits\World\ResourceType.cs" />
+    <Compile Include="Traits\Selectable.cs" />
+    <Compile Include="Traits\Render\RenderSimple.cs" />
+    <Compile Include="Traits\TraitsInterfaces.cs" />
+    <Compile Include="Traits\World\UnitInfluence.cs" />
+    <Compile Include="Network\UnitOrders.cs" />
+    <Compile Include="Traits\Util.cs" />
+    <Compile Include="UiOverlay.cs" />
+    <Compile Include="Graphics\Util.cs" />
+    <Compile Include="Graphics\Viewport.cs" />
+    <Compile Include="Orders\UnitOrderGenerator.cs" />
+    <Compile Include="World.cs" />
+    <Compile Include="WorldUtils.cs" />
+    <Compile Include="Traits\Player\EvaAlerts.cs" />
+    <Compile Include="Traits\World\ScreenShaker.cs" />
+    <Compile Include="Widgets\WidgetLoader.cs" />
+    <Compile Include="Widgets\ButtonWidget.cs" />
+    <Compile Include="Widgets\Widget.cs" />
+    <Compile Include="Widgets\BackgroundWidget.cs" />
+    <Compile Include="Widgets\LabelWidget.cs" />
+    <Compile Include="Widgets\CheckboxWidget.cs" />
+    <Compile Include="Widgets\PerfGraphWidget.cs" />
+    <Compile Include="Widgets\ColorBlockWidget.cs" />
+    <Compile Include="GameRules\MusicInfo.cs" />
+    <Compile Include="Widgets\ImageWidget.cs" />
+    <Compile Include="Widgets\TextFieldWidget.cs" />
+    <Compile Include="Widgets\ChatDisplayWidget.cs" />
+    <Compile Include="Widgets\SliderWidget.cs" />
+    <Compile Include="Widgets\TimerWidget.cs" />
+    <Compile Include="Widgets\ShpImageWidget.cs" />
+    <Compile Include="Traits\DrawLineToTarget.cs" />
+    <Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
+    <Compile Include="Widgets\ViewportScrollControllerWidget.cs" />
+    <Compile Include="Traits\Player\DeveloperMode.cs" />
+    <Compile Include="Traits\RevealsShroud.cs" />
+    <Compile Include="Traits\Health.cs" />
+    <Compile Include="Widgets\VqaPlayerWidget.cs" />
+    <Compile Include="GameRules\Settings.cs" />
+    <Compile Include="Support\Arguments.cs" />
+    <Compile Include="Traits\ActorStance.cs" />
+    <Compile Include="Traits\Armor.cs" />
+    <Compile Include="Graphics\CursorProvider.cs" />
+    <Compile Include="Server\TraitInterfaces.cs" />
+    <Compile Include="Widgets\ScrollPanelWidget.cs" />
+    <Compile Include="Graphics\ShroudRenderer.cs" />
+    <Compile Include="Network\Handshake.cs" />
+    <Compile Include="Widgets\ProgressBarWidget.cs" />
+    <Compile Include="Utilities.cs" />
+    <Compile Include="Traits\Waypoint.cs" />
+    <Compile Include="Traits\Activities\Activity.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRA.FileFormats</Name>
+    </ProjectReference>
+    <Compile Include="ActorInitializer.cs" />
+    <Compile Include="ActorReference.cs" />
+    <Compile Include="InputHandler.cs" />
+    <Compile Include="ModData.cs" />
+    <Compile Include="Map.cs" />
+    <Compile Include="Network\FrameData.cs" />
+    <Compile Include="Network\ReplayConnection.cs" />
+    <Compile Include="Network\Session.cs" />
+    <Compile Include="ObjectCreator.cs" />
+    <Compile Include="Network\SyncReport.cs" />
+    <Compile Include="Traits\EditorAppearance.cs" />
+    <Compile Include="Traits\SubcellInit.cs" />
+    <Compile Include="Traits\Target.cs" />
+    <Compile Include="Traits\ValidateOrder.cs" />
+    <Compile Include="TraitDictionary.cs" />
+    <Compile Include="Widgets\PasswordFieldWidget.cs" />
+    <Compile Include="Widgets\ScrollingTextWidget.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="OpenRA.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Widgets\Delegates\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -70,25 +70,4 @@ namespace OpenRA.Orders
 		public void RenderAfterWorld(WorldRenderer wr, World world) { }
 		public string GetCursor(World world, int2 xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
 	}
-
-	// variant that requires a tag trait (T) to be present on some actor owned
-	// by the activating player
-	public class GenericSelectTargetWithBuilding<T> : GenericSelectTarget
-	{
-		public GenericSelectTargetWithBuilding(Actor subject, string order, string cursor)
-			: base(subject, order, cursor) { }
-
-		public GenericSelectTargetWithBuilding(Actor subject, string order, string cursor, MouseButton button)
-			: base(subject, order, cursor, button) { }
-
-		public override void Tick(World world)
-		{
-			var hasStructure = world.Queries.OwnedBy[world.LocalPlayer]
-					.WithTrait<T>()
-					.Any();
-
-			if (!hasStructure)
-				world.CancelInputMode();
-		}
-	}
 }

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -19,86 +19,41 @@ namespace OpenRA.Orders
 	{
 		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
 		{
-		    var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-                var customOrders = custom.Order(world, xy, mi);
 
-                foreach (var o in customOrders)
-                    yield return o;
-            }
-            else
-            {
-                var underCursor = world.FindUnitsAtMouse(mi.Location)
-                    .Where(a => a.HasTrait<ITargetable>())
-                    .OrderByDescending(
-                        a =>
-                        a.Info.Traits.Contains<SelectableInfo>()
-                            ? a.Info.Traits.Get<SelectableInfo>().Priority
-                            : int.MinValue)
-                    .FirstOrDefault();
+            var underCursor = world.FindUnitsAtMouse(mi.Location)
+                .Where(a => a.HasTrait<ITargetable>())
+                .OrderByDescending(
+                    a =>
+                    a.Info.Traits.Contains<SelectableInfo>()
+                        ? a.Info.Traits.Get<SelectableInfo>().Priority
+                        : int.MinValue)
+                .FirstOrDefault();
 
-                var orders = world.Selection.Actors
-                    .Select(a => OrderForUnit(a, xy, mi, underCursor))
-                    .Where(o => o != null)
-                    .ToArray();
+            var orders = world.Selection.Actors
+                .Select(a => OrderForUnit(a, xy, mi, underCursor))
+                .Where(o => o != null)
+                .ToArray();
 
-                var actorsInvolved = orders.Select(o => o.self).Distinct();
-				if (actorsInvolved.Any())
-					yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
-					{
-						TargetString = string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray())
-					};
-                       
+            var actorsInvolved = orders.Select(o => o.self).Distinct();
+			if (actorsInvolved.Any())
+				yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
+				{
+					TargetString = string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray())
+				};
+                   
 
-                foreach (var o in orders)
-                    yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target, mi.Modifiers.HasModifier(Modifiers.Shift)));
-            }
+            foreach (var o in orders)
+                yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target, mi.Modifiers.HasModifier(Modifiers.Shift)));
 		}
 
-		public void Tick( World world )
-        {
-            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-                custom.Tick(world);
-            }
-		}
-
-		public void RenderBeforeWorld( WorldRenderer wr, World world )
-        {
-            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-                custom.RenderBeforeWorld(wr, world);
-                return;
-            }
-
-			Game.Renderer.Flush();
-		}
-
-		public void RenderAfterWorld( WorldRenderer wr, World world )
-        {
-            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-                custom.RenderAfterWorld(wr, world);
-                return;
-            }
-			
-			Game.Renderer.Flush();
-		}
+		public void Tick( World world ) { }
+		public void RenderBeforeWorld( WorldRenderer wr, World world ) { }
+		public void RenderAfterWorld( WorldRenderer wr, World world ) { }
 
 		public string GetCursor( World world, int2 xy, MouseInput mi )
 		{
 			bool useSelect = false;
 
-            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-               return custom.GetCursor(world, xy, mi);
-            }
-
 			var underCursor = world.FindUnitsAtMouse(mi.Location)
 				.Where(a => a.HasTrait<ITargetable>())
 				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
@@ -124,7 +79,6 @@ namespace OpenRA.Orders
 			if (self.Owner != self.World.LocalPlayer)
 				return null;
 
-
 			if (self.Destroyed)
 				return null;
 

OpenRA.Game/Properties/AssemblyInfo.cs

@@ -1,37 +1,27 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("OpenRA")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenRA")]
-[assembly: AssemblyCopyright("Copyright ©  2007,2009,2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("OpenRA")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenRA")]
+[assembly: AssemblyCopyright("Copyright ©  2007,2009,2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

OpenRA.Game/Selection.cs

@@ -66,7 +66,7 @@ namespace OpenRA
 
 		public void DoControlGroup(World world, int group, Modifiers mods)
 		{
-			if (mods.HasModifier(Modifiers.Ctrl))
+			if (mods.HasModifier(Game.Settings.Keyboard.ControlGroupModifier))
 			{
 				if (actors.Count == 0)
 					return;

OpenRA.Game/TraitDictionary.cs

@@ -17,14 +17,20 @@ namespace OpenRA
 {
 	class TraitDictionary
 	{
-		Dictionary<Type, ITraitContainer> traits = new Dictionary<Type, ITraitContainer>();
-
+		Dictionary<Type, ITraitContainer> traits = new Dictionary<Type, ITraitContainer>();
+
 		ITraitContainer InnerGet( Type t )
 		{
 			return traits.GetOrAdd( t, doCreateTraitContainer );
-		}
-
-		// construct this delegate once.
+		}
+		
+		public void PrintReport()
+		{
+			foreach( var t in traits.OrderByDescending(t => t.Value.Queries).TakeWhile(t => t.Value.Queries > 0) )
+				Console.WriteLine ("{0}: {1}", t.Key.Name, t.Value.Queries );
+		}
+
+		// construct this delegate once.
 		static Func<Type, ITraitContainer> doCreateTraitContainer = CreateTraitContainer;
 		static ITraitContainer CreateTraitContainer( Type t )
 		{
@@ -90,12 +96,17 @@ namespace OpenRA
 		{
 			void Add( Actor actor, object trait );
 			void RemoveActor( uint actor );
+				
+			int Queries { get; }
 		}
 
 		class TraitContainer<T> : ITraitContainer
 		{
 			List<Actor> actors = new List<Actor>();
 			List<T> traits = new List<T>();
+			int queries;
+				
+			public int Queries { get { return queries; } }
 
 			public void Add( Actor actor, object trait )
 			{
@@ -106,6 +117,7 @@ namespace OpenRA
 
 			public T Get( uint actor )
 			{
+				++queries;
 				var index = actors.BinarySearchMany( actor );
 				if( index >= actors.Count || actors[ index ].ActorID != actor )
 					throw new InvalidOperationException( string.Format( "TraitDictionary does not contain instance of type `{0}`", typeof( T ) ) );
@@ -117,6 +129,7 @@ namespace OpenRA
 
 			public T GetOrDefault( uint actor )
 			{
+				++queries;
 				var index = actors.BinarySearchMany( actor );
 				if( index >= actors.Count || actors[ index ].ActorID != actor )
 					return default( T );
@@ -127,6 +140,7 @@ namespace OpenRA
 
 			public IEnumerable<T> GetMultiple( uint actor )
 			{
+				++queries;
 				var index = actors.BinarySearchMany( actor );
 				while( index < actors.Count && actors[ index ].ActorID == actor )
 				{
@@ -137,6 +151,7 @@ namespace OpenRA
 
 			public IEnumerable<TraitPair<T>> All()
 			{
+				++queries;
 				for( int i = 0 ; i < actors.Count ; i++ )
 					yield return new TraitPair<T> { Actor = actors[ i ], Trait = traits[ i ] };
 			}

OpenRA.Game/Traits/Activities/Activity.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenRA.Traits.Activities
+{
+	public abstract class Activity
+	{
+		public Activity NextActivity { get; set; }
+		protected bool IsCanceled { get; private set; }
+
+		public abstract Activity Tick( Actor self );
+
+		public virtual void Cancel( Actor self )
+		{
+			IsCanceled = true;
+			NextActivity = null;
+		}
+
+		public virtual void Queue( Activity activity )
+		{
+			if( NextActivity != null )
+				NextActivity.Queue( activity );
+			else
+				NextActivity = activity;
+		}
+		
+		public virtual IEnumerable<Target> GetTargets( Actor self )
+		{
+			yield break;
+		}
+	}
+	
+	public static class ActivityExts
+	{
+		public static IEnumerable<Target> GetTargetQueue( this Actor self )
+		{
+			return self.GetCurrentActivity().Iterate( u => u.NextActivity ).TakeWhile( u => u != null )
+				.SelectMany( u => u.GetTargets( self ) );
+		}
+	}
+}

OpenRA.Game/Traits/Activities/CancelableActivity.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace OpenRA.Traits.Activities
-{
-	public abstract class CancelableActivity : IActivity
-	{
-		protected IActivity NextActivity { get; private set; }
-		protected bool IsCanceled { get; private set; }
-
-		public abstract IActivity Tick( Actor self );
-		protected virtual bool OnCancel( Actor self ) { return true; }
-
-		public void Cancel( Actor self )
-		{
-			IsCanceled = OnCancel( self );
-			if( IsCanceled )
-				NextActivity = null;
-			else if (NextActivity != null)
-				NextActivity.Cancel( self );
-		}
-
-		public void Queue( IActivity activity )
-		{
-			if( NextActivity != null )
-				NextActivity.Queue( activity );
-			else
-				NextActivity = activity;
-		}
-
-		public virtual IEnumerable<float2> GetCurrentPath()
-		{
-			yield break;
-		}
-	}
-}

OpenRA.Game/Traits/Health.cs

@@ -28,23 +28,21 @@ namespace OpenRA.Traits
 		public readonly HealthInfo Info;
 		
 		[Sync]
-		int hp;
-
+		int hp;
+
 		public int DisplayHp { get; private set; }
 		
 		public Health(ActorInitializer init, HealthInfo info)
 		{
 			Info = info;
 			MaxHP = info.HP;
-			hp = init.Contains<HealthInit>() ? (int)(init.Get<HealthInit, float>()*MaxHP) : MaxHP;
+
+            hp = init.Contains<HealthInit>() ? (int)(init.Get<HealthInit, float>() * MaxHP) : MaxHP;
+            DisplayHp = hp;
 		}
 		
 		public int HP { get { return hp; } }
 		public readonly int MaxHP;
-		public float HPFraction
-		{
-			get { return hp * 1f / MaxHP; }
-		}
 		
 		public bool IsDead { get { return hp <= 0; } }
 		public bool RemoveOnDeath = true;
@@ -79,50 +77,60 @@ namespace OpenRA.Traits
 			var oldState = this.DamageState;
 			
 			/* apply the damage modifiers, if we have any. */
-            var modifier = (float)self.TraitsImplementing<IDamageModifier>().Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
+            var modifier = (float)self.TraitsImplementing<IDamageModifier>()
+				.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
 				.Select(t => t.GetDamageModifier(attacker, warhead)).Product();
 
-			damage = (int)(damage * modifier);
+			damage = (int)(damage * modifier);
+			hp = Exts.Clamp(hp - damage, 0, MaxHP);
 
-			hp -= damage;
-
-            foreach (var nd in self.TraitsImplementing<INotifyDamage>().Concat(self.Owner.PlayerActor.TraitsImplementing<INotifyDamage>()))
-				nd.Damaged(self, new AttackInfo
-				{
-					Attacker = attacker,
-					Damage = damage,
-					DamageState = this.DamageState,
-					PreviousDamageState = oldState,
-					DamageStateChanged = this.DamageState != oldState,
-					Warhead = warhead,
-                    PreviousHealth = hp + damage < 0 ? 0 : hp + damage,
-                    Health = hp
-				});
-
-			if (hp <= 0)
+			var ai = new AttackInfo
+			{
+				Attacker = attacker,
+				Damage = damage,
+				DamageState = this.DamageState,
+				PreviousDamageState = oldState,
+				Warhead = warhead,
+			};
+			
+            foreach (var nd in self.TraitsImplementing<INotifyDamage>()
+			         .Concat(self.Owner.PlayerActor.TraitsImplementing<INotifyDamage>()))
+				nd.Damaged(self, ai);
+			
+			
+			if (DamageState != oldState)
+				foreach (var nd in self.TraitsImplementing<INotifyDamageStateChanged>())
+					nd.DamageStateChanged(self, ai);
+			
+			if (attacker != null && attacker.IsInWorld && !attacker.IsDead())
+				foreach (var nd in attacker.TraitsImplementing<INotifyAppliedDamage>()
+			         .Concat(attacker.Owner.PlayerActor.TraitsImplementing<INotifyAppliedDamage>()))
+				nd.AppliedDamage(attacker, self, ai);
+			
+			if (hp == 0)
 			{
-				hp = 0;
-
 				attacker.Owner.Kills++;
 				self.Owner.Deaths++;
-
+				
+				foreach (var nd in self.TraitsImplementing<INotifyKilled>()
+			    		.Concat(self.Owner.PlayerActor.TraitsImplementing<INotifyKilled>()))
+					nd.Killed(self, ai);
+				
 				if( RemoveOnDeath )
 					self.Destroy();
 
 				Log.Write("debug", "{0} #{1} killed by {2} #{3}", self.Info.Name, self.ActorID, attacker.Info.Name, attacker.ActorID);
 			}
+		}
 
-			if (hp > MaxHP)	hp = MaxHP;
-		}
-
-		public void Tick(Actor self)
-		{
-			if (hp > DisplayHp)
-				DisplayHp = hp;
-
-			if (DisplayHp > hp)
-				DisplayHp = (2 * DisplayHp + hp) / 3;
-		}
+		public void Tick(Actor self)
+		{
+			if (hp > DisplayHp)
+				DisplayHp = hp;
+
+			if (DisplayHp > hp)
+				DisplayHp = (2 * DisplayHp + hp) / 3;
+		}
 	}
 	
 	
@@ -156,7 +164,7 @@ namespace OpenRA.Traits
 		}
 				
 		public static DamageState GetDamageState(this Actor self)
-		{
+		{
 			if (self.Destroyed) return DamageState.Dead;
 
 			var health = self.TraitOrDefault<Health>();

OpenRA.Game/Traits/Player/DeveloperMode.cs

@@ -19,8 +19,7 @@ namespace OpenRA.Traits
 		public bool FastCharge = false;
 		public bool DisableShroud = false;
 		public bool PathDebug = false;
-		public bool UnitInfluenceDebug = false;
-		public bool UnlimitedPower;
+		public bool UnlimitedPower;
         public bool BuildAnywhere;
 		
 		public object Create (ActorInitializer init) { return new DeveloperMode(this); }
@@ -34,8 +33,7 @@ namespace OpenRA.Traits
 		[Sync] public bool FastBuild;
 		[Sync] public bool DisableShroud;
 		[Sync] public bool PathDebug;
-		[Sync] public bool UnitInfluenceDebug;
-		[Sync] public bool UnlimitedPower;
+		[Sync] public bool UnlimitedPower;
         [Sync] public bool BuildAnywhere;
 
 		public DeveloperMode(DeveloperModeInfo info)
@@ -45,8 +43,7 @@ namespace OpenRA.Traits
 			FastCharge = info.FastCharge;
 			DisableShroud = info.DisableShroud;
 			PathDebug = info.PathDebug;
-			UnitInfluenceDebug = info.UnitInfluenceDebug;
-			UnlimitedPower = info.UnlimitedPower;
+			UnlimitedPower = info.UnlimitedPower;
             BuildAnywhere = info.BuildAnywhere;
 		}
 		
@@ -88,11 +85,6 @@ namespace OpenRA.Traits
 						PathDebug ^= true;
 						break;
 					}
-				case "DevUnitDebug":
-					{
-						UnitInfluenceDebug ^= true;
-						break;
-					}
 				case "DevGiveExploration":
 					{
 						if (self.World.LocalPlayer == self.Owner)
@@ -103,11 +95,11 @@ namespace OpenRA.Traits
 					{
 						UnlimitedPower ^= true;
 						break;
-					}
-                case "DevBuildAnywhere":
-                    {
-                        BuildAnywhere ^= true;
-                        break;
+					}
+                case "DevBuildAnywhere":
+                    {
+                        BuildAnywhere ^= true;
+                        break;
                     }
 				default:
 					return;

OpenRA.Game/Traits/Player/PlayerResources.cs

@@ -132,7 +132,8 @@ namespace OpenRA.Traits
 		{
 			var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
 
-			OreCapacity = self.World.Queries.OwnedBy[Owner].WithTrait<IStoreOre>()
+			OreCapacity = self.World.ActorsWithTrait<IStoreOre>()
+                .Where(a => a.Actor.Owner == Owner)
 				.Sum(a => a.Trait.Capacity);
 			
 			if (Ore > OreCapacity)

OpenRA.Game/Traits/Selectable.cs

@@ -49,33 +49,33 @@ namespace OpenRA.Traits
 			DrawControlGroup(wr, self, xy);
 			DrawPips(wr, self, xY);
 			DrawTags(wr, self, new float2(.5f * (bounds.Left + bounds.Right), bounds.Top));
-			DrawUnitPath(self);
+			DrawUnitPath(self);
 			DrawExtraBars(self, xy, Xy);
-		}
-
-		public void DrawRollover(WorldRenderer wr, Actor self)
-		{
+		}
+
+		public void DrawRollover(WorldRenderer wr, Actor self)
+		{
 			var bounds = self.GetBounds(false);
-			
+			
 			var xy = new float2(bounds.Left, bounds.Top);
 			var Xy = new float2(bounds.Right, bounds.Top);
-
-			DrawHealthBar(self, xy, Xy);
-			DrawExtraBars(self, xy, Xy);
-		}
-
-		void DrawExtraBars(Actor self, float2 xy, float2 Xy)
-		{
-			foreach (var extraBar in self.TraitsImplementing<ISelectionBar>())
-			{
-				var value = extraBar.GetValue();
-				if (value != 0)
-				{
-					xy.Y += 4;
-					Xy.Y += 4;
-					DrawSelectionBar(self, xy, Xy, extraBar.GetValue(), extraBar.GetColor());
-				}
-			}
+
+			DrawHealthBar(self, xy, Xy);
+			DrawExtraBars(self, xy, Xy);
+		}
+
+		void DrawExtraBars(Actor self, float2 xy, float2 Xy)
+		{
+			foreach (var extraBar in self.TraitsImplementing<ISelectionBar>())
+			{
+				var value = extraBar.GetValue();
+				if (value != 0)
+				{
+					xy.Y += 4;
+					Xy.Y += 4;
+					DrawSelectionBar(self, xy, Xy, extraBar.GetValue(), extraBar.GetColor());
+				}
+			}
 		}
 		
 		void DrawSelectionBox(Actor self, float2 xy, float2 Xy, float2 xY, float2 XY, Color c)
@@ -89,29 +89,29 @@ namespace OpenRA.Traits
 			Game.Renderer.LineRenderer.DrawLine(xY, xY + new float2(0, -4), c, c);
 			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(-4, 0), c, c);
 			Game.Renderer.LineRenderer.DrawLine(XY, XY + new float2(0, -4), c, c);
-		}
-
-		void DrawSelectionBar(Actor self, float2 xy, float2 Xy, float value, Color barColor)
-		{
-			if (!self.IsInWorld) return;
-
-			var health = self.TraitOrDefault<Health>();
-			if (health == null || health.IsDead) return;
-
-			var c = Color.FromArgb(128, 30, 30, 30);
-			var c2 = Color.FromArgb(128, 10, 10, 10);
-
-			var barColor2 = Color.FromArgb(255, barColor.R / 2, barColor.G / 2, barColor.B / 2);
-
-			var z = float2.Lerp(xy, Xy, value);
-
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), Xy + new float2(0, -4), c, c);
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -3), Xy + new float2(0, -3), c2, c2);
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), Xy + new float2(0, -2), c, c);
-
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -3), z + new float2(0, -3), barColor, barColor);
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), z + new float2(0, -2), barColor2, barColor2);
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), barColor2, barColor2);
+		}
+
+		void DrawSelectionBar(Actor self, float2 xy, float2 Xy, float value, Color barColor)
+		{
+			if (!self.IsInWorld) return;
+
+			var health = self.TraitOrDefault<Health>();
+			if (health == null || health.IsDead) return;
+
+			var c = Color.FromArgb(128, 30, 30, 30);
+			var c2 = Color.FromArgb(128, 10, 10, 10);
+
+			var barColor2 = Color.FromArgb(255, barColor.R / 2, barColor.G / 2, barColor.B / 2);
+
+			var z = float2.Lerp(xy, Xy, value);
+
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), Xy + new float2(0, -4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -3), Xy + new float2(0, -3), c2, c2);
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), Xy + new float2(0, -2), c, c);
+
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -3), z + new float2(0, -3), barColor, barColor);
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), z + new float2(0, -2), barColor2, barColor2);
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), barColor2, barColor2);
 		}
 		
 		void DrawHealthBar(Actor self, float2 xy, float2 Xy)
@@ -121,7 +121,7 @@ namespace OpenRA.Traits
 			var health = self.TraitOrDefault<Health>();
 			if (health == null || health.IsDead) return;
 			
-			var c = Color.FromArgb(128, 30, 30, 30);
+			var c = Color.FromArgb(128, 30, 30, 30);
 			var c2 = Color.FromArgb(128, 10, 10, 10);
 
 			var healthColor = (health.DamageState == DamageState.Critical) ? Color.Red :
@@ -133,30 +133,30 @@ namespace OpenRA.Traits
 				healthColor.G / 2,
 				healthColor.B / 2);
 
-			var z = float2.Lerp(xy, Xy, health.HPFraction);
-			
-
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), Xy + new float2(0, -4), c, c);
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -3), Xy + new float2(0, -3), c2, c2);
+			var z = float2.Lerp(xy, Xy, (float)health.HP / health.MaxHP);
+			
+
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), Xy + new float2(0, -4), c, c);
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -3), Xy + new float2(0, -3), c2, c2);
 			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), Xy + new float2(0, -2), c, c);
 
 			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -3), z + new float2(0, -3), healthColor, healthColor);
 			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), z + new float2(0, -2), healthColor2, healthColor2);
-			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), healthColor2, healthColor2);
-
-			if (health.DisplayHp != health.HP)
-			{
-				var deltaColor = Color.OrangeRed;
-				var deltaColor2 = Color.FromArgb(
-					255,
-					deltaColor.R / 2,
-					deltaColor.G / 2,
-					deltaColor.B / 2);
-				var zz = float2.Lerp(xy, Xy, (float)health.DisplayHp / health.MaxHP);
-
-				Game.Renderer.LineRenderer.DrawLine(z + new float2(0, -3), zz + new float2(0, -3), deltaColor, deltaColor);
-				Game.Renderer.LineRenderer.DrawLine(z + new float2(0, -2), zz + new float2(0, -2), deltaColor2, deltaColor2);
-				Game.Renderer.LineRenderer.DrawLine(z + new float2(0, -4), zz + new float2(0, -4), deltaColor2, deltaColor2);
+			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), healthColor2, healthColor2);
+
+			if (health.DisplayHp != health.HP)
+			{
+				var deltaColor = Color.OrangeRed;
+				var deltaColor2 = Color.FromArgb(
+					255,
+					deltaColor.R / 2,
+					deltaColor.G / 2,
+					deltaColor.B / 2);
+				var zz = float2.Lerp(xy, Xy, (float)health.DisplayHp / health.MaxHP);
+
+				Game.Renderer.LineRenderer.DrawLine(z + new float2(0, -3), zz + new float2(0, -3), deltaColor, deltaColor);
+				Game.Renderer.LineRenderer.DrawLine(z + new float2(0, -2), zz + new float2(0, -2), deltaColor2, deltaColor2);
+				Game.Renderer.LineRenderer.DrawLine(z + new float2(0, -4), zz + new float2(0, -4), deltaColor2, deltaColor2);
 			}
 		}
 
@@ -237,12 +237,12 @@ namespace OpenRA.Traits
 			if (activity != null && mobile != null)
 			{
 				var alt = new float2(0, -mobile.Altitude);
-				var path = activity.GetCurrentPath();
+				var targets = activity.GetTargets(self);
 				var start = self.CenterLocation + alt;
 
 				var c = Color.Green;
 
-				foreach (var step in path)
+				foreach (var step in targets.Select(p => p.CenterLocation))
 				{
 					var stp = step + alt;
 					Game.Renderer.LineRenderer.DrawLine(stp + new float2(-1, -1), stp + new float2(-1, 1), c, c);

OpenRA.Game/Traits/SubcellInit.cs

@@ -1,26 +1,36 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
-
-namespace OpenRA.Traits
-{
-	public class SubCellInit : IActorInit<SubCell>
-	{
-		[FieldFromYamlKey]
-		public readonly int value = 0;
-
-		public SubCellInit() { }
-
-		public SubCellInit(int init)
-		{
-			value = init;
-		}
-
-		public SubCell Value(World world)
-		{
-			return (SubCell)value;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using OpenRA.FileFormats;
+
+namespace OpenRA.Traits
+{
+	public class SubCellInit : IActorInit<SubCell>
+	{
+		[FieldFromYamlKey]
+		public readonly int value = 0;
+
+		public SubCellInit() { }
+
+		public SubCellInit(int init)
+		{
+			value = init;
+		}
+
+		public SubCell Value(World world)
+		{
+			return (SubCell)value;
+		}
+	}
+}

OpenRA.Game/Traits/Target.cs

@@ -12,6 +12,8 @@ namespace OpenRA.Traits
 {
 	public struct Target		// a target: either an actor, or a fixed location.
 	{
+		public static Target[] NoTargets = {};
+		
 		Actor actor;
 		Player owner;
 		int2 pos;

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -6,169 +6,163 @@
  * as published by the Free Software Foundation. For more information,
  * see COPYING.
  */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Graphics;
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
 using OpenRA.Network;
 
 namespace OpenRA.Traits
 {
-	// depends on the order of pips in WorldRenderer.cs!
-	public enum PipType { Transparent, Green, Yellow, Red, Gray };
-	public enum TagType { None, Fake, Primary };
-	public enum Stance { Enemy, Neutral, Ally };
+    // depends on the order of pips in WorldRenderer.cs!
+    public enum PipType { Transparent, Green, Yellow, Red, Gray };
+    public enum TagType { None, Fake, Primary };
+    public enum Stance { Enemy, Neutral, Ally };
 
-	public class AttackInfo
-	{
-		public Actor Attacker;
-		public WarheadInfo Warhead;
-		public int Damage;
-		public DamageState DamageState;
-		public DamageState PreviousDamageState;
-        public bool DamageStateChanged;
-        public int PreviousHealth;
-        public int Health;
-	}
-
-	public interface ITick { void Tick(Actor self); }
-	public interface IRender { IEnumerable<Renderable> Render(Actor self); }
-
-	public interface IIssueOrder
-	{
-		IEnumerable<IOrderTargeter> Orders { get; }
-		Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued );
-	}
-	public interface IOrderTargeter
-	{
-		string OrderID { get; }
-		int OrderPriority { get; }
-		bool CanTargetActor( Actor self, Actor target, bool forceAttack, bool forceMove, bool forceQueue, ref string cursor );
-		bool CanTargetLocation(Actor self, int2 location, List<Actor> actorsAtLocation, bool forceAttack, bool forceQueue, bool forceMove, ref string cursor);
-		bool IsQueued { get; }    
-	}
-    public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
-    public interface IValidateOrder { bool OrderValidation(OrderManager orderManager, World world, int clientId, Order order);
+    public class AttackInfo
+    {
+        public Actor Attacker;
+        public WarheadInfo Warhead;
+        public int Damage;
+        public DamageState DamageState;
+        public DamageState PreviousDamageState;
     }
-	public interface IOrderCursor { string CursorForOrder(Actor self, Order order); }
-	public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }
-    public interface ICustomUnitOrderGenerator : IOrderGenerator {};
-	public interface INotifySold { void Selling( Actor self );  void Sold( Actor self ); }
-	public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
-	public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
-	public interface INotifyProduction { void UnitProduced(Actor self, Actor other, int2 exit); }
-	public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
-	public interface INotifyOtherCaptured { void OnActorCaptured(Actor self, Actor captured, Actor captor, Player oldOwner, Player newOwner); }
-	public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
-	public interface IStoreOre { int Capacity { get; }}
-	public interface IToolTip 
-	{ 
-		string Name();
-		Player Owner();
-		Stance Stance();
-	}
-	
-	public interface IDisable { bool Disabled { get; } }
-	public interface IExplodeModifier { bool ShouldExplode(Actor self); }
-	public interface INudge { void OnNudge(Actor self, Actor nudger); }
 
-	public interface IRadarSignature
-	{
-		IEnumerable<int2> RadarSignatureCells(Actor self);
-		Color RadarSignatureColor(Actor self);
-	}
-	
-	public interface IVisibilityModifier { bool IsVisible(Actor self); }
-	public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
-	public interface IHasLocation
-	{
-		int2 PxPosition { get; }
-	}
-	
-	public enum SubCell
-	{
-		FullCell,
-		TopLeft,
-		TopRight,
-		Center,
-		BottomLeft,
-		BottomRight
-	}
+    public interface ITick { void Tick(Actor self); }
+    public interface IRender { IEnumerable<Renderable> Render(Actor self); }
 
-	public interface IOccupySpace : IHasLocation
-	{
-		int2 TopLeft { get; }
-		IEnumerable<Pair<int2, SubCell>> OccupiedCells();
-	}
-	
-	public static class IOccupySpaceExts
-	{
-		public static int2 NearestCellTo( this IOccupySpace ios, int2 other )
-		{
-			var nearest = ios.TopLeft;
-			var nearestDistance = int.MaxValue;
-			foreach( var cell in ios.OccupiedCells() )
-			{
-				var dist = ( other - cell.First ).LengthSquared;
-				if( dist < nearestDistance )
-				{
-					nearest = cell.First;
-					nearestDistance = dist;
-				}
-			}
-			return nearest;
-		}
-	}
+    public interface IIssueOrder
+    {
+        IEnumerable<IOrderTargeter> Orders { get; }
+        Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued);
+    }
 
-	public interface INotifyAttack { void Attacking(Actor self, Target target); }
-	public interface IRenderModifier { IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r); }
+    public interface IOrderTargeter
+    {
+        string OrderID { get; }
+        int OrderPriority { get; }
+        bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceMove, bool forceQueue, ref string cursor);
+        bool CanTargetLocation(Actor self, int2 location, List<Actor> actorsAtLocation, bool forceAttack, bool forceQueue, bool forceMove, ref string cursor);
+        bool IsQueued { get; }
+    }
+
+    public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
+    public interface IValidateOrder { bool OrderValidation(OrderManager orderManager, World world, int clientId, Order order); }
+    public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }
+    public interface INotifySold { void Selling(Actor self); void Sold(Actor self); }
+    public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
+    public interface INotifyDamageStateChanged { void DamageStateChanged(Actor self, AttackInfo e); }
+    public interface INotifyKilled { void Killed(Actor self, AttackInfo e); }
+    public interface INotifyAppliedDamage { void AppliedDamage(Actor self, Actor damaged, AttackInfo e); }
+    public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
+    public interface INotifyProduction { void UnitProduced(Actor self, Actor other, int2 exit); }
+    public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
+    public interface INotifyOtherCaptured { void OnActorCaptured(Actor self, Actor captured, Actor captor, Player oldOwner, Player newOwner); }
+    public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
+    public interface IStoreOre { int Capacity { get; } }
+    public interface IToolTip
+    {
+        string Name();
+        Player Owner();
+        Stance Stance();
+    }
+
+    public interface IDisable { bool Disabled { get; } }
+    public interface IExplodeModifier { bool ShouldExplode(Actor self); }
+    public interface INudge { void OnNudge(Actor self, Actor nudger); }
+
+    public interface IRadarSignature
+    {
+        IEnumerable<int2> RadarSignatureCells(Actor self);
+        Color RadarSignatureColor(Actor self);
+    }
+
+    public interface IVisibilityModifier { bool IsVisible(Actor self); }
+    public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
+	public interface IHasLocation { int2 PxPosition { get; } }
+
+    public enum SubCell
+    {
+        FullCell,
+        TopLeft,
+        TopRight,
+        Center,
+        BottomLeft,
+        BottomRight
+    }
+
+    public interface IOccupySpace : IHasLocation
+    {
+        int2 TopLeft { get; }
+        IEnumerable<Pair<int2, SubCell>> OccupiedCells();
+    }
+
+    public static class IOccupySpaceExts
+    {
+        public static int2 NearestCellTo(this IOccupySpace ios, int2 other)
+        {
+            var nearest = ios.TopLeft;
+            var nearestDistance = int.MaxValue;
+            foreach (var cell in ios.OccupiedCells())
+            {
+                var dist = (other - cell.First).LengthSquared;
+                if (dist < nearestDistance)
+                {
+                    nearest = cell.First;
+                    nearestDistance = dist;
+                }
+            }
+            return nearest;
+        }
+    }
+
+    public interface INotifyAttack { void Attacking(Actor self, Target target); }
+    public interface IRenderModifier { IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r); }
     public interface IDamageModifier { float GetDamageModifier(Actor attacker, WarheadInfo warhead); }
-	public interface ISpeedModifier { decimal GetSpeedModifier(); }
-	public interface IFirepowerModifier { float GetFirepowerModifier(); }
-	public interface ISelectionColorModifier { Color GetSelectionColorModifier(Actor self, Color defaultColor); }
-	public interface IPalette { void InitPalette( WorldRenderer wr ); }
-	public interface IPaletteModifier { void AdjustPalette(Dictionary<string,Palette> b); }
-	public interface IPips { IEnumerable<PipType> GetPips(Actor self); }
-	public interface ITags { IEnumerable<TagType> GetTags(); }
-	public interface ISelectionBar { float GetValue(); Color GetColor(); }
+    public interface ISpeedModifier { decimal GetSpeedModifier(); }
+    public interface IFirepowerModifier { float GetFirepowerModifier(); }
+    public interface ISelectionColorModifier { Color GetSelectionColorModifier(Actor self, Color defaultColor); }
+    public interface IPalette { void InitPalette(WorldRenderer wr); }
+    public interface IPaletteModifier { void AdjustPalette(Dictionary<string, Palette> b); }
+    public interface IPips { IEnumerable<PipType> GetPips(Actor self); }
+    public interface ITags { IEnumerable<TagType> GetTags(); }
+    public interface ISelectionBar { float GetValue(); Color GetColor(); }
 
-	public interface ITeleportable : IHasLocation /* crap name! */
-	{
-		bool CanEnterCell(int2 location);
-		void SetPosition(Actor self, int2 cell);
-		void SetPxPosition(Actor self, int2 px);
-		void AdjustPxPosition(Actor self, int2 px);	/* works like SetPxPosition, but visual only */
-	}
+    public interface ITeleportable : IHasLocation /* crap name! */
+    {
+        bool CanEnterCell(int2 location);
+        void SetPosition(Actor self, int2 cell);
+        void SetPxPosition(Actor self, int2 px);
+        void AdjustPxPosition(Actor self, int2 px);	/* works like SetPxPosition, but visual only */
+    }
+
+	public interface IMove : ITeleportable { int Altitude { get; set; } }
 
-	public interface IMove : ITeleportable
-	{
-		int Altitude { get; set; }
-	}
-	
-	public interface IFacing
-	{
-		int ROT { get; }
-		int Facing { get; set; }
-		int InitialFacing { get; }
-	}
-	
-	public interface ICrushable
-	{
-		void OnCrush(Actor crusher);
-		IEnumerable<string> CrushClasses { get; }
-	}
-		
-	public struct Renderable
-	{
-		public readonly Sprite Sprite;
-		public readonly float2 Pos;
-		public readonly string Palette;
-		public readonly int Z;
-		public readonly int ZOffset;
-	    public float Scale;
+    public interface IFacing
+    {
+        int ROT { get; }
+        int Facing { get; set; }
+        int InitialFacing { get; }
+    }
+
+    public interface ICrushable
+    {
+        void OnCrush(Actor crusher);
+        IEnumerable<string> CrushClasses { get; }
+    }
+
+    public struct Renderable
+    {
+        public readonly Sprite Sprite;
+        public readonly float2 Pos;
+        public readonly string Palette;
+        public readonly int Z;
+        public readonly int ZOffset;
+        public float Scale;
 
         public Renderable(Sprite sprite, float2 pos, string palette, int z, int zOffset, float scale)
         {
@@ -185,56 +179,53 @@ namespace OpenRA.Traits
 
         public Renderable(Sprite sprite, float2 pos, string palette, int z, float scale)
             : this(sprite, pos, palette, z, 0, scale) { }
-		
+
         public Renderable WithScale(float newScale) { return new Renderable(Sprite, Pos, Palette, Z, ZOffset, newScale); }
         public Renderable WithPalette(string newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); }
         public Renderable WithZOffset(int newOffset) { return new Renderable(Sprite, Pos, Palette, Z, newOffset, Scale); }
-		public Renderable WithPos(float2 newPos) { return new Renderable(Sprite, newPos, Palette, Z, ZOffset, Scale); }
-	}
+        public Renderable WithPos(float2 newPos) { return new Renderable(Sprite, newPos, Palette, Z, ZOffset, Scale); }
+    }
 
-	public interface ITraitInfo { object Create(ActorInitializer init); }
+    public interface ITraitInfo { object Create(ActorInitializer init); }
 
-	public class TraitInfo<T> : ITraitInfo where T : new() { public virtual object Create(ActorInitializer init) { return new T(); } }
+    public class TraitInfo<T> : ITraitInfo where T : new() { public virtual object Create(ActorInitializer init) { return new T(); } }
 
-	public interface ITraitPrerequisite<T> where T : ITraitInfo { }
+    public interface ITraitPrerequisite<T> where T : ITraitInfo { }
 
-	public interface INotifySelection { void SelectionChanged(); }
-	public interface IWorldLoaded { void WorldLoaded(World w); }
-	public interface ICreatePlayers { void CreatePlayers(World w); }
+    public interface INotifySelection { void SelectionChanged(); }
+    public interface IWorldLoaded { void WorldLoaded(World w); }
+    public interface ICreatePlayers { void CreatePlayers(World w); }
 
-	public interface IBotInfo { string Name { get; } }
-	public interface IBot
-	{
-		void Activate(Player p);
-		IBotInfo Info { get; }
-	}
-	
-	public interface IActivity
-	{
-		IActivity Tick(Actor self);
-		void Cancel(Actor self);
-		void Queue(IActivity activity);
-		IEnumerable<float2> GetCurrentPath();
-	}
+    public interface IBotInfo { string Name { get; } }
+    public interface IBot
+    {
+        void Activate(Player p);
+        IBotInfo Info { get; }
+    }
 
-	public interface IRenderOverlay { void Render( WorldRenderer wr ); }
-	public interface INotifyIdle { void TickIdle(Actor self); }
+    public interface IRenderOverlay { void Render(WorldRenderer wr); }
+    public interface INotifyIdle { void TickIdle(Actor self); }
 
-	public interface IBlocksBullets { }
+    public interface IBlocksBullets { }
 
-	public interface IPostRender { void RenderAfterWorld(WorldRenderer wr, Actor self); }
+    public interface IPostRender { void RenderAfterWorld(WorldRenderer wr, Actor self); }
 
-	public interface IPostRenderSelection { void RenderAfterWorld(WorldRenderer wr, Actor self); }
-	public interface IPreRenderSelection { void RenderBeforeWorld(WorldRenderer wr, Actor self); }
-	public interface IRenderAsTerrain { IEnumerable<Renderable> RenderAsTerrain(Actor self); }
+    public interface IPostRenderSelection { void RenderAfterWorld(WorldRenderer wr, Actor self); }
+    public interface IPreRenderSelection { void RenderBeforeWorld(WorldRenderer wr, Actor self); }
+    public interface IRenderAsTerrain { IEnumerable<Renderable> RenderAsTerrain(Actor self); }
 
-	public interface ITargetable
-	{
-		string[] TargetTypes { get; }
-		IEnumerable<int2> TargetableCells( Actor self );
-		bool TargetableBy(Actor self, Actor byActor);
-	}
+    public interface ITargetable
+    {
+        string[] TargetTypes { get; }
+        IEnumerable<int2> TargetableCells(Actor self);
+        bool TargetableBy(Actor self, Actor byActor);
+    }
 
-	public interface INotifyStanceChanged { void StanceChanged(Actor self, Player a, Player b, 
-		Stance oldStance, Stance newStance); }
+    public interface INotifyStanceChanged
+    {
+        void StanceChanged(Actor self, Player a, Player b,
+            Stance oldStance, Stance newStance);
+    }
+
+    public interface ILintPass { void Run(Action<string> emitError); }
 }

OpenRA.Game/Traits/Util.cs

@@ -14,6 +14,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Support;
 using System.Collections.Generic;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
@@ -103,13 +104,13 @@ namespace OpenRA.Traits
 			return new Renderable(s, loc.Round(), pal, (int)self.CenterLocation.Y);
 		}
 
-		public static IActivity SequenceActivities(params IActivity[] acts)
+		public static Activity SequenceActivities(params Activity[] acts)
 		{
 			return acts.Reverse().Aggregate(
 				(next, a) => { a.Queue( next ); return a; });
 		}
 
-		public static IActivity RunActivity( Actor self, IActivity act )
+		public static Activity RunActivity( Actor self, Activity act )
 		{
 			while( act != null )
 			{

OpenRA.Game/Traits/World/Shroud.cs

@@ -126,7 +126,7 @@ namespace OpenRA.Traits
 			}
 			// Is now our ally; add unit vis
 			if (newStance == Stance.Ally)
-				foreach (var a in w.Queries.OwnedBy[player])
+				foreach (var a in w.Actors.Where( a => a.Owner == player ))
 					AddActor(a);
 		}
 

OpenRA.Game/Traits/World/SpatialBins.cs

@@ -45,7 +45,7 @@ namespace OpenRA.Traits
 				for (var i = 0; i <= bins.GetUpperBound(0); i++)
 					bins[i, j].Clear();
 
-			foreach (var a in self.World.Queries.WithTrait<IHasLocation>())
+			foreach (var a in self.World.ActorsWithTrait<IHasLocation>())
 			{
 				var bounds = a.Actor.GetBounds(true);
 

OpenRA.Game/UiOverlay.cs

@@ -9,20 +9,19 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Drawing;
-using OpenRA.Graphics;
-
+using System.Drawing;
+using OpenRA.Graphics;
+
 namespace OpenRA
 {
 	public class UiOverlay
 	{
-		Sprite buildOk, buildBlocked, unitDebug;
+		Sprite buildOk, buildBlocked;
 
 		public UiOverlay()
 		{
 			buildOk = SynthesizeTile(0x0f);
 			buildBlocked = SynthesizeTile(0x08);
-			unitDebug = SynthesizeTile(0x04);
 		}
 
 		public static Sprite SynthesizeTile(byte paletteIndex)

OpenRA.Game/Utilities.cs

@@ -42,7 +42,7 @@ namespace OpenRA
 		{
 			Process p = new Process();
 			p.StartInfo.FileName = Utility;
-			p.StartInfo.Arguments = args;
+			p.StartInfo.Arguments = "{0} --SupportDir \"{1}\"".F(args, Game.SupportDir);
 			p.StartInfo.UseShellExecute = false;
 			p.StartInfo.CreateNoWindow = true;
 			p.StartInfo.RedirectStandardOutput = true;
@@ -58,7 +58,7 @@ namespace OpenRA
 		{
 			Process p = new Process();
 			p.StartInfo.FileName = Utility;
-			p.StartInfo.Arguments = args;
+			p.StartInfo.Arguments = "{0} --SupportDir \"{1}\"".F(args, Game.SupportDir);
 			p.StartInfo.UseShellExecute = false;
 			p.StartInfo.CreateNoWindow = true;
 			p.StartInfo.RedirectStandardOutput = true;

OpenRA.Game/Widgets/ChatEntryWidget.cs

@@ -56,7 +56,7 @@ namespace OpenRA.Widgets
 		{
 			if (e.Event == KeyInputEvent.Up) return false;
 			
-			if (e.KeyChar == '\r')
+			if (e.KeyName == "return" || e.KeyName == "enter" )
 			{
 				if (composing)
 				{
@@ -94,15 +94,15 @@ namespace OpenRA.Widgets
 
 			if (composing)
 			{
-				if (e.KeyChar == '\b' || e.KeyChar == 0x7f)
+				if (e.KeyName == "backspace")
 				{
 					if (content.Length > 0)
 						content = content.Remove(content.Length - 1);
 					return true;
 				}
-				else if (!char.IsControl(e.KeyChar))
+				else if (e.IsValidInput())
 				{
-					content += e.KeyChar;
+					content += e.UnicodeChar.ToString();
 					return true;
 				}
 

OpenRA.Game/Widgets/TextFieldWidget.cs

@@ -95,10 +95,10 @@ namespace OpenRA.Widgets
 			if (!Focused)
 				return false;
 
-			if (e.KeyChar == '\r' && OnEnterKey())
+			if ((e.KeyName == "return" || e.KeyName == "enter") && OnEnterKey())
 				return true;
 
-			if (e.KeyChar == '\t' && OnTabKey())
+			if (e.KeyName == "tab" && OnTabKey())
 				return true;
 
 			if (e.KeyName == "left")
@@ -116,6 +116,18 @@ namespace OpenRA.Widgets
 
 				return true;
 			}
+			
+			if (e.KeyName == "home")
+			{
+				CursorPosition = 0;
+				return true;
+			}
+			
+			if (e.KeyName == "end")
+			{
+				CursorPosition = Text.Length;
+				return true;
+			}
 
 			if (e.KeyName == "delete")
 			{
@@ -126,31 +138,29 @@ namespace OpenRA.Widgets
 				return true;
 			}
 
-			TypeChar(e.KeyChar);
+			TypeChar(e);
 			return true;
 		}
 
-		public void TypeChar(char c)
+		public void TypeChar(KeyInput key)
 		{
-			// backspace
-			if (c == '\b' || c == 0x7f)
+			if (Text == null)
+				Text = "";
+			
+			if (key.KeyName == "backspace" && Text.Length > 0 && CursorPosition > 0)
 			{
-				if (Text.Length > 0 && CursorPosition > 0)
-				{
-					Text = Text.Remove(CursorPosition - 1, 1);
-
-					CursorPosition--;
-				}
+				Text = Text.Remove(CursorPosition - 1, 1);
+				CursorPosition--;
 			}
-			else if (!char.IsControl(c))
-			{
-				if (Text == null)
-					Text = "";
-				
+			else if (key.KeyName == "delete" && Text.Length > 0 && CursorPosition < Text.Length - 1)
+				Text = Text.Remove(CursorPosition, 1);
+		
+			else if (key.IsValidInput())
+			{	
 				if (MaxLength > 0 && Text.Length >= MaxLength)
 					return;
 
-				Text = Text.Insert(CursorPosition, c.ToString());
+				Text = Text.Insert(CursorPosition, key.UnicodeChar.ToString());
 
 				CursorPosition++;
 			}

OpenRA.Game/Widgets/VqaPlayerWidget.cs

@@ -108,7 +108,7 @@ namespace OpenRA.Widgets
 		{
 			if (e.Event == KeyInputEvent.Down)
 			{
-				if (e.KeyChar == 27) // Escape
+				if (e.KeyName == "escape")
 				{
 					Stop();
 					return true;

OpenRA.Game/Widgets/Widget.cs

@@ -17,352 +17,365 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
-	public abstract class Widget
-	{
-		// Info defined in YAML
-		public string Id = null;
-		public string X = "0";
-		public string Y = "0";
-		public string Width = "0";
-		public string Height = "0";
-		public string Delegate = null;
-		public string EventHandler = null;
-		public bool Visible = true;
-		
-		public readonly List<Widget> Children = new List<Widget>();
+    public abstract class Widget
+    {
+        // Info defined in YAML
+        public string Id = null;
+        public string X = "0";
+        public string Y = "0";
+        public string Width = "0";
+        public string Height = "0";
+        public string Delegate = null;
+        public string EventHandler = null;
+        public bool Visible = true;
 
-		// Calculated internally
-		public Rectangle Bounds;
-		public Widget Parent = null;
+        public readonly List<Widget> Children = new List<Widget>();
 
-		public static Stack<Widget> WindowList = new Stack<Widget>();
-		
-		// Common Funcs that most widgets will want
-		public Func<MouseInput, bool> OnMouseDown = mi => false;
-		public Func<MouseInput, bool> OnMouseUp = mi => false;
-		public Action<MouseInput> OnMouseMove = mi => {};
-		public Func<KeyInput, bool> OnKeyPress = e => false;
+        // Calculated internally
+        public Rectangle Bounds;
+        public Widget Parent = null;
 
-		public Func<bool> IsVisible;
+        public static Stack<Widget> WindowList = new Stack<Widget>();
 
-		public Widget() { IsVisible = () => Visible; }
+        // Common Funcs that most widgets will want
+        public Func<MouseInput, bool> OnMouseDown = mi => false;
+        public Func<MouseInput, bool> OnMouseUp = mi => false;
+        public Action<MouseInput> OnMouseMove = mi => { };
+        public Func<KeyInput, bool> OnKeyPress = e => false;
 
-		public static Widget RootWidget
-		{
-			get { return rootWidget; }
-			set { rootWidget = value; }
-		}
-		private static Widget rootWidget = new ContainerWidget();
-		
-		public Widget(Widget widget)
-		{	
-			Id = widget.Id;
-			X = widget.X;
-		 	Y = widget.Y;
-		 	Width = widget.Width;
-			Height = widget.Height;
-		 	Delegate = widget.Delegate;
-		 	Visible = widget.Visible;
-			
-			Bounds = widget.Bounds;
-			Parent = widget.Parent;
-			
-			OnMouseDown = widget.OnMouseDown;
-			OnMouseUp = widget.OnMouseUp;
-			OnMouseMove = widget.OnMouseMove;
-			OnKeyPress = widget.OnKeyPress;
+        public Func<bool> IsVisible;
 
-			IsVisible = widget.IsVisible;
-			
-			foreach(var child in widget.Children)
-				AddChild(child.Clone());
-		}
+        public Widget() { IsVisible = () => Visible; }
 
-		public virtual Widget Clone()
-		{
-			throw new InvalidOperationException("Widget type `{0}` is not cloneable.".F(GetType().Name));
-		}
+        public static Widget RootWidget
+        {
+            get { return rootWidget; }
+            set { rootWidget = value; }
+        }
+        private static Widget rootWidget = new ContainerWidget();
 
-		public virtual int2 RenderOrigin
-		{
-			get
-			{
-				var offset = (Parent == null) ? int2.Zero : Parent.ChildOrigin;
-				return new int2(Bounds.X, Bounds.Y) + offset;
-			}
-		}
+        public Widget(Widget widget)
+        {
+            Id = widget.Id;
+            X = widget.X;
+            Y = widget.Y;
+            Width = widget.Width;
+            Height = widget.Height;
+            Delegate = widget.Delegate;
+            Visible = widget.Visible;
 
-		public virtual int2 ChildOrigin	{ get { return RenderOrigin; } }
-		public virtual Rectangle RenderBounds { get { return new Rectangle(RenderOrigin.X, RenderOrigin.Y, Bounds.Width, Bounds.Height); } }
+            Bounds = widget.Bounds;
+            Parent = widget.Parent;
 
-		public virtual void Initialize()
-		{
-			// Parse the YAML equations to find the widget bounds
-			var parentBounds = (Parent == null)
-				? new Rectangle(0, 0, Game.viewport.Width, Game.viewport.Height)
-				: Parent.Bounds;
+            OnMouseDown = widget.OnMouseDown;
+            OnMouseUp = widget.OnMouseUp;
+            OnMouseMove = widget.OnMouseMove;
+            OnKeyPress = widget.OnKeyPress;
 
-			var substitutions = new Dictionary<string, int>();
-			substitutions.Add("WINDOW_RIGHT", Game.viewport.Width);
-			substitutions.Add("WINDOW_BOTTOM", Game.viewport.Height);
-			substitutions.Add("PARENT_RIGHT", parentBounds.Width);
-			substitutions.Add("PARENT_LEFT", parentBounds.Left);
-			substitutions.Add("PARENT_TOP", parentBounds.Top);
-			substitutions.Add("PARENT_BOTTOM", parentBounds.Height);
-			int width = Evaluator.Evaluate(Width, substitutions);
-			int height = Evaluator.Evaluate(Height, substitutions);
+            IsVisible = widget.IsVisible;
 
-			substitutions.Add("WIDTH", width);
-			substitutions.Add("HEIGHT", height);
+            foreach (var child in widget.Children)
+                AddChild(child.Clone());
+        }
 
-			Bounds = new Rectangle(Evaluator.Evaluate(X, substitutions),
-								   Evaluator.Evaluate(Y, substitutions),
-								   width,
-								   height);
-		}
+        public virtual Widget Clone()
+        {
+            throw new InvalidOperationException("Widget type `{0}` is not cloneable.".F(GetType().Name));
+        }
 
-		public void PostInit(Dictionary<string, object> args)
-		{
-			if( Delegate != null )
-			{
-				args["widget"] = this;
-				Game.modData.ObjectCreator.CreateObject<IWidgetDelegate>(Delegate, args);
-				args.Remove("widget");
-			}
-		}
-		
-		public virtual Rectangle EventBounds { get { return RenderBounds; } }
-		public virtual Rectangle GetEventBounds()
-		{
-			return Children
-				.Where(c => c.IsVisible())
-				.Select(c => c.GetEventBounds())
-				.Aggregate(EventBounds, Rectangle.Union);
-		}
-		
-		public static Widget SelectedWidget;
-		public bool Focused { get { return SelectedWidget == this; } }
-		public virtual bool TakeFocus(MouseInput mi)
-		{
-			if (Focused)
-				return true;
-			
-			if (SelectedWidget != null && !SelectedWidget.LoseFocus(mi))
-				return false;
-			SelectedWidget = this;
-			return true;
-		}
-		
-		// Remove focus from this widget; return false if you don't want to give it up
-		public virtual bool LoseFocus(MouseInput mi)
-		{
-			// Some widgets may need to override focus depending on mouse click
-			return LoseFocus();
-		}
-		
-		public virtual bool LoseFocus()
-		{
-			if (SelectedWidget == this)
-				SelectedWidget = null;
-			
-			return true;
-		}
-		
-		public virtual string GetCursor(int2 pos) { return "default"; }
-		public string GetCursorOuter(int2 pos)
-		{
-			// Is the cursor on top of us?
-			if (!(IsVisible() && GetEventBounds().Contains(pos)))
-				return null;
-			
-			// Do any of our children specify a cursor?
-			foreach (var child in Children.OfType<Widget>().Reverse())
-			{
-				var cc = child.GetCursorOuter(pos);
-				if (cc != null)
-					return cc;
-			}
+        public virtual int2 RenderOrigin
+        {
+            get
+            {
+                var offset = (Parent == null) ? int2.Zero : Parent.ChildOrigin;
+                return new int2(Bounds.X, Bounds.Y) + offset;
+            }
+        }
 
-			return EventBounds.Contains(pos) ? GetCursor(pos) : null;
-		}
-		
-		public static bool HandleInput(MouseInput mi)
-		{
-			bool handled = false;
-			if (SelectedWidget != null && SelectedWidget.HandleMouseInputOuter(mi))
-				handled = true;
-			
-			if (!handled && RootWidget.HandleMouseInputOuter(mi))
-				handled = true;
+        public virtual int2 ChildOrigin { get { return RenderOrigin; } }
+        public virtual Rectangle RenderBounds { get { return new Rectangle(RenderOrigin.X, RenderOrigin.Y, Bounds.Width, Bounds.Height); } }
 
-			if (mi.Event == MouseInputEvent.Move)
-			{
-				Viewport.LastMousePos = mi.Location;
-				Viewport.TicksSinceLastMove = 0;
-			}
-			return handled;
-		}
-		
-		public bool HandleMouseInputOuter(MouseInput mi)
-		{
-			// Are we able to handle this event?
-			if (!(Focused || (IsVisible() && GetEventBounds().Contains(mi.Location.X,mi.Location.Y))))
-				return false;
-			
-			// Send the event to the deepest children first and bubble up if unhandled
-			foreach (var child in Children.OfType<Widget>().Reverse())
-				if (child.HandleMouseInputOuter(mi))
-					return true;
+        public virtual void Initialize()
+        {
+            // Parse the YAML equations to find the widget bounds
+            var parentBounds = (Parent == null)
+                ? new Rectangle(0, 0, Game.viewport.Width, Game.viewport.Height)
+                : Parent.Bounds;
 
-			return HandleMouseInput(mi);
-		}
-		
-		// Hack: Don't eat mouse input that others want
-		// TODO: Solve this properly
-		public virtual bool HandleMouseInput(MouseInput mi)
-		{
-			// Apply any special logic added by delegates; they return true if they caught the input
-			if (mi.Event == MouseInputEvent.Down && OnMouseDown(mi)) return true;
-			if (mi.Event == MouseInputEvent.Up && OnMouseUp(mi)) return true;
-			if (mi.Event == MouseInputEvent.Move)
-				OnMouseMove(mi);
-			
-			return false;
-		}
-		
-		public virtual bool HandleKeyPressInner(KeyInput e) { return false; }
-		public virtual bool HandleKeyPressOuter(KeyInput e)
-		{			
-			if (!IsVisible())
-				return false;
-			
-			// Can any of our children handle this?
-			foreach (var child in Children)
-				if (child.HandleKeyPressOuter(e))
-					return true;
+            var substitutions = new Dictionary<string, int>();
+            substitutions.Add("WINDOW_RIGHT", Game.viewport.Width);
+            substitutions.Add("WINDOW_BOTTOM", Game.viewport.Height);
+            substitutions.Add("PARENT_RIGHT", parentBounds.Width);
+            substitutions.Add("PARENT_LEFT", parentBounds.Left);
+            substitutions.Add("PARENT_TOP", parentBounds.Top);
+            substitutions.Add("PARENT_BOTTOM", parentBounds.Height);
+            int width = Evaluator.Evaluate(Width, substitutions);
+            int height = Evaluator.Evaluate(Height, substitutions);
 
-			// Do any widgety behavior (enter text etc)
-			var handled = HandleKeyPressInner(e);
-			
-			// Apply any special logic added by delegates; they return true if they caught the input
-			if (OnKeyPress(e)) return true;
-			
-			return handled;
-		}
-		
-		public static bool HandleKeyPress(KeyInput e)
-		{
-			if (SelectedWidget != null)
-				return SelectedWidget.HandleKeyPressOuter(e);
-			
-			if (RootWidget.HandleKeyPressOuter(e))
-				return true;
-			return false;
-		}
-		
-		public abstract void DrawInner();
-		
-		public virtual void Draw()
-		{
-			if (IsVisible())
-			{
-				DrawInner();
-				foreach (var child in Children)
-					child.Draw();
-			}
-		}
-		
-		public virtual void Tick()
-		{
-			if (IsVisible())
-				foreach (var child in Children)
-					child.Tick();
-		}
-		
-		public virtual void AddChild(Widget child)
-		{
-			child.Parent = this;
-			Children.Add( child );
-		}
-		public virtual void RemoveChild(Widget child) {	Children.Remove(child);	}
-		public virtual void RemoveChildren() { Children.Clear(); }
-		
-		public Widget GetWidget(string id)
-		{
-			if (this.Id == id)
-				return this;
-			
-			foreach (var child in Children)
-			{
-				var w = child.GetWidget(id);
-				if (w != null)
-					return w;
-			}
-			return null;
-		}
+            substitutions.Add("WIDTH", width);
+            substitutions.Add("HEIGHT", height);
 
-		public T GetWidget<T>(string id) where T : Widget
-		{
-			var widget = GetWidget(id);
-			return (widget != null)? (T) widget : null;
-		}
-		
-		public static void CloseWindow()
-		{
-			RootWidget.Children.Remove( WindowList.Pop() );
-			if( WindowList.Count > 0 )
-				rootWidget.Children.Add( WindowList.Peek() );
-		}
+            Bounds = new Rectangle(Evaluator.Evaluate(X, substitutions),
+                                   Evaluator.Evaluate(Y, substitutions),
+                                   width,
+                                   height);
+        }
 
-		public static Widget OpenWindow( string id )
-		{
-			return OpenWindow( id, new Dictionary<string, object>() );
-		}
+        public void PostInit(Dictionary<string, object> args)
+        {
+            if (Delegate == null)
+                return;
 
-		public static Widget OpenWindow(string id, Dictionary<string, object> args )
-		{
-			var window = Game.modData.WidgetLoader.LoadWidget( args, rootWidget, id );
-			if( WindowList.Count > 0 )
-				rootWidget.Children.Remove( WindowList.Peek() );
-			WindowList.Push( window );
-			return window;
-		}
-		
-		public static void DoTick()
-		{
-			RootWidget.Tick();
-		}
-		
-		public static void DoDraw()
-		{
-			RootWidget.Draw();
-		}
-	}
+            args["widget"] = this;
 
-	public class ContainerWidget : Widget {
-		public Func<string> GetBackground;
-		public string Background = null;
-		
-		public ContainerWidget() : base()
-		{
-			GetBackground = () => Background;
-		}
-		
-		public ContainerWidget(ContainerWidget other) : base(other)
-		{
-			Background = other.Background;
-			GetBackground = other.GetBackground;
-		}
+            var iwd = Game.modData.ObjectCreator.CreateObject<IWidgetDelegate>(Delegate, args)
+                as IWidgetDelegateEx;
+            if (iwd != null)
+                iwd.Init();
 
-		public override void DrawInner()
-		{
-			var bg = GetBackground();
-			if (bg != null)
-				WidgetUtils.DrawPanel(bg, RenderBounds );
-		}
-		
-		public override string GetCursor(int2 pos) { return null; }
-		public override Widget Clone() { return new ContainerWidget(this); }
-	}
-	public interface IWidgetDelegate { }
+            args.Remove("widget");
+        }
+
+        public virtual Rectangle EventBounds { get { return RenderBounds; } }
+        public virtual Rectangle GetEventBounds()
+        {
+            return Children
+                .Where(c => c.IsVisible())
+                .Select(c => c.GetEventBounds())
+                .Aggregate(EventBounds, Rectangle.Union);
+        }
+
+        public static Widget SelectedWidget;
+        public bool Focused { get { return SelectedWidget == this; } }
+        public virtual bool TakeFocus(MouseInput mi)
+        {
+            if (Focused)
+                return true;
+
+            if (SelectedWidget != null && !SelectedWidget.LoseFocus(mi))
+                return false;
+            SelectedWidget = this;
+            return true;
+        }
+
+        // Remove focus from this widget; return false if you don't want to give it up
+        public virtual bool LoseFocus(MouseInput mi)
+        {
+            // Some widgets may need to override focus depending on mouse click
+            return LoseFocus();
+        }
+
+        public virtual bool LoseFocus()
+        {
+            if (SelectedWidget == this)
+                SelectedWidget = null;
+
+            return true;
+        }
+
+        public virtual string GetCursor(int2 pos) { return "default"; }
+        public string GetCursorOuter(int2 pos)
+        {
+            // Is the cursor on top of us?
+            if (!(IsVisible() && GetEventBounds().Contains(pos)))
+                return null;
+
+            // Do any of our children specify a cursor?
+            foreach (var child in Children.OfType<Widget>().Reverse())
+            {
+                var cc = child.GetCursorOuter(pos);
+                if (cc != null)
+                    return cc;
+            }
+
+            return EventBounds.Contains(pos) ? GetCursor(pos) : null;
+        }
+
+        public static bool HandleInput(MouseInput mi)
+        {
+            bool handled = false;
+            if (SelectedWidget != null && SelectedWidget.HandleMouseInputOuter(mi))
+                handled = true;
+
+            if (!handled && RootWidget.HandleMouseInputOuter(mi))
+                handled = true;
+
+            if (mi.Event == MouseInputEvent.Move)
+            {
+                Viewport.LastMousePos = mi.Location;
+                Viewport.TicksSinceLastMove = 0;
+            }
+            return handled;
+        }
+
+        public bool HandleMouseInputOuter(MouseInput mi)
+        {
+            // Are we able to handle this event?
+            if (!(Focused || (IsVisible() && GetEventBounds().Contains(mi.Location.X, mi.Location.Y))))
+                return false;
+
+            // Send the event to the deepest children first and bubble up if unhandled
+            foreach (var child in Children.OfType<Widget>().Reverse())
+                if (child.HandleMouseInputOuter(mi))
+                    return true;
+
+            return HandleMouseInput(mi);
+        }
+
+        // Hack: Don't eat mouse input that others want
+        // TODO: Solve this properly
+        public virtual bool HandleMouseInput(MouseInput mi)
+        {
+            // Apply any special logic added by delegates; they return true if they caught the input
+            if (mi.Event == MouseInputEvent.Down && OnMouseDown(mi)) return true;
+            if (mi.Event == MouseInputEvent.Up && OnMouseUp(mi)) return true;
+            if (mi.Event == MouseInputEvent.Move)
+                OnMouseMove(mi);
+
+            return false;
+        }
+
+        public virtual bool HandleKeyPressInner(KeyInput e) { return false; }
+        public virtual bool HandleKeyPressOuter(KeyInput e)
+        {
+            if (!IsVisible())
+                return false;
+
+            // Can any of our children handle this?
+            foreach (var child in Children)
+                if (child.HandleKeyPressOuter(e))
+                    return true;
+
+            // Do any widgety behavior (enter text etc)
+            var handled = HandleKeyPressInner(e);
+
+            // Apply any special logic added by delegates; they return true if they caught the input
+            if (OnKeyPress(e)) return true;
+
+            return handled;
+        }
+
+        public static bool HandleKeyPress(KeyInput e)
+        {
+            if (SelectedWidget != null)
+                return SelectedWidget.HandleKeyPressOuter(e);
+
+            if (RootWidget.HandleKeyPressOuter(e))
+                return true;
+            return false;
+        }
+
+        public abstract void DrawInner();
+
+        public virtual void Draw()
+        {
+            if (IsVisible())
+            {
+                DrawInner();
+                foreach (var child in Children)
+                    child.Draw();
+            }
+        }
+
+        public virtual void Tick()
+        {
+            if (IsVisible())
+                foreach (var child in Children)
+                    child.Tick();
+        }
+
+        public virtual void AddChild(Widget child)
+        {
+            child.Parent = this;
+            Children.Add(child);
+        }
+        public virtual void RemoveChild(Widget child) { Children.Remove(child); }
+        public virtual void RemoveChildren() { Children.Clear(); }
+
+        public Widget GetWidget(string id)
+        {
+            if (this.Id == id)
+                return this;
+
+            foreach (var child in Children)
+            {
+                var w = child.GetWidget(id);
+                if (w != null)
+                    return w;
+            }
+            return null;
+        }
+
+        public T GetWidget<T>(string id) where T : Widget
+        {
+            var widget = GetWidget(id);
+            return (widget != null) ? (T)widget : null;
+        }
+
+        public static void CloseWindow()
+        {
+            RootWidget.Children.Remove(WindowList.Pop());
+            if (WindowList.Count > 0)
+                rootWidget.Children.Add(WindowList.Peek());
+        }
+
+        public static Widget OpenWindow(string id)
+        {
+            return OpenWindow(id, new Dictionary<string, object>());
+        }
+
+        public static Widget OpenWindow(string id, Dictionary<string, object> args)
+        {
+            var window = Game.modData.WidgetLoader.LoadWidget(args, rootWidget, id);
+            if (WindowList.Count > 0)
+                rootWidget.Children.Remove(WindowList.Peek());
+            WindowList.Push(window);
+            return window;
+        }
+
+        public static void DoTick()
+        {
+            RootWidget.Tick();
+        }
+
+        public static void DoDraw()
+        {
+            RootWidget.Draw();
+        }
+    }
+
+    public class ContainerWidget : Widget
+    {
+        public Func<string> GetBackground;
+        public string Background = null;
+
+        public ContainerWidget()
+            : base()
+        {
+            GetBackground = () => Background;
+        }
+
+        public ContainerWidget(ContainerWidget other)
+            : base(other)
+        {
+            Background = other.Background;
+            GetBackground = other.GetBackground;
+        }
+
+        public override void DrawInner()
+        {
+            var bg = GetBackground();
+            if (bg != null)
+                WidgetUtils.DrawPanel(bg, RenderBounds);
+        }
+
+        public override string GetCursor(int2 pos) { return null; }
+        public override Widget Clone() { return new ContainerWidget(this); }
+    }
+
+    public interface IWidgetDelegate { }
+    public interface IWidgetDelegateEx : IWidgetDelegate
+    {
+        void Init();
+    }
 }

OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs

@@ -15,6 +15,7 @@ using OpenRA.FileFormats;
 using OpenRA.Graphics;
 using OpenRA.Orders;
 using OpenRA.Traits;
+using System;
 
 namespace OpenRA.Widgets
 {
@@ -31,13 +32,13 @@ namespace OpenRA.Widgets
 		
 		public override void DrawInner()
 		{
-			var selbox = SelectionBox;
-            if (selbox == null)
-            {
-                foreach (var u in SelectActorsInBox(world, Game.CellSize * dragStart, Game.CellSize * dragStart))
-                    worldRenderer.DrawRollover(u);
-
-                return;
+			var selbox = SelectionBox;
+            if (selbox == null)
+            {
+                foreach (var u in SelectActorsInBox(world, Game.CellSize * dragStart, Game.CellSize * dragStart))
+                    worldRenderer.DrawRollover(u);
+
+                return;
             }
 
 			var a = selbox.Value.First;
@@ -47,9 +48,9 @@ namespace OpenRA.Widgets
 			Game.Renderer.LineRenderer.DrawLine(a, a + b, Color.White, Color.White);
 			Game.Renderer.LineRenderer.DrawLine(a + b, a + b + c, Color.White, Color.White);
 			Game.Renderer.LineRenderer.DrawLine(a + b + c, a + c, Color.White, Color.White);
-			Game.Renderer.LineRenderer.DrawLine(a, a + c, Color.White, Color.White);
-
-            foreach (var u in SelectActorsInBox(world, selbox.Value.First, selbox.Value.Second))
+			Game.Renderer.LineRenderer.DrawLine(a, a + c, Color.White, Color.White);
+
+            foreach (var u in SelectActorsInBox(world, selbox.Value.First, selbox.Value.Second))
                 worldRenderer.DrawRollover(u);
 		}
 		
@@ -102,8 +103,8 @@ namespace OpenRA.Widgets
 			if (world.OrderGenerator == null) return;
 
 			var orders = world.OrderGenerator.Order(world, xy.ToInt2(), mi).ToArray();
-			orders.Do( o => world.IssueOrder( o ) );
-
+			orders.Do( o => world.IssueOrder( o ) );
+
 			world.PlayVoiceForOrders(orders);
 		}
 		
@@ -144,11 +145,35 @@ namespace OpenRA.Widgets
 		{
 			return world.FindUnits(a, b)
 				.Where( x => x.HasTrait<Selectable>() && world.LocalShroud.IsVisible(x) )
-				.GroupBy(x => (x.Owner == world.LocalPlayer) ? x.Info.Traits.Get<SelectableInfo>().Priority : 0)
+				.GroupBy(x => x.GetSelectionPriority())
 				.OrderByDescending(g => g.Key)
 				.Select( g => g.AsEnumerable() )
 				.DefaultIfEmpty( NoActors )
 				.FirstOrDefault();
 		}
 	}
+
+	static class PriorityExts
+	{
+		const int PriorityRange = 30;
+
+		public static int GetSelectionPriority(this Actor a)
+		{
+			var basePriority = a.Info.Traits.Get<SelectableInfo>().Priority;
+			var lp = a.World.LocalPlayer;
+
+			if (a.Owner == lp || lp == null)
+				return basePriority;
+
+			switch (lp.Stances[a.Owner])
+			{
+				case Stance.Ally: return basePriority - PriorityRange;
+				case Stance.Neutral: return basePriority - 2 * PriorityRange;
+				case Stance.Enemy: return basePriority - 3 * PriorityRange;
+
+				default:
+					throw new InvalidOperationException();
+			}
+		}
+	}
 }

OpenRA.Game/World.cs

@@ -15,7 +15,7 @@ using OpenRA.Effects;
 using OpenRA.FileFormats;
 using OpenRA.Network;
 using OpenRA.Orders;
-using OpenRA.Traits;
+using OpenRA.Traits;
 using XRandom = OpenRA.Thirdparty.Random;
 
 namespace OpenRA
@@ -100,8 +100,6 @@ namespace OpenRA
 			WorldActor = CreateActor( "World", new TypeDictionary() );
 			LocalShroud = WorldActor.Trait<Shroud>();
 			
-			Queries = new AllQueries(this);
-			
 			// Add players
 			foreach (var cmp in WorldActor.TraitsImplementing<ICreatePlayers>())
 				cmp.CreatePlayers(this);		
@@ -160,7 +158,7 @@ namespace OpenRA
 			if (!DisableTick)
 			{
 				actors.Do( x => x.Tick() );
-				Queries.WithTrait<ITick>().DoTimed( x =>
+				ActorsWithTrait<ITick>().DoTimed( x =>
 				{
 					x.Trait.Tick( x.Actor );
 				}, "[{2}] Trait: {0} ({1:0.000} ms)", Game.Settings.Debug.LongTickThreshold );
@@ -204,53 +202,10 @@ namespace OpenRA
 			}
 		}
 
-		public class AllQueries
-		{
-			readonly World world;
-
-			public readonly Cache<Player, OwnedByCachedView> OwnedBy;
-
-			public AllQueries( World world )
-			{
-				this.world = world;
-				OwnedBy = new Cache<Player, OwnedByCachedView>(p => new OwnedByCachedView(world, world.actors, x => x.Owner == p));
-			}
-
-			public IEnumerable<TraitPair<T>> WithTrait<T>()
-			{
-				return world.traitDict.ActorsWithTraitMultiple<T>( world );
-			}
-
-			static CachedView<Actor, TraitPair<T>> WithTraitInner<T>( Set<Actor> set, TypeDictionary hasTrait )
-			{
-				var ret = hasTrait.GetOrDefault<CachedView<Actor, TraitPair<T>>>();
-				if( ret != null )
-					return ret;
-				ret = new CachedView<Actor, TraitPair<T>>(
-					set,
-					x => x.HasTrait<T>(),
-					x => new TraitPair<T> { Actor = x, Trait = x.Trait<T>() } );
-				hasTrait.Add( ret );
-				return ret;
-			}
-
-			public class OwnedByCachedView : CachedView<Actor, Actor>
-			{
-				readonly TypeDictionary hasTrait = new TypeDictionary();
-
-				public OwnedByCachedView( World world, Set<Actor> set, Func<Actor, bool> include )
-					: base( set, include, a => a )
-				{
-				}
-
-				public CachedView<Actor, TraitPair<T>> WithTrait<T>()
-				{
-					return WithTraitInner<T>( this, hasTrait );
-				}
-			}
-		}
-
-		public AllQueries Queries;
+        public IEnumerable<TraitPair<T>> ActorsWithTrait<T>()
+        {
+            return traitDict.ActorsWithTraitMultiple<T>(this);
+        }
 	}
 
 	public struct TraitPair<T>

OpenRA.Game/WorldUtils.cs

@@ -6,15 +6,15 @@
  * as published by the Free Software Foundation. For more information,
  * see COPYING.
  */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Support;
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Support;
 using OpenRA.Traits;
 
 namespace OpenRA
@@ -74,7 +74,8 @@ namespace OpenRA
 		
 		public static int2 ClampToWorld( this World world, int2 xy )
 		{
-			return xy.Clamp(world.Map.Bounds);			
+			var r = world.Map.Bounds;
+			return xy.Clamp(new Rectangle(r.X,r.Y,r.Width-1, r.Height-1));			
 		}
 
 		public static int2 ChooseRandomEdgeCell(this World w)
@@ -124,33 +125,33 @@ namespace OpenRA
 			if (!a.Info.Traits.Contains<SelectableInfo>()) return null;
 			var v = a.Info.Traits.Get<SelectableInfo>().Voice;
 			return (v == null) ? null : Rules.Voices[v];
-		}
-
-		public static void PlayVoiceForOrders(this World w, Order[] orders)
-		{
-			// Find an actor with a phrase to say
-			foreach (var o in orders)
-			{
-				if (o.Subject.Destroyed) continue;
-				foreach (var v in o.Subject.TraitsImplementing<IOrderVoice>())
-					if (Sound.PlayVoice(v.VoicePhraseForOrder(o.Subject, o),
-						o.Subject, o.Subject.Owner.Country.Race))
-						return;
-			}
-		}
-
-        public static void DoTimed<T>(this IEnumerable<T> e, Action<T> a, string text, double time)
-        {
-            var sw = new Stopwatch();
-
-            e.Do(x =>
-            {
-                var t = sw.ElapsedTime();
-                a(x);
-                var dt = sw.ElapsedTime() - t;
-                if (dt > time)
-                    Log.Write("perf", text, x, dt * 1000, Game.LocalTick);
-            });
+		}
+
+		public static void PlayVoiceForOrders(this World w, Order[] orders)
+		{
+			// Find an actor with a phrase to say
+			foreach (var o in orders)
+			{
+				if (o.Subject.Destroyed) continue;
+				foreach (var v in o.Subject.TraitsImplementing<IOrderVoice>())
+					if (Sound.PlayVoice(v.VoicePhraseForOrder(o.Subject, o),
+						o.Subject, o.Subject.Owner.Country.Race))
+						return;
+			}
+		}
+
+        public static void DoTimed<T>(this IEnumerable<T> e, Action<T> a, string text, double time)
+        {
+            var sw = new Stopwatch();
+
+            e.Do(x =>
+            {
+                var t = sw.ElapsedTime();
+                a(x);
+                var dt = sw.ElapsedTime() - t;
+                if (dt > time)
+                    Log.Write("perf", text, x, dt * 1000, Game.LocalTick);
+            });
         }
 	}
 }

OpenRA.Launcher.Mac/Controller.m

@@ -58,14 +58,16 @@ extern char **environ;
 - (void)extractZip:(NSArray *)args
 {
 	// Todo: check if we can write to the requested dir, escalate priviledges if required.
-	NSArray *a = [NSArray arrayWithObjects:@"--extract-zip-inner", [args objectAtIndex:2], [args objectAtIndex:3], nil];
+    NSMutableArray *a = [NSMutableArray arrayWithArray:args];
+    [a replaceObjectAtIndex:0 withObject:@"--extract-zip-inner"];
 	[self runUtilityWithArgs:a];
 }
 
 - (void)installRAPackages:(NSArray *)args
 {
 	// Todo: check if we can write to the requested dir, escalate priviledges if required.
-	NSArray *a = [NSArray arrayWithObjects:@"--install-ra-packages-inner", [args objectAtIndex:2], [args objectAtIndex:3], nil];
+    NSMutableArray *a = [NSMutableArray arrayWithArray:args];
+    [a replaceObjectAtIndex:0 withObject:@"--install-ra-packages-inner"];
 	[self runUtilityWithArgs:a];
 }