update CHANGELOG

Merged from gentoo ebuild, https://github.com/cerebrum/dr/blob/master/games-strategy/openra/files/Makefile_rsdl.patch

.gitignore

@@ -7,6 +7,7 @@ obj
 *.suo
 *.user
 *.sln.cache
+*.manifest
 mods/*/*.dll
 
 # Red Alert binary files

AUTHORS

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

CHANGELOG

@@ -1,3 +1,229 @@
+NEW:
+	Engine:
+		Fixed broken client IDs if players drop before the game starts
+		Converted FileExtractor into --extract cmdlet for Utility.
+		Added --transparent option to --png cmdlet in Utility.
+		Fixed shortcut description on Linux
+		Fixed launcher crashes on Mac
+		Removed obsolete SequenceEditor tool
+	Both Mods:
+		Allow building repair by allies
+		Use player color to show who is repairing a building
+		Only units/structures being built or queued are shaded in the production palette
+		Aircraft smoke is no longer visible under fog
+		Added a Show Grid option to the Map Editor
+		Added multitap support - double clicking a unit selects all units of the same type on screen
+		Changed map choosers to be a filterable grid of maps
+	Red Alert:
+		Added naval transport
+		Added an indicator over powered down buildings
+		Aircraft crashing into water now use large_splash
+		Destroyer now requires Radar Dome
+		Increased cost of Shipyard and Sub Pen
+		Fixed a crash when sending aircraft back to base
+		Husks no longer interfere with selection
+		Added more options for bots in game lobby
+		New map: Classic DropZone (Holloweye)
+		New map: DropZone Battle of Tikiaki (Knivesron)
+		New map: Seven Stairs (Tirili)
+		New map: Contact (Nukem)
+		New map: Encounter (Nukem)
+		New map: Mass Confliction (Nukem)
+		New map: Calm before the Storm (Nukem)
+		New map: Baywatch (Nukem)
+		New map: Winter Warzone (Nukem)
+		New map: Paramount (Nukem)
+		New map: Doubles (Nukem)
+		New map: Hectic (Nukem)
+		New map: Pandemonium (Nukem)
+		New map: No Fly Zone (RAGEQUIT)
+		New map: Strip Mine (RAGEQUIT)
+		New map: Doughnut Hole (RAGEQUIT)
+		New map: Vegetation (hamb/Chris Forbes)
+		New map: Arctic Triangle Affair (Bellator)
+		New map: Free Coasts (Ihptru)
+	C&C:
+		Slightly increased Tiberium growth rate
+		Increased harvester unload time
+		Reduced Tiberium value by 20%
+		Fixed tank squish animations to show properly
+
+
+20110906:
+	Engine:
+		Fixed compile failures under Windows
+		Improved platform detection
+		Modding support for custom fonts
+		Video memory leaks fixed
+		Improved error messages for unsupported graphics cards
+		Improved support for Intel graphics cards
+		Fixed incorrect resolution under some Linux systems
+		Write graphics.log on all graphics-related errors
+		Significant general performance improvements
+		Fix crashes when joining a game with no free player slots
+		Bots players are named after their AI type and pick better random colors
+		Map support for enforcing team and spawn choice
+		Fix resource-clearing weapons breaking custom terrain types (bridges)
+		Added a "Pixel double" mode to draw the world at 2x zoom.
+		Fixed broken mounting of map packages
+		Fixed crashes when loading broken maps
+		Fixed units being left alive but stranded on destroyed bridges
+		Fixed husks being created on water
+		Fixed AttackMove trying to send orders to units owned by others
+		Made LaserZap more flexible for modders
+	Both C&C and Red Alert:
+		Fixed desync when a player surrenders
+		Fixed installing from CD
+		Added Hotkey support:
+			escape to toggle ingame menu
+			escape to go up a level in menus / cancel prompts
+			return to confirm prompts
+		Changed shortcut for adding units to groups changed from ctrl->cmd on OSX to avoid conflicting with Spaces
+		Fixed Tooltips for spectators
+		Fixed cashticks when selling walls
+		Fixed show explosions when walls are sold
+		Fixed veteran units not repairing correctly at service depots
+		Fixed Rally-point color when a building is captured
+		Fixed selection box dragging behind ui elements
+		Added Mod support for passengers that take multiple slots
+		Added Mod support for custom tesla zap effects
+		Fixed desync when a support aircraft is killed after completing its task
+		Fixed bugs with selling refineries
+		Fixed superweapons being fired from disabled structures when multiple are available
+		Added "Mission Accomplished" / "Mission Failed" notifications when you win or lose a multiplayer game
+		Fixed husks jumping to the middle of a cell when a unit dies
+		Fixed decloak sound never being used
+		Improved HackyAI power management
+	C&C:
+		Completely overhauled UI
+		Added support for installing from original game disks
+		Added support for installing music from original game disks
+		Added support for Covert Ops music tracks
+		Added Skirmish mode (creates a local game against bots)
+		Added Configurable bot race/team/spawns
+		Fixed Rocket Launcher turret raising/lowering when attacking
+		Added muzzle flashes to Guard Tower / SAM site
+		Fixed firing offsets on all units and structures
+		Fixed Ion Cannon cursor
+		Fixed Apache artwork
+		Fixed uncapturable oil derricks
+		Added capturable Biolab tech structure: allows you build viceroids
+		All vehicles leave husks on death
+		Server/Skirmish creation selects the last played map by default
+		New animations for cloak and reveal map crates (from C&C Sole Survivor)
+		Added 8 new maps by Petrenko
+		Tweaked most existing maps
+		Removed East vs West 2 map
+		Fixed Harvester/Refinery docking animation beneath the fog of war
+		Improved Obelisk laser effect
+		Added a blue pip for harvested blue tiberium
+		Changed the Refinery tower lights to indicate the amount of stored tiberium
+		Fixed an exploit with Nod airfields on the right side of the map
+		Fixed bot color being saved as player color in lobby
+		Balance changes:
+			Refinery footprint changed, price decreased to $1500
+			Flame tank explodes on death, damage reduced by 40%
+			Stealth Tank damage increased, speed decreased
+			Rocket Launcher now fires 6 rockets, loses AA
+			Orca / Apache weapons reworked. Both now have limited volleys, but reload in the air. Both can attack other air units
+			APC weapons reworked. Now has a turret, but can attack air units only
+			Artillery given back to Nod
+			SSM launcher removed from Nod
+			Concrete walls require vehicle production to build
+			MCV, Harvester, Engineer can no longer level up (via crates)
+			MCV can no longer receive Cloak crates
+			Advanced Guard Tower range increased
+			SAM Site range decreased
+			Bridge HP halved
+			Infantry tiberium avoidance factor increased by 5x
+			Decrease tiberium damage to infantry
+			Rebalanced tiberium value / harvester capacity / harvesting speed
+			Reduced Grenadier death damage
+			Mammoth tank regen rate halved, Missile reload rate decreased
+			Building repair speed, price doubled
+			Recon Bike damage increased 16%
+			Infantry can be crushed by tanks
+			Removed build area radius around tech structures
+	Red Alert:
+		Fixed firing offsets on Flame trooper / Tesla trooper / Telsa tank / Tesla coil / Flame turret
+		Fixed bounties using incorrect unit value
+		Fixed parachute offsets
+		Added muzzle flashes to Pillbox / Camo Pillbox / SAM Site
+		Fixed map reveal when an ally is granted GPS
+		Added 16 new maps by buddha, hamb, seru
+		Fixed bounties of $0 displaying
+		Removed 3 obsolete maps
+		Fixed Minelayers not entering the Service Depot properly
+		Fixed Hind, Yak weapons being blocked by walls
+		Fixed phantom radar bin on subsequent games
+		Added new Oil Derrick artwork
+		Added support for Counterstrike & Aftermath music tracks
+		Added player color to diplomacy panel
+		Added capturable oil refinery tech structure
+		Added new harvester artwork for half-empty/empty states
+		Added new MCV husk artwork
+		Fixed spy disguise not working
+		Fixed hellfire missiles splashing back against helicopters
+		Fixed animation speed for Grenadier idle animations
+		Removed Lock Teams option
+		Fixed cursor while dragging selection box
+		Fixed accidental order issuing while dragging selection box
+		Fixed lobby "kick" buttons
+		Balance changes:
+			Medic cost reduced to $500
+			Mines are visible to friendlies and spectators
+			Friendly units don't trigger mines
+			Increased reload rate for aircraft
+			Missile sub submerge delay doubled, damage decreased by 25%
+			Longbow now requires Allied Tech Center
+			Reduced wall health
+			Increased cruiser accuracy
+			Increased Longbow missile speed by 50%
+			Increased SAM Site rate of fire
+	Utility:
+		Fixed --png mode for converting shp -> png
+	Editor:
+		Fixed actor rendering on OSX / Linux
+		Fixed crash relating to incorrect mix file location
+
+20110511:
+	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
+		Modding support for multiple player palettes
+		Fix several crashes when installing packages
+		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
+	RA:
+		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 GPS logic
+		New map: Pressure by seru
+	Packaging:
+		Utility writes a log to support dir when crashing
+		Support for Ubuntu 11.04
+		Fix osx crash when run from a path with spaces
+
 20110320
 	Engine:
 		Display range circles when placing defenses
@@ -601,4 +827,4 @@
     Improved debugging for performance issues
     "Give Exploration" developer-mode option
     Check for .net framework on windows install
-    Allow the viewport to scroll past the map edge to prevent ui from blocking buildings
+    Allow the viewport to scroll past the map edge to prevent ui from blocking buildings

FileExtractor/FileExtractor.cs

@@ -1,52 +0,0 @@
-using System;
-using System.IO;
-using OpenRA.FileFormats;
-
-namespace FileExtractor
-{
-	public class FileExtractor
-	{
-		int Length = 256;
-		
-		public FileExtractor (string[] args)
-		{
-			if (args.Length != 2)
-			{
-				Console.WriteLine("usage: FileExtractor mod[,mod]* filename");
-				return;
-			}
-
-			var mods = args[0].Split(',');
-			var manifest = new Manifest(mods);
-			FileSystem.LoadFromManifest( manifest );
-			
-			try
-			{
-				var readStream = FileSystem.Open(args[1]);
-				var writeStream = new FileStream(args[1], FileMode.OpenOrCreate, FileAccess.Write);
-				
-				WriteOutFile(readStream, writeStream);
-				
-			} 
-			catch (FileNotFoundException) 
-			{
-				Console.WriteLine(String.Format("No Such File {0}", args[1]));
-			}
-		}
-		
-		void WriteOutFile (Stream readStream, Stream writeStream)
-		{
-   			Byte[] buffer = new Byte[Length];
-   			int bytesRead = readStream.Read(buffer,0,Length);
-
- 			while( bytesRead > 0 ) 
-    		{
-        		writeStream.Write(buffer,0,bytesRead);
-        		bytesRead = readStream.Read(buffer,0,Length);
-    		}
-    		readStream.Close();
-    		writeStream.Close();
-		}
-	}
-}
-

FileExtractor/FileExtractor.csproj

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{210645C7-E99E-46B6-863E-E211AE6C7D70}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>FileExtractor</RootNamespace>
-    <AssemblyName>FileExtractor</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
-      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRA.FileFormats</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="FileExtractor.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>

FileExtractor/Main.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace FileExtractor
-{
-	public class MainClass
-	{
-		public static void Main (string[] args)
-		{
-			new FileExtractor(args);
-		}
-	}
-}
-

HACKING

@@ -3,7 +3,7 @@ HACKING
 There are n main sections to OpenRA: UI, Rendering, unit behaviour, ...
 
 All  units/structures/most things in the map are Actors. Actors contain a  collection of traits.
-Traits consist of an info class and a  class that does stuff
+Traits consist of an info class and a  class that does stuff. There is one instance of the infoclass shared across all actors of the same type. Each actor gets its own instance of the trait class itself. Infoclasses are responsible for instantiating their corresponding trait class -- see ITraitInfo, and TraitInfo<T> for the trivial implementation of this. In some cases the trait class's constructor needs some args, in which case TraitInfo<T> can't be used. This is a limitation of C# generics.
 
 Actor assembly is done via the mod's yaml files. A section  exists for each actor type, 
 and within that section we list the traits  the actor should have. 
@@ -15,13 +15,10 @@ which are automatically loaded into the corresponding fields on the trait's ITra
     as possible - all cross-trait references should be in terms of an interface from 
     TraitInterfaces.cs.
     
-- Things an actor can be *doing* are represented as IActivity implementations. 
-    Actor has a queue of these. There's a standard set of activities in 
-    OpenRa.Game/Traits/Activities, and mods tend to define more as they need them. (RA 
-    defines various special-infantry actions as activities).
+- Things an actor can be *doing* are represented as Activity subclasses.
+    Actor has a queue of these. The standard set of activities are in OpenRA.Mods.RA/Activities. Ground vehicle movement is more complex, and has bits in OpenRA.Mods.RA/Move. Aircraft use different bits again, in OpenRA.Mods.RA/Air. There are some bits elsewhere for custom infantry behaviors, etc. In some cases, a trait or activity will maintain an internal subqueue of activities. This works exactly the same way as the actor's main activity queue -- its state is evolved by Util.RunActivity().
 
-- Units offer orders they can perform (given context) through traits that implement IIssueOrder. 
-  Every trait with this interface is given a chance to generate orders for the current context.
+- Units offer orders they can perform (given context) through traits that implement IIssueOrder. There are two parts to this -- an Orders collection, which exposes IOrderTargeter objects, which describe orders that the actor *could* generate, and the rules for choosing which to perform when the "default action" button is pressed (RMB). The second part is IssueOrder() itself, which resolves an IOrderTargeter into an actual order object to be sent.
 
 - For more complex things that require modal UI (like special abilities, 
   RA-style sell/repair buttons, etc) we have IOrderGenerator implementations. This can 
@@ -52,19 +49,13 @@ containing art assets (typically .mix files), yaml files defining actor defintio
 and ini files containing legacy information that have yet to be ported over to 
 the (relatively new) yaml system.
 
-The unit artwork itself must be defined in a Sequences file (typically Sequences.xml; 
-check mod.yaml for a list of what the mod uses); the format is self explanatory. There is 
-also the SequenceEditor tool to make this easy.
+The unit artwork itself must be defined in one or more sequences files. These are specified in the manifest. RA puts everything in mods/ra/sequences.yaml.
+check mod.yaml for a list of what the mod uses); the format is self explanatory. 
 
 Chrome artwork is similarly defined in Chrome.xml. Chrome is already mod dependent. Sortof ;) 
 mod-dependent *behavior* would be nice too, not just skinning. This is a property of the traits
 however; once we port UI into traits this will become a non-issue.
 
-Rendering
-OpenRa.Game/Chrome.cs is the user interface. 
-Three renderers (SpriteRenderer, LineRenderer, Rgba?Renderer) render most stuff. Don't forget 
-to flush the renderer (if you want to see anything).
-
 UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be 
 able to save values changed in game into settings.ini (not yet implemented)
 
@@ -74,14 +65,11 @@ We also have a website at http://www.open-ra.org/ .
 
 Our IRC channel is #openra on irc.freenode.net .
 
-As far as using git, get your own repository on github. You probably want to set up the gitbot
-to spam irc when you make commits (its nice to know). Push your changes into your git 
-repository, and it will/might :P be merged into http://github.com/OpenRA/OpenRA . 
+As far as using git, get your own repository on github. Push your changes into your git repository, and it will/might :P be merged into http://github.com/OpenRA/OpenRA . 
 See http://help.github.com/ for working with GitHub and see http://progit.org/ for working 
 with Git.
 
 
-
 Other things we probably want to put in here:
     - A guide on how to add a generic unit via yaml using existing traits
         - and then introduce some element that requires a simple trait change.

Makefile

@@ -6,26 +6,25 @@ PHONY		= core tools package all mods clean distclean
 
 .SUFFIXES:
 core: game renderers mod_ra mod_cnc utility
-tools: editor ralint seqed filex tsbuild
-package: fixheader core editor
+tools: editor ralint tsbuild
+package: core editor
 mods: mod_ra mod_cnc
 all: core tools
 clean: 
-	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-rm -f *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 distclean: clean
 
 #
 # Core binaries
 #
-fileformats_SRCS	= $(shell find OpenRA.FileFormats/ -iname '*.cs')
+fileformats_SRCS	:= $(shell find OpenRA.FileFormats/ -iname '*.cs')
 fileformats_TARGET	= OpenRA.FileFormats.dll
-#fileformats_DEPS	= fixheader
 fileformats_KIND	= library
 fileformats_LIBS	= $(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll System.Windows.Forms.dll
 PROGRAMS 			= fileformats
 fileformats: $(fileformats_TARGET)
 
-game_SRCS			= $(shell find OpenRA.Game/ -iname '*.cs')
+game_SRCS			:= $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET			= OpenRA.Game.exe
 game_KIND			= winexe
 game_DEPS			= $(fileformats_TARGET) 
@@ -38,72 +37,72 @@ game: $(game_TARGET)
 #
 # Renderer dlls
 #
-rcg_SRCS			= $(shell find OpenRA.Renderer.Cg/ -iname '*.cs')
+rsdl_SRCS			:= $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs')
+rsdl_TARGET			= OpenRA.Renderer.SdlCommon.dll
+rsdl_KIND			= library
+rsdl_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rsdl_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+					thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+					$(rsdl_DEPS)
+
+rcg_SRCS			:= $(shell find OpenRA.Renderer.Cg/ -iname '*.cs')
 rcg_TARGET			= OpenRA.Renderer.Cg.dll
 rcg_KIND			= library
-rcg_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rcg_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET)
 rcg_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
 					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-					$(rcg_DEPS) $(game_TARGET)
+					$(rcg_DEPS)
 
-rgl_SRCS			= $(shell find OpenRA.Renderer.Gl/ -iname '*.cs')
+rgl_SRCS			:= $(shell find OpenRA.Renderer.Gl/ -iname '*.cs')
 rgl_TARGET			= OpenRA.Renderer.Gl.dll
 rgl_KIND			= library
-rgl_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rgl_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET)
 rgl_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
 					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-					$(rgl_DEPS) $(game_TARGET)
+					$(rgl_DEPS)
 
-rnull_SRCS			= $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
-rnull_TARGET		= OpenRA.Renderer.Null.dll
+rnull_SRCS			:= $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
+rnull_TARGET			= OpenRA.Renderer.Null.dll
 rnull_KIND			= library
 rnull_DEPS			= $(fileformats_TARGET) $(game_TARGET)
 rnull_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
-					$(rnull_DEPS) $(game_TARGET)
-PROGRAMS 			+= rcg rgl rnull
-renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET)
+					$(rnull_DEPS)
+PROGRAMS 			+= rcg rgl rnull rsdl
+renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(rsdl_TARGET)
 
 #
 # Official Mods
 #
 # Red Alert
-mod_ra_SRCS			= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
-mod_ra_TARGET		= mods/ra/OpenRA.Mods.RA.dll
+
+STD_MOD_LIBS	= $(fileformats_TARGET) $(game_TARGET)
+STD_MOD_DEPS	= $(STD_MOD_LIBS) $(ralint_TARGET)
+
+mod_ra_SRCS			:= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
+mod_ra_TARGET			= mods/ra/OpenRA.Mods.RA.dll
 mod_ra_KIND			= library
-mod_ra_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-mod_ra_LIBS			= $(COMMON_LIBS) $(mod_ra_DEPS)
+mod_ra_DEPS			= $(STD_MOD_DEPS)
+mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS)
+mod_ra_EXTRA_CMDS		= mono --debug RALint.exe ra
 PROGRAMS 			+= mod_ra
 mod_ra: $(mod_ra_TARGET)
-#	mono RALint.exe ra
 
 # Command and Conquer
-mod_cnc_SRCS		= $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
+mod_cnc_SRCS		:= $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
 mod_cnc_TARGET		= mods/cnc/OpenRA.Mods.Cnc.dll
 mod_cnc_KIND		= library
-mod_cnc_DEPS		= $(fileformats_TARGET) $(game_TARGET) $(mod_ra_TARGET)
-mod_cnc_LIBS		= $(COMMON_LIBS) $(mod_cnc_DEPS)
-PROGRAMS 			+= mod_cnc
+mod_cnc_DEPS		= $(STD_MOD_DEPS) $(mod_ra_TARGET)
+mod_cnc_LIBS		= $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
+mod_cnc_EXTRA_CMDS	= mono --debug RALint.exe cnc
+PROGRAMS 		+= mod_cnc
 mod_cnc: $(mod_cnc_TARGET)
-#	mono RALint.exe cnc
 
 #
 # Tools
 #
-# Sequence editor (defunct)
-seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
-seqed_TARGET		= SequenceEditor.exe
-seqed_KIND			= winexe
-seqed_DEPS			= $(fileformats_TARGET)
-seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
-seqed_EXTRA			= -resource:SequenceEditor.Form1.resources
-PROGRAMS 			+= seqed
-SequenceEditor.Form1.resources:
-	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
-seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
-
 # Map Editor
-editor_SRCS			= $(shell find OpenRA.Editor/ -iname '*.cs')
-editor_TARGET		= OpenRA.Editor.exe
+editor_SRCS			:= $(shell find OpenRA.Editor/ -iname '*.cs')
+editor_TARGET			= OpenRA.Editor.exe
 editor_KIND			= winexe
 editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
 editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
@@ -118,25 +117,16 @@ OpenRA.Editor.Form1.resources:
 editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
 
 # Analyses mod yaml for easy to detect errors
-ralint_SRCS			= $(shell find RALint/ -iname '*.cs')
-ralint_TARGET		= RALint.exe
+ralint_SRCS			:= $(shell find RALint/ -iname '*.cs')
+ralint_TARGET			= RALint.exe
 ralint_KIND			= exe
 ralint_DEPS			= $(fileformats_TARGET) $(game_TARGET)
 ralint_LIBS			= $(COMMON_LIBS) $(ralint_DEPS)
 PROGRAMS 			+= ralint
 ralint: $(ralint_TARGET)
 
-# Extracts files from packages (mixfiles, zips, etc)
-filex_SRCS			= $(shell find FileExtractor/ -iname '*.cs')
-filex_TARGET		= FileExtractor.exe
-filex_KIND			= exe
-filex_DEPS			= $(fileformats_TARGET)
-filex_LIBS			= $(COMMON_LIBS) $(filex_DEPS)
-PROGRAMS 			+= filex
-filex: $(filex_TARGET)
-
 # Builds and exports tilesets from a bitmap
-tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_SRCS		:= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
 tsbuild_TARGET		= TilesetBuilder.exe
 tsbuild_KIND		= winexe
 tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
@@ -151,12 +141,12 @@ tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
 # Launchers / Utilities
 #
 # Patches binary headers to work around a mono bug
-fixheader: packaging/fixheader.cs
+fixheader.exe: packaging/fixheader.cs
+	@echo CSC fixheader.exe
 	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
-PHONY += fixheader
 
 # Backend for the launcher apps - queries game/mod info and applies actions to an install
-utility_SRCS		= $(shell find OpenRA.Utility/ -iname '*.cs')
+utility_SRCS		:= $(shell find OpenRA.Utility/ -iname '*.cs')
 utility_TARGET		= OpenRA.Utility.exe
 utility_KIND		= exe
 utility_DEPS        = $(fileformats_TARGET) $(game_TARGET)
@@ -171,7 +161,7 @@ utility: $(utility_TARGET)
 #
 define BUILD_ASSEMBLY
 
-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
 	@echo CSC $$(@)
 	@$(CSC) $$($(1)_LIBS:%=-r:%) \
 		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
@@ -179,7 +169,9 @@ $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
 		-t:"$$($(1)_KIND)" \
 		$$($(1)_EXTRA) \
 		$$($(1)_SRCS)
-	@test -e fixheader.exe && mono fixheader.exe $$(@) || ``
+	@mono fixheader.exe $$(@) > /dev/null
+	@test `echo $$(@) | sed 's/^.*\.//'` = "dll" && chmod a-x $$(@) || ``
+	@$$($(1)_EXTRA_CMDS)
 endef
 
 $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
@@ -196,7 +188,7 @@ BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
 INSTALL_DIR = $(DESTDIR)$(datadir)/openra
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
-CORE = fileformats rcg rgl rnull game editor utility
+CORE = fileformats rcg rgl rsdl rnull game editor utility
 
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
@@ -232,7 +224,7 @@ install: all
 
 	@echo "#!/bin/sh" > openra
 	@echo "cd "$(datadir)"/openra" >> openra
-	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=~/.openra \"$$""@\"" >> openra
+	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe \"$$""@\"" >> openra
 
 	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)

OpenRA.Editor/ActorTemplate.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.Editor/ActorTool.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -22,7 +22,7 @@ namespace OpenRA.Editor
 
 		public void Preview(Surface surface, SGraphics g)
 		{
-			/* todo: include the player 
+			/* todo: include the player
 				* in the brush so we can color new buildings too */
 
 			surface.DrawActor(g, surface.GetBrushLocation(), Actor, null);

OpenRA.Editor/BrushTool.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

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 
+ * 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

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -29,8 +29,8 @@ namespace OpenRA.Editor
 			currentMod = args.FirstOrDefault() ?? "ra";
 
 			toolStripComboBox1.Items.AddRange(Mod.AllMods.Keys.ToArray());
-			
-			toolStripComboBox1.SelectedIndexChanged += (_, e) => 
+
+			toolStripComboBox1.SelectedIndexChanged += (_, e) =>
 			{
 				tilePalette.SuspendLayout();
 				actorPalette.SuspendLayout();
@@ -44,19 +44,19 @@ namespace OpenRA.Editor
 				surface1.Bind(null, null, null);
 				pmMiniMap.Image = null;
 				currentMod = toolStripComboBox1.SelectedItem as string;
-				
+
 				Text = "OpenRA Editor (mod:{0})".F(currentMod);
 				Game.modData = new ModData(currentMod);
 				FileSystem.LoadFromManifest(Game.modData.Manifest);
 				Rules.LoadRules(Game.modData.Manifest, new Map());
 				loadedMapName = null;
 			};
-			
+
 			toolStripComboBox1.SelectedItem = currentMod;
-			
+
 			surface1.AfterChange += OnMapChanged;
 			surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
-			
+
 			if (args.Length >= 2)
 				LoadMap(args[1]);
 		}
@@ -87,8 +87,7 @@ 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.MakeDefaultPlayers();
 
 			PrepareMapResources(Game.modData.Manifest, map);
 
@@ -156,6 +155,13 @@ namespace OpenRA.Editor
 				{
 					var info = Rules.Info[a];
 					if (!info.Traits.Contains<RenderSimpleInfo>()) continue;
+
+					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
+					if (etf != null && etf.ExcludeTilesets != null
+					    && etf.ExcludeTilesets.Contains(tileset.Id)) continue;
+					if (etf != null && etf.RequireTilesets != null
+					    && !etf.RequireTilesets.Contains(tileset.Id)) continue;
+
 					var template = RenderUtils.RenderActor(info, tileset, palette);
 					var ibox = new PictureBox
 					{
@@ -321,8 +327,9 @@ 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.MakeDefaultPlayers();
+
 					NewMap(map);
 				}
 			}
@@ -359,7 +366,7 @@ namespace OpenRA.Editor
 
 		void ImportLegacyMapClicked(object sender, EventArgs e)
 		{
-			using (var ofd = new OpenFileDialog { RestoreDirectory = true, 
+			using (var ofd = new OpenFileDialog { RestoreDirectory = true,
 				Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
 				if (DialogResult.OK == ofd.ShowDialog())
 				{
@@ -367,23 +374,18 @@ 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))
+					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.MakeDefaultPlayers();
+
 					map.Save(savePath);
 					LoadMap(savePath);
 					loadedMapName = null;	/* editor needs to think this hasnt been saved */
@@ -413,12 +415,39 @@ 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;
+		}
+
+		void ShowGridClicked(object sender, EventArgs e)
+		{
+			showGridToolStripMenuItem.Checked ^= true;
+			surface1.ShowGrid = showGridToolStripMenuItem.Checked;
+			surface1.Chunks.Clear();
+		}
+
+		void FixOpenAreas(object sender, EventArgs e)
+		{
+			dirty = true;
+			var r = new Random();
+
+			for (var j = surface1.Map.Bounds.Top; j < surface1.Map.Bounds.Bottom; j++)
+				for (var i = surface1.Map.Bounds.Left; i < surface1.Map.Bounds.Right; i++)
+				{
+					var tr = surface1.Map.MapTiles.Value[i, j];
+					if (tr.type == 0xff || tr.type == 0xffff || tr.type == 1 || tr.type == 2)
+						tr.index = (byte)r.Next(0,
+							Rules.TileSets[surface1.Map.Tileset].Tiles[tr.type].TileBitmapBytes.Count);
+
+					surface1.Map.MapTiles.Value[i, j] = tr;
+				}
+
+			surface1.Chunks.Clear();
+			surface1.Invalidate();
 		}
 	}
 }

OpenRA.Editor/ITool.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.Editor/LegacyMapImporter.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -39,12 +39,12 @@ namespace OpenRA.Editor
 			{ "gold02", new Pair<byte,byte>(1,1) },
 			{ "gold03", new Pair<byte,byte>(1,2) },
 			{ "gold04", new Pair<byte,byte>(1,3) },
-			
+
 			{ "gem01", new Pair<byte,byte>(2,0) },
 			{ "gem02", new Pair<byte,byte>(2,1) },
 			{ "gem03", new Pair<byte,byte>(2,2) },
 			{ "gem04", new Pair<byte,byte>(2,3) },
-			
+
 			// cnc tiberium
 			{ "ti1", new Pair<byte,byte>(1,0) },
 			{ "ti2", new Pair<byte,byte>(1,1) },
@@ -67,7 +67,7 @@ namespace OpenRA.Editor
 			{"brik","brik"},
 			{"fenc","fenc"},
 			{"wood","wood"},
-			
+
 			// Fields
 			{"v12","v12"},
 			{"v13","v13"},
@@ -76,12 +76,12 @@ namespace OpenRA.Editor
 			{"v16","v16"},
 			{"v17","v17"},
 			{"v18","v18"},
-			
+
 			// Crates
 //			{"wcrate","crate"},
 //			{"scrate","crate"},
 		};
-		
+
 		// todo: fix this -- will have bitrotted pretty badly.
 		static Dictionary<string,Pair<Color,Color>> namedColorMapping = new Dictionary<string, Pair<Color, Color>>()
 		{
@@ -96,30 +96,30 @@ namespace OpenRA.Editor
 			{"white",Pair.New(Color.FromArgb(255,255,255),Color.FromArgb(75,75,75))},
 			{"black",Pair.New(Color.FromArgb(80,80,80),Color.FromArgb(5,5,5))},
 		};
-				
+
 		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;
 		}
 
 		enum IniMapFormat { RedAlert = 3, /* otherwise, cnc (2 variants exist, we don't care to differentiate) */ };
-		
+
 		public void ConvertIniMap(string iniFile)
 		{
-			
+
 			var file = new IniFile(FileSystem.Open(iniFile));
 			var basic = file.GetSection("Basic");
 			var map = file.GetSection("Map");
@@ -137,12 +137,12 @@ namespace OpenRA.Editor
 			Map.MapSize.Y = MapSize;
 			Map.Bounds = Rectangle.FromLTRB(XOffset, YOffset, XOffset + Width, YOffset + Height);
 			Map.Selectable = true;
-			
+
 			Map.Smudges = Lazy.New(() => new List<SmudgeReference>());
 			Map.Actors = Lazy.New(() => new Dictionary<string, ActorReference>());
 			Map.MapResources = Lazy.New(() => new TileReference<byte, byte>[MapSize, MapSize]);
 			Map.MapTiles = Lazy.New(() => new TileReference<ushort, byte>[MapSize, MapSize]);
-			
+
 			if (legacyMapFormat == IniMapFormat.RedAlert)
 			{
 				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
@@ -155,30 +155,31 @@ namespace OpenRA.Editor
 				ReadCncOverlay(file);
 				ReadCncTrees(file);
 			}
-			
+
 			LoadActors(file, "STRUCTURES");
 			LoadActors(file, "UNITS");
 			LoadActors(file, "INFANTRY");
 			LoadSmudges(file, "SMUDGE");
-			
+
 			foreach (var p in Players)
 				LoadPlayer(file, p, (legacyMapFormat == IniMapFormat.RedAlert));
-			
+
 			var wps = file.GetSection("Waypoints")
 					.Where(kv => int.Parse(kv.Value) > 0)
 					.Select(kv => Pair.New(int.Parse(kv.Key),
 						LocationFromMapOffset(int.Parse(kv.Value), MapSize)))
 					.ToArray();
-			
-			
+
+
 			// Add waypoint actors
 			foreach( var kv in wps )
 			{
 				var a = new ActorReference("mpspawn");
 				a.Add(new LocationInit(kv.Second));
+				a.Add(new OwnerInit("Neutral"));
 				Map.Actors.Value.Add("spawn" + kv.First, a);
 			}
-			
+
 		}
 
 		static int2 LocationFromMapOffset(int offset, int mapSize)
@@ -242,7 +243,7 @@ namespace OpenRA.Editor
 
 			return ret;
 		}
-		
+
 		void UnpackRATileData(MemoryStream ms)
 		{
 			for (int i = 0; i < MapSize; i++)
@@ -273,10 +274,10 @@ namespace OpenRA.Editor
 
 					if (o != 255 && overlayActorMapping.ContainsKey(raOverlayNames[o]))
 						Map.Actors.Value.Add("Actor" + ActorCount++,
-							new ActorReference(overlayActorMapping[raOverlayNames[o]]) 
-							{ 
+							new ActorReference(overlayActorMapping[raOverlayNames[o]])
+							{
 								new LocationInit( new int2(i, j) ),
-								new OwnerInit( "Neutral" ) 
+								new OwnerInit( "Neutral" )
 							});
 				}
 		}
@@ -290,7 +291,7 @@ namespace OpenRA.Editor
 			foreach (KeyValuePair<string, string> kv in terrain)
 			{
 				var loc = int.Parse(kv.Key);
-				Map.Actors.Value.Add("Actor" + ActorCount++, 
+				Map.Actors.Value.Add("Actor" + ActorCount++,
 					new ActorReference(kv.Value.ToLowerInvariant())
 					{
 						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
@@ -312,7 +313,7 @@ namespace OpenRA.Editor
 					Map.MapTiles.Value[i, j].index = ReadByte(ms);
 				}
 		}
-		
+
 		void ReadCncOverlay(IniFile file)
 		{
 			IniSection overlay = file.GetSection("OVERLAY", true);
@@ -331,7 +332,7 @@ namespace OpenRA.Editor
 				Map.MapResources.Value[cell.X, cell.Y] = new TileReference<byte, byte>(res.First, res.Second);
 
 				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
-					Map.Actors.Value.Add("Actor" + ActorCount++, 
+					Map.Actors.Value.Add("Actor" + ActorCount++,
 						new ActorReference(overlayActorMapping[kv.Value.ToLower()])
 						{
 							new LocationInit(cell),
@@ -339,7 +340,7 @@ namespace OpenRA.Editor
 						});
 			}
 		}
-		
+
 		void ReadCncTrees(IniFile file)
 		{
 			IniSection terrain = file.GetSection("TERRAIN", true);
@@ -364,69 +365,43 @@ 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 actor = new ActorReference(parts[1].ToLowerInvariant())
 					{
 						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
 						new OwnerInit(parts[0]),
 						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));
 				}
 			}
 		}
-		
+
 		void LoadSmudges(IniFile file, string section)
 		{
 			foreach (var s in file.GetSection(section, true))
@@ -437,28 +412,28 @@ namespace OpenRA.Editor
 				Map.Smudges.Value.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), int.Parse(parts[2])));
 			}
 		}
-		
+
 		void LoadPlayer(IniFile file, string section, bool isRA)
-		{			
-			var c = (section == "BadGuy") ? "red" :
-						(isRA) ? "blue" : "gold";
-			
+		{
+			var c = section == "BadGuy" ? "red" :
+						isRA ? "blue" : "gold";
+
 			var color = namedColorMapping[c];
-			
+
 			var pr = new PlayerReference
 			{
 				Name = section,
-				OwnsWorld = (section == "Neutral"),
-				NonCombatant = (section == "Neutral"),
-				Race = (isRA) ? ((section == "BadGuy") ? "soviet" : "allies") : ((section == "BadGuy") ? "nod" : "gdi"),
+				OwnsWorld = section == "Neutral",
+				NonCombatant = section == "Neutral",
+				Race = isRA ? (section == "BadGuy" ? "soviet" : "allies") : (section == "BadGuy" ? "nod" : "gdi"),
 				ColorRamp = new ColorRamp(
                         (byte)((color.First.GetHue() / 360.0f) * 255),
                         (byte)(color.First.GetSaturation() * 255),
                         (byte)(color.First.GetBrightness() * 255),
                         (byte)(color.Second.GetBrightness() * 255))
 			};
-			
-			var Neutral = new List<string>(){"Neutral"};
+
+			var Neutral = new [] {"Neutral"};
 			foreach (var s in file.GetSection(section, true))
 			{
 				Console.WriteLine(s.Key);
@@ -473,7 +448,7 @@ namespace OpenRA.Editor
 					break;
 				}
 			}
-			
+
 			Map.Players.Add(section, pr);
 		}
 

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.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -19,9 +19,10 @@ namespace OpenRA.Editor
 			InitializeComponent();
 		}
 
-		private void SelectText(object sender, System.EventArgs e)
+		void SelectText(object sender, System.EventArgs e)
 		{
-			(sender as NumericUpDown).Select(0, (sender as NumericUpDown).ToString().Length);
+			var ud = sender as NumericUpDown;
+			ud.Select(0, ud.ToString().Length);
 		}
 	}
 }

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

@@ -1,18 +1,18 @@
 #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 
+ * 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.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
@@ -30,30 +30,30 @@ namespace OpenRA.Editor
 				UpgradeMaps(args[1]);
 				return;
 			}
-			
+
 			Application.CurrentCulture = CultureInfo.InvariantCulture;
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
 
 			Application.Run(new Form1(args));
 		}
-		
+
 		static void UpgradeMaps(string mod)
 		{
 			var MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", mod, "maps" }
 				.Aggregate(Path.Combine);
-			
+
 			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.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

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

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -18,17 +18,6 @@ namespace OpenRA.Editor
 {
 	static class RenderUtils
 	{
-		public static ColorPalette MakeSystemPalette(Palette p)
-		{
-			ColorPalette pal;
-			using (var b = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-				pal = b.Palette;
-			
-			for (var i = 0; i < 256; i++)
-				pal.Entries[i] = p.GetColor(i);
-			return pal;
-		}
-
 		public static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
 		{
 			var template = ts.Templates[n];
@@ -37,7 +26,7 @@ namespace OpenRA.Editor
 			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y,
 				PixelFormat.Format8bppIndexed);
 
-			bitmap.Palette = MakeSystemPalette(p);
+			bitmap.Palette = p.AsSystemPalette();
 
 			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
@@ -74,7 +63,7 @@ namespace OpenRA.Editor
 
 			var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
 
-			bitmap.Palette = MakeSystemPalette(p);
+			bitmap.Palette = p.AsSystemPalette();
 
 			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
@@ -95,9 +84,8 @@ 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);
-			
+            var image = RenderSimple.GetImage(info);
+
             using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
 			{
 				var shp = new ShpReader(s);
@@ -134,7 +122,7 @@ namespace OpenRA.Editor
 				var frame = shp[shp.ImageCount - 1];
 
 				var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
-				bitmap.Palette = MakeSystemPalette(p);
+				bitmap.Palette = p.AsSystemPalette();
 				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 

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.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

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/ResourceTool.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -30,7 +30,7 @@ namespace OpenRA.Editor
 					index = (byte)random.Next(Resource.Info.SpriteNames.Length)
 				};
 
-			var ch = new int2((surface.GetBrushLocation().X) / Surface.ChunkSize, 
+			var ch = new int2((surface.GetBrushLocation().X) / Surface.ChunkSize,
 				(surface.GetBrushLocation().Y) / Surface.ChunkSize);
 
 			if (surface.Chunks.ContainsKey(ch))

OpenRA.Editor/Surface.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -33,9 +33,10 @@ namespace OpenRA.Editor
 		public float Zoom = 1.0f;
 
 		ITool Tool;
-		
-		public bool IsPanning;
+
+		public bool IsPanning;
 		public bool ShowActorNames;
+		public bool ShowGrid;
 
 		public event Action AfterChange = () => { };
 		public event Action<string> MousePositionChanged = _ => { };
@@ -153,7 +154,7 @@ namespace OpenRA.Editor
 				return;
 
 			Tool = null;
-			
+
 			var key = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == BrushLocation);
 			if (key.Key != null) Map.Actors.Value.Remove(key.Key);
 
@@ -198,7 +199,6 @@ namespace OpenRA.Editor
 		{
 
 			var bitmap = new Bitmap(ChunkSize * TileSet.TileSize, ChunkSize * TileSet.TileSize);
-			bitmap.SetPixel(0, 0, Color.Green);
 
 			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
@@ -242,6 +242,16 @@ namespace OpenRA.Editor
 			}
 
 			bitmap.UnlockBits(data);
+
+			if (ShowGrid)
+				using( var g = SGraphics.FromImage(bitmap) )
+				{
+					var rect = new Rectangle(0,0,bitmap.Width, bitmap.Height);
+					ControlPaint.DrawGrid( g, rect,	new Size(2, Game.CellSize), Color.DarkRed );
+					ControlPaint.DrawGrid( g, rect,	new Size(Game.CellSize, 2), Color.DarkRed );
+					ControlPaint.DrawGrid( g, rect,	new Size(Game.CellSize, Game.CellSize), Color.Red );
+				}
+
 			return bitmap;
 		}
 
@@ -286,7 +296,7 @@ namespace OpenRA.Editor
 		{
 			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
 			var drawPos = GetDrawPosition(p, t.Bitmap, centered);
-			
+
 			g.DrawRectangle(CordonPen,
 				drawPos.X, drawPos.Y,
 				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);
@@ -297,7 +307,7 @@ namespace OpenRA.Editor
 			var pr = Map.Players[name];
 			var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
 			var remap = new PlayerColorRemap(pr.ColorRamp, pcpi.PaletteFormat);
-			return RenderUtils.MakeSystemPalette(new Palette(Palette, remap));
+			return new Palette(Palette, remap).AsSystemPalette();
 		}
 
 		Cache<string, ColorPalette> PlayerPalettes;
@@ -338,27 +348,29 @@ 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));
+				else
+					Console.WriteLine("Warning: Unknown or excluded actor: {0}", ar.Value.Type);
+			}
+
+			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)
 				Tool.Preview(this, e.Graphics);
-				
+
 			if (Tool == null)
 			{
 				var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
@@ -373,16 +385,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/ColorRamp.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/Evaluator.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -61,12 +61,12 @@ namespace OpenRA.FileFormats
 					while ((temp = s.Pop()) != "(") yield return temp;
 				}
 				else if (char.IsNumber(t[0])) yield return t;
-				else if (char.IsLetter(t[0])) 
+				else if (char.IsLetter(t[0]))
 				{
 					if (!syms.ContainsKey(t))
 						throw new InvalidOperationException("Substitution `{0}` undefined".F(t));
-					    
-					yield return syms[t].ToString();;
+
+					yield return syms[t].ToString();
 				}
 				else
 				{
@@ -74,7 +74,7 @@ namespace OpenRA.FileFormats
 					s.Push(t);
 				}
 			}
-			
+
 			while (s.Count > 0) yield return s.Pop();
 		}
 

OpenRA.FileFormats/Exts.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -24,6 +24,12 @@ namespace OpenRA
 			return string.Format(fmt, args);
 		}
 
+		public static T WithDefault<T>(T def, Func<T> f)
+		{
+			try { return f(); }
+			catch { return def; }
+		}
+
 		public static void Do<T>(this IEnumerable<T> e, Action<T> fn)
 		{
 			foreach (var ee in e)
@@ -105,49 +111,65 @@ 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 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) || 
+			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 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); }
+		}
+
+		public static int NextPowerOf2(int v)
+		{
+			--v;
+			v |= v >> 1;
+			v |= v >> 2;
+			v |= v >> 4;
+			v |= v >> 8;
+			++v;
+			return v;
+		}
 	}
 }

OpenRA.FileFormats/FieldLoader.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -66,16 +66,33 @@ namespace OpenRA.FileFormats
 			return t;
 		}
 
+		static readonly object[] NoIndexes = {};
 		public static void LoadField( object self, string key, string value )
 		{
 			var field = self.GetType().GetField( key.Trim() );
 
-			if( field == null )
-				UnknownFieldAction( key.Trim(), self.GetType() );
-			else if( field.HasAttribute<FieldFromYamlKeyAttribute>() )
+			if( field != null )
+			{
+				if (!field.HasAttribute<FieldFromYamlKeyAttribute>())
+					field.SetValue( self, GetValue( field.Name, field.FieldType, value ) );
 				return;
-			else
-				field.SetValue( self, GetValue( field.Name, field.FieldType, value ) );
+			}
+
+			var prop = self.GetType().GetProperty( key.Trim() );
+
+			if (prop != null)
+			{
+				if (!prop.HasAttribute<FieldFromYamlKeyAttribute>())
+					prop.SetValue(self, GetValue(prop.Name, prop.PropertyType, value), NoIndexes);
+				return;
+			}
+
+			UnknownFieldAction( key.Trim(), self.GetType() );
+		}
+
+		public static T GetValue<T>( string field, string value )
+		{
+			return (T) GetValue( field, typeof(T), value );
 		}
 
 		public static object GetValue( string field, Type fieldType, string x )
@@ -100,7 +117,7 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(float))
 			{
 				float res;
-				if (float.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
+				if (float.TryParse(x.Replace("%",""),  NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
 					return res * (x.Contains( '%' ) ? 0.01f : 1f);
 				return InvalidValueAction(x,fieldType, field);
 			}
@@ -108,7 +125,7 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(decimal))
 			{
 				decimal res;
-				if (decimal.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
+				if (decimal.TryParse(x.Replace("%",""),  NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
 					return res * (x.Contains( '%' ) ? 0.01m : 1m);
 				return InvalidValueAction(x,fieldType, field);
 			}
@@ -183,7 +200,14 @@ namespace OpenRA.FileFormats
                 var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
                 return new Rectangle(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
             }
-			
+			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				var argTypes = new Type[] { typeof(string[]) };
+				var argValues = new object[] { parts };
+				return fieldType.GetConstructor(argTypes).Invoke(argValues);
+			}
+
 			UnknownFieldAction("[Type] {0}".F(x),fieldType);
 			return null;
 		}
@@ -207,26 +231,22 @@ namespace OpenRA.FileFormats
 			foreach( var ff in type.GetFields() )
 			{
 				var field = ff;
-				var load = field.GetCustomAttributes<LoadAttribute>( false );
+				var ignore = field.GetCustomAttributes<IgnoreAttribute>( false );
 				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>( false );
 				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>( false );
 				if( loadUsing.Length != 0 )
 					ret[ field ] = ( _1, fieldType, yaml ) => loadUsing[ 0 ].LoaderFunc( field )( yaml );
 				else if( fromYamlKey.Length != 0 )
 					ret[ field ] = ( f, ft, yaml ) => GetValue( f, ft, yaml.Value );
-				else if( load.Length != 0 )
+				else if( ignore.Length == 0 )
 					ret[ field ] = null;
 			}
 
-			if( ret.Count == 0 )
-				foreach( var f in type.GetFields() )
-					ret.Add( f, null );
-
 			return ret;
 		}
 
 		[AttributeUsage( AttributeTargets.Field )]
-		public class LoadAttribute : Attribute { }
+		public class IgnoreAttribute : Attribute { }
 
 		[AttributeUsage( AttributeTargets.Field )]
 		public class LoadUsingAttribute : Attribute
@@ -284,7 +304,7 @@ namespace OpenRA.FileFormats
 		{
 			return new MiniYamlNode(field, FieldSaver.FormatValue( o, o.GetType().GetField(field) ));
 		}
-		
+
 		public static string FormatValue(object o, FieldInfo f)
 		{
 			var v = f.GetValue(o);
@@ -300,15 +320,20 @@ namespace OpenRA.FileFormats
 					((int)c.G).Clamp(0, 255),
 					((int)c.B).Clamp(0, 255));
 			}
-			else if (f.FieldType == typeof(Rectangle))
+
+			if (f.FieldType == typeof(Rectangle))
 			{
 				var r = (Rectangle)v;
 				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
 			}
-			
-			return f.FieldType.IsArray
-				? string.Join(",", ((Array)v).OfType<object>().Select(a => a.ToString()).ToArray())
-				: v.ToString();
+
+			if (f.FieldType.IsArray)
+			{
+				var elems = ((Array)v).OfType<object>();
+				return string.Join(",", elems.Select(a => a.ToString()).ToArray());
+			}
+
+			return v.ToString();
 		}
 	}
 

OpenRA.FileFormats/FileFormats/AudLoader.cs

@@ -1,7 +1,7 @@
-#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 
+ * 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.
@@ -109,13 +109,13 @@ namespace OpenRA.FileFormats
 			/*var dataSize = */ br.ReadInt32();
 			var outputSize = br.ReadInt32();
 			var flags = (SoundFlags) br.ReadByte();
-			
+
 			var samples = outputSize;
 			if (0 != (flags & SoundFlags.Stereo)) samples /= 2;
 			if (0 != (flags & SoundFlags._16Bit)) samples /= 2;
 			return samples / sampleRate;
 		}
-		
+
 		public static byte[] LoadSound(Stream s)
 		{
 			var br = new BinaryReader(s);
@@ -140,10 +140,14 @@ namespace OpenRA.FileFormats
 					var t = DecodeSample(b, ref index, ref currentSample);
 					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/FileFormats/Blast.cs

@@ -1,12 +1,12 @@
 #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 
+ * 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.
  *
- * This file is based on the blast routines (version 1.1 by Mark Adler) 
+ * This file is based on the blast routines (version 1.1 by Mark Adler)
  * included in zlib/contrib
  */
 #endregion
@@ -20,7 +20,7 @@ namespace OpenRA.FileFormats
 	{
 		public static readonly int MAXBITS = 13; // maximum code length
 		public static readonly int MAXWIN = 4096; // maximum window size
-		
+
 		static byte[] litlen = new byte[] {
 			11, 124, 8, 7, 28, 7, 188, 13, 76, 4,
 			10, 8, 12, 10, 12, 10, 8, 23, 8, 9,
@@ -51,28 +51,28 @@ namespace OpenRA.FileFormats
 			0, 0, 0, 0, 0, 0, 0, 0, 1, 2,
 			3, 4, 5, 6, 7, 8
 		};
-		
+
 		static Huffman litcode = new Huffman(litlen, litlen.Length, 256);
 		static Huffman lencode = new Huffman(lenlen, lenlen.Length, 16);
 		static Huffman distcode = new Huffman(distlen, distlen.Length, 64);
-		
+
 		// Decode PKWare Compression Library stream.
 		public static byte[] Decompress(byte[] src)
 		{
 			BitReader br = new BitReader(src);
-			
+
 			// Are literals coded?
 			int coded = br.ReadBits(8);
-			
+
 			if (coded < 0 || coded > 1)
 				throw new NotImplementedException("Invalid datastream");
 			bool EncodedLiterals = (coded == 1);
-			
+
 			// log2(dictionary size) - 6
 			int dict = br.ReadBits(8);
 			if (dict < 4 || dict > 6)
-				throw new InvalidDataException("Invalid dictionary size");	
-			
+				throw new InvalidDataException("Invalid dictionary size");
+
 			// output state
 			ushort next = 0; // index of next write location in out[]
 			bool first = true; // true to check distances (for first 4K)
@@ -94,37 +94,42 @@ namespace OpenRA.FileFormats
 							ms.WriteByte(outBuffer[i]);
 						break;
 					}
-					
+
 					// Distance
 					symbol = len == 2 ? 2 : dict;
 					int dist = Decode(distcode, br) << symbol;
 					dist += br.ReadBits(symbol);
 					dist++;
-					
+
 					if (first && dist > next)
 						throw new InvalidDataException("Attempt to jump before data");
-					
+
 					// copy length bytes from distance bytes back
 					do
 					{
 						int dest = next;
 						int source = dest - dist;
-						
+
 						int copy = MAXWIN;
 						if (next < dist)
 						{
 							source += copy;
 							copy = dist;
 						}
-						
+
 						copy -= next;
 						if (copy > len)
 							copy = len;
-						
+
 						len -= copy;
 						next += (ushort)copy;
-						Array.Copy(outBuffer, source, outBuffer, dest, copy);
-						
+
+						// copy with old-fashioned memcpy semantics
+						// in case of overlapping ranges. this is NOT
+						// the same as Array.Copy()
+						while( copy-- > 0 )
+							outBuffer[dest++] = outBuffer[source++];
+
 						// Flush window to outstream
 						if (next == MAXWIN)
 						{
@@ -148,12 +153,12 @@ namespace OpenRA.FileFormats
 					}
 				}
 			} while (true);
-			
+
 			return ms.ToArray();
 		}
-		
-		// Decode a code using huffman table h.  
-		private static int Decode(Huffman h, BitReader br)
+
+		// Decode a code using huffman table h.
+		static int Decode(Huffman h, BitReader br)
 		{
 			int code = 0; // len bits being decoded
 			int first = 0; // first code of length len
@@ -173,7 +178,7 @@ namespace OpenRA.FileFormats
 			}
 		}
 	}
-	
+
 	class BitReader
 	{
 		readonly byte[] src;
@@ -185,7 +190,7 @@ namespace OpenRA.FileFormats
 		{
             this.src = src;
 		}
-		
+
 		public int ReadBits(int count)
 		{
 			int ret = 0;
@@ -197,7 +202,7 @@ namespace OpenRA.FileFormats
 					bitBuffer = src[offset++];
 					bitCount = 8;
 				}
-				
+
 				ret |= (bitBuffer & 1) << filled;
 				bitBuffer >>= 1;
 				bitCount--;
@@ -225,7 +230,7 @@ namespace OpenRA.FileFormats
 		{
 			short[] length = new short[256]; // code lengths
 			int s = 0; // current symbol
-			
+
 			// convert compact repeat counts into symbol bit length list
 			foreach (byte code in rep)
 			{
@@ -237,16 +242,16 @@ namespace OpenRA.FileFormats
 				} while (--num > 0);
 			}
 			n = s;
-			
+
 			// count number of codes of each length
 			Count = new short[Blast.MAXBITS + 1];
 			for (int i = 0; i < n; i++)
 				Count[length[i]]++;
-			
+
 			// no codes!
 			if (Count[0] == n)
 				return;
-			
+
 			// check for an over-subscribed or incomplete set of lengths
 			int left = 1; // one possible code of zero length
 			for (int len = 1; len <= Blast.MAXBITS; len++)
@@ -258,12 +263,12 @@ namespace OpenRA.FileFormats
 				if (left < 0)
 					throw new InvalidDataException ("over subscribed code set");
 			}
-			
+
 			// generate offsets into symbol table for each length for sorting
 			short[] offs = new short[Blast.MAXBITS + 1];
 			for (int len = 1; len < Blast.MAXBITS; len++)
 				offs[len + 1] = (short)(offs[len] + Count[len]);
-			
+
 			// put symbols in table sorted by length, by symbol order within each length
 			Symbol = new short[SymbolCount];
 			for (short i = 0; i < n; i++)

OpenRA.FileFormats/FileFormats/Blowfish.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -385,7 +385,7 @@ namespace OpenRA.FileFormats
         void dec_bignum(uint[] n, uint len)
         {
             int i = 0;
-            while ((--n[i] == 0xffffffff) && (--len > 0)) 
+            while ((--n[i] == 0xffffffff) && (--len > 0))
                 i++;
         }
 
@@ -495,7 +495,7 @@ namespace OpenRA.FileFormats
             uint[] n3 = new uint[64];
 
             uint a = (pubkey.len - 1) / 8;
-            while (a + 1 <= pre_len) 
+            while (a + 1 <= pre_len)
             {
                 init_bignum(n2, 0, 64);
                 fixed( uint * pn2 = &n2[0] )

OpenRA.FileFormats/FileFormats/Format2.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/FileFormats/Format40.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/FileFormats/Format80.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -129,7 +129,7 @@ namespace OpenRA.FileFormats
 		{
 			/* quick & dirty format80 encoder -- only uses raw copy operator, terminated with a zero-run. */
 			/* this does not produce good compression, but it's valid format80 */
-			
+
 			var ctx = new FastByteReader(src);
 			var ms = new MemoryStream();
 

OpenRA.FileFormats/FileFormats/IniFile.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/Filesystem/FileSystem.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -11,15 +11,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Linq;
+using System.Reflection;
 
 namespace OpenRA.FileFormats
 {
 	public static class FileSystem
 	{
 		static List<IFolder> mountedFolders = new List<IFolder>();
-		public static string SpecialPackageRoot = "";
 
 		static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
 
@@ -55,7 +54,7 @@ namespace OpenRA.FileFormats
             else
                 return new Folder(filename, order, content);
         }
-		
+
         public static IFolder OpenPackage(string filename, int order)
         {
             if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
@@ -74,11 +73,11 @@ namespace OpenRA.FileFormats
 		{
 			var optional = name.StartsWith("~");
 			if (optional) name = name.Substring(1);
-			
-			// paths starting with $ are relative to SpecialPackageRoot
-			if (name.StartsWith("$"))
-				name = SpecialPackageRoot+name.Substring(1);
-			
+
+			// paths starting with ^ are relative to the support dir
+			if (name.StartsWith("^"))
+				name = Platform.SupportDir+name.Substring(1);
+
 			var a = (Action)(() => FileSystem.MountInner(OpenPackage(name)));
 
 			if (optional)
@@ -199,7 +198,7 @@ namespace OpenRA.FileFormats
 					assemblyCache.Add(filename, a);
 					return a;
 				}
-			
+
 			return null;
 		}
 	}

OpenRA.FileFormats/Filesystem/Folder.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -26,11 +26,11 @@ namespace OpenRA.FileFormats
 			this.path = path;
 			this.priority = priority;
 			if (Directory.Exists(path))
-				Directory.Delete(path);
-			
+				Directory.Delete(path, true);
+
 			Write(contents);
 		}
-		
+
 		public Folder(string path, int priority)
 		{
 			this.path = path;
@@ -50,7 +50,7 @@ namespace OpenRA.FileFormats
 			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
 				yield return PackageEntry.HashFilename( Path.GetFileName(filename) );
 		}
-		
+
 		public bool Exists(string filename)
 		{
 			return File.Exists(Path.Combine(path,filename));
@@ -61,10 +61,10 @@ namespace OpenRA.FileFormats
 		{
 			get { return priority; }
 		}
-		
+
 		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/Filesystem/InstallShieldPackage.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -32,7 +32,7 @@ namespace OpenRA.FileFormats
 			uint signature = reader.ReadUInt32();
 			if (signature != 0x8C655D13)
 				throw new InvalidDataException("Not an Installshield package");
-			
+
 			reader.ReadBytes(8);
 			/*var FileCount = */reader.ReadUInt16();
 			reader.ReadBytes(4);
@@ -41,7 +41,7 @@ namespace OpenRA.FileFormats
 			var TOCAddress = reader.ReadInt32();
 			reader.ReadBytes(4);
 			var DirCount = reader.ReadUInt16();
-			
+
 			// Parse the directory list
 			s.Seek(TOCAddress, SeekOrigin.Begin);
 			BinaryReader TOCreader = new BinaryReader(s);
@@ -56,15 +56,15 @@ namespace OpenRA.FileFormats
 			var ChunkSize = reader.ReadUInt16();
 			var NameLength = reader.ReadUInt16();
 			reader.ReadChars(NameLength); //var DirName = new String(reader.ReadChars(NameLength));
-			
+
 			// Skip to the end of the chunk
 			reader.ReadBytes(ChunkSize - NameLength - 6);
-			
+
 			// Parse files
 			for (var i = 0; i < FileCount; i++)
 				ParseFile(reader);
 		}
-		
+
 		uint AccumulatedData = 0;
 		void ParseFile(BinaryReader reader)
 		{
@@ -79,11 +79,11 @@ namespace OpenRA.FileFormats
 			var hash = PackageEntry.HashFilename(FileName);
 			index.Add(hash, new PackageEntry(hash,AccumulatedData, CompressedSize));
 			AccumulatedData += CompressedSize;
-			
+
 			// Skip to the end of the chunk
 			reader.ReadBytes(ChunkSize - NameLength - 30);
 		}
-		
+
 		public Stream GetContent(uint hash)
 		{
 			PackageEntry e;
@@ -93,7 +93,7 @@ namespace OpenRA.FileFormats
 			s.Seek( dataStart + e.Offset, SeekOrigin.Begin );
 			byte[] data = new byte[ e.Length ];
 			s.Read( data, 0, (int)e.Length );
-			
+
 			return new MemoryStream(Blast.Decompress(data));
 		}
 
@@ -106,7 +106,7 @@ namespace OpenRA.FileFormats
 		{
 			return index.Keys;
 		}
-		
+
 		public bool Exists(string filename)
 		{
 			return index.ContainsKey(PackageEntry.HashFilename(filename));
@@ -117,7 +117,7 @@ namespace OpenRA.FileFormats
 		{
 			get { return 2000 + priority; }
 		}
-		
+
 		public void Write(Dictionary<string, byte[]> contents)
 		{
 			throw new NotImplementedException("Cannot save InstallShieldPackages.");

OpenRA.FileFormats/Filesystem/MixFile.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -31,14 +31,14 @@ namespace OpenRA.FileFormats
 		readonly long dataStart;
 		readonly Stream s;
 		int priority;
-		
+
 		// Create a new MixFile
 		public MixFile(string filename, int priority, Dictionary<string, byte[]> contents)
 		{
 			this.priority = priority;
 			if (File.Exists(filename))
 				File.Delete(filename);
-			
+
 			s = File.Create(filename);
 			Write(contents);
 		}
@@ -137,7 +137,7 @@ namespace OpenRA.FileFormats
 			dataStart = s.Position;
 			return items;
 		}
-		
+
 		public Stream GetContent(uint hash)
 		{
 			PackageEntry e;
@@ -159,7 +159,7 @@ namespace OpenRA.FileFormats
 		{
 			return index.Keys;
 		}
-		
+
 		public bool Exists(string filename)
 		{
 			return index.ContainsKey(PackageEntry.HashFilename(filename));
@@ -170,17 +170,17 @@ namespace OpenRA.FileFormats
 		{
 			get { return 1000 + priority; }
 		}
-		
+
 		public void Write(Dictionary<string, byte[]> contents)
 		{
 			// Cannot modify existing mixfile - rename existing file and
 			// create a new one with original content plus modifications
 			FileSystem.Unmount(this);
-			
+
 			// TODO: Add existing data to the contents list
 			if (index.Count > 0)
 				throw new NotImplementedException("Updating mix files unfinished");
-		
+
 			// Construct a list of entries for the file header
 			uint dataSize = 0;
 			var items = new List<PackageEntry>();

OpenRA.FileFormats/Filesystem/ZipFile.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -44,7 +44,7 @@ namespace OpenRA.FileFormats
 
 			if (File.Exists(filename))
 				File.Delete(filename);
-			
+
 			pkg = SZipFile.Create(filename);
 			Write(contents);
 		}
@@ -70,7 +70,7 @@ namespace OpenRA.FileFormats
 			foreach(ZipEntry entry in pkg)
 				yield return PackageEntry.HashFilename(entry.Name);
 		}
-		
+
 		public bool Exists(string filename)
 		{
 			return pkg.GetEntry(filename) != null;
@@ -80,7 +80,7 @@ namespace OpenRA.FileFormats
 		{
 			get { return 500 + priority; }
 		}
-		
+
 		public void Write(Dictionary<string, byte[]> contents)
 		{
 			pkg.Close();
@@ -108,7 +108,7 @@ namespace OpenRA.FileFormats
 		{
 			this.data = data;
 		}
-		
+
 		public Stream GetSource()
 		{
 			return new MemoryStream(data);

OpenRA.FileFormats/Graphics/Dune2ShpReader.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -83,14 +83,14 @@ namespace OpenRA.FileFormats
 			BinaryReader reader = new BinaryReader(stream);
 
 			ImageCount = reader.ReadUInt16();
-			
+
 			//Last offset is pointer to end of file.
 			uint[] offsets = new uint[ImageCount + 1];
 
 			uint temp = reader.ReadUInt32();
 
 			//If fourth byte in file is non-zero, the offsets are two bytes each.
-			bool twoByteOffsets = (temp & 0xFF0000) > 0; 
+			bool twoByteOffsets = (temp & 0xFF0000) > 0;
 			if (twoByteOffsets)
 			{
 				offsets[0] = ((temp & 0xFFFF0000) >> 16) + 2; //Offset does not account for image count bytes
@@ -132,7 +132,7 @@ namespace OpenRA.FileFormats
 		{
 			get { return headers[index]; }
 		}
-	
+
 		public IEnumerator<Dune2ImageHeader> GetEnumerator()
 		{
 			return headers.GetEnumerator();

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -21,29 +21,34 @@ namespace OpenRA.FileFormats.Graphics
 
 		public RendererAttribute( Type graphicsDeviceType )
 		{
-			if( !typeof( IGraphicsDevice ).IsAssignableFrom( graphicsDeviceType ) )
+			if( !typeof( IDeviceFactory ).IsAssignableFrom( graphicsDeviceType ) )
 				throw new InvalidOperationException( "Incorrect type in RendererAttribute" );
 			Type = graphicsDeviceType;
 		}
 	}
 
+	public interface IDeviceFactory
+	{
+		IGraphicsDevice Create( Size size, WindowMode windowMode );
+	}
+
 	public interface IGraphicsDevice
 	{
 		IVertexBuffer<Vertex> CreateVertexBuffer( int length );
-		IIndexBuffer CreateIndexBuffer( int length );
 		ITexture CreateTexture( Bitmap bitmap );
 		ITexture CreateTexture();
 		IShader CreateShader( string name );
 
-		Size WindowSize { get; }
+		Size WindowSize { get; }
 		int GpuMemoryUsed { get; }
 
-		void Clear( Color color );
-		void Present( IInputHandler inputHandler );
+		void Clear();
+		void Present();
+		void PumpInput(IInputHandler inputHandler);
 
-		void DrawIndexedPrimitives( PrimitiveType type, Range<int> vertexRange, Range<int> indexRange );
-		void DrawIndexedPrimitives( PrimitiveType type, int vertexPool, int numPrimitives );
+		void DrawPrimitives( PrimitiveType type, int firstVertex, int numVertices );
 
+		void SetLineWidth( float width );
 		void EnableScissor( int left, int top, int width, int height );
 		void DisableScissor();
 	}
@@ -54,17 +59,10 @@ namespace OpenRA.FileFormats.Graphics
 		void SetData( T[] vertices, int length );
 	}
 
-	public interface IIndexBuffer
-	{
-		void Bind();
-		void SetData( uint[] indices, int length );
-	}
-
 	public interface IShader
 	{
 		void SetValue( string name, float x, float y );
 		void SetValue( string param, ITexture texture );
-		void Commit();
 		void Render( Action a );
 	}
 
@@ -77,9 +75,10 @@ namespace OpenRA.FileFormats.Graphics
 
     public enum PrimitiveType
     {
-        PointList, 
-        LineList, 
+        PointList,
+        LineList,
         TriangleList,
+		QuadList,
     }
 
 	public struct Range<T>
@@ -87,7 +86,7 @@ namespace OpenRA.FileFormats.Graphics
 		public readonly T Start, End;
 		public Range( T start, T end ) { Start = start; End = end; }
 	}
-	
+
 	public enum WindowMode
 	{
 		Windowed,

OpenRA.FileFormats/Graphics/IInputHandler.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -27,13 +27,15 @@ namespace OpenRA
 		public MouseButton Button;
 		public int2 Location;
 		public Modifiers Modifiers;
+		public int MultiTapCount;
 
-		public MouseInput( MouseInputEvent ev, MouseButton button, int2 location, Modifiers mods )
+		public MouseInput( MouseInputEvent ev, MouseButton button, int2 location, Modifiers mods, int multiTapCount )
 		{
 			this.Event = ev;
 			this.Button = button;
 			this.Location = location;
 			this.Modifiers = mods;
+			this.MultiTapCount = multiTapCount;
 		}
 	}
 

OpenRA.FileFormats/Graphics/PngLoader.cs

@@ -1,181 +1,182 @@
-#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)
+		{
+			using (var s = File.OpenRead(filename))
+				return Load(s);
+		}
+
+		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/ShpReader.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -63,7 +63,7 @@ namespace OpenRA.FileFormats
 
 		public Size Size { get { return new Size(Width, Height); } }
 
-		private readonly List<ImageHeader> headers = new List<ImageHeader>();
+		readonly List<ImageHeader> headers = new List<ImageHeader>();
 
 		int recurseDepth = 0;
 
@@ -156,7 +156,7 @@ namespace OpenRA.FileFormats
 			return compressedBytes;
 		}
 
-		private byte[] CopyImageData( byte[] baseImage )
+		byte[] CopyImageData( byte[] baseImage )
 		{
 			byte[] imageData = new byte[ Width * Height ];
 			for( int i = 0 ; i < Width * Height ; i++ )
@@ -174,5 +174,11 @@ namespace OpenRA.FileFormats
 		{
 			return GetEnumerator();
 		}
+
+		public static ShpReader Load(string filename)
+		{
+			using (var s = File.OpenRead(filename))
+				return new ShpReader(s);
+		}
 	}
 }

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/Graphics/Vertex.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/Graphics/VqaReader.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -19,7 +19,7 @@ namespace OpenRA.FileFormats
 		public readonly byte Framerate;
 		public readonly ushort Width;
 		public readonly ushort Height;
-		
+
 		Stream stream;
 		int currentFrame;
 		ushort numColors;
@@ -32,75 +32,75 @@ namespace OpenRA.FileFormats
 
 		// Stores a list of subpixels, referenced by the VPTZ chunk
 		byte[] cbf;
-		byte[] cbp;			
+		byte[] cbp;
 		int cbChunk = 0;
 		int cbOffset = 0;
-		
+
 		// Top half contains block info, bottom half contains references to cbf array
 		byte[] origData;
-		
+
 		// Final frame output
 		uint[,] frameData;
 		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
 
 		public byte[] AudioData { get { return audioData; } }
 		public int CurrentFrame { get { return currentFrame; } }
-		
+
 		public VqaReader( Stream stream )
 		{
 			this.stream = stream;
 			BinaryReader reader = new BinaryReader( stream );
-			
+
 			// Decode FORM chunk
 			if (new String(reader.ReadChars(4)) != "FORM")
 				throw new InvalidDataException("Invalid vqa (invalid FORM section)");
 			/*var length = */ reader.ReadUInt32();
-			
+
 			if (new String(reader.ReadChars(8)) != "WVQAVQHD")
 				throw new InvalidDataException("Invalid vqa (not WVQAVQHD)");
 			/* var length = */reader.ReadUInt32();
-			
+
 			/*var version = */reader.ReadUInt16();
 			/*var flags = */reader.ReadUInt16();
 			Frames = reader.ReadUInt16();
 			Width = reader.ReadUInt16();
 			Height = reader.ReadUInt16();
-			
+
 			blockWidth = reader.ReadByte();
 			blockHeight = reader.ReadByte();
 			Framerate = reader.ReadByte();
 			cbParts = reader.ReadByte();
 			blocks = new int2(Width / blockWidth, Height / blockHeight);
-			
+
 			numColors = reader.ReadUInt16();
 			/*var maxBlocks = */reader.ReadUInt16();
 			/*var unknown1 = */reader.ReadUInt16();
 			/*var unknown2 = */reader.ReadUInt32();
-			
+
 			// Audio
 			/*var freq = */reader.ReadUInt16();
 			/*var channels = */reader.ReadByte();
 			/*var bits = */reader.ReadByte();
 			/*var unknown3 = */reader.ReadChars(14);
-			
-			
-			var frameSize = NextPowerOf2(Math.Max(Width,Height));
+
+
+			var frameSize = Exts.NextPowerOf2(Math.Max(Width,Height));
 			cbf = new byte[Width*Height];
 			cbp = new byte[Width*Height];
 			palette = new uint[numColors];
 			origData = new byte[2*blocks.X*blocks.Y];
 			frameData = new uint[frameSize,frameSize];
-			
+
 			var type = new String(reader.ReadChars(4));
 			if (type != "FINF")
 			{
 				reader.ReadBytes(27);
 				type = new String(reader.ReadChars(4));
 			}
-			
+
 			/*var length = */reader.ReadUInt16();
 			/*var unknown4 = */reader.ReadUInt16();
-			
+
 			// Frame offsets
 			offsets = new UInt32[Frames];
 			for (int i = 0; i < Frames; i++)
@@ -111,7 +111,7 @@ namespace OpenRA.FileFormats
 			}
 
 			CollectAudioData();
-			
+
 			Reset();
 		}
 
@@ -120,7 +120,7 @@ namespace OpenRA.FileFormats
 			currentFrame = cbOffset = cbChunk = 0;
 			LoadFrame();
 		}
-		
+
 		void CollectAudioData()
 		{
 			var ms = new MemoryStream();
@@ -163,17 +163,17 @@ namespace OpenRA.FileFormats
 			currentFrame++;
 			LoadFrame();
 		}
-		
+
 		void LoadFrame()
-		{			
+		{
 			if (currentFrame >= Frames)
 				return;
-			
+
 			// Seek to the start of the frame
 			stream.Seek(offsets[currentFrame], SeekOrigin.Begin);
 			BinaryReader reader = new BinaryReader(stream);
 			var end = (currentFrame < Frames - 1) ? offsets[currentFrame+1] : stream.Length;
-	
+
 			while(reader.BaseStream.Position < end)
 			{
 				var type = new String(reader.ReadChars(4));
@@ -189,17 +189,17 @@ namespace OpenRA.FileFormats
 						reader.ReadBytes((int)length);
 						break;
 				}
-				
+
 				// Chunks are aligned on even bytes; advance by a byte if the next one is null
 				if (reader.PeekChar() == 0) reader.ReadByte();
 			}
 		}
-		
+
 		// VQA Frame
 		public void DecodeVQFR(BinaryReader reader)
-		{			
+		{
 			while(true)
-			{				
+			{
 				// Chunks are aligned on even bytes; may be padded with a single null
 				if (reader.PeekChar() == 0) reader.ReadByte();
 				var type = new String(reader.ReadChars(4));
@@ -214,9 +214,9 @@ namespace OpenRA.FileFormats
 					case "CBF0":
 						cbf = reader.ReadBytes(subchunkLength);
 					break;
-					
+
 					// frame-modifier chunk
-					case "CBP0":	
+					case "CBP0":
 					case "CBPZ":
 						// Partial buffer is full; dump and recreate
 						if (cbChunk == cbParts)
@@ -225,16 +225,16 @@ namespace OpenRA.FileFormats
 								cbf = (byte[])cbp.Clone();
 							else
 								Format80.DecodeInto( cbp, cbf );
-							
+
 							cbOffset = cbChunk = 0;
 						}
-						
+
 						var bytes = reader.ReadBytes(subchunkLength);
 						bytes.CopyTo(cbp,cbOffset);
 						cbOffset += subchunkLength;
 						cbChunk++;
 					break;
-					
+
 					// Palette
 					case "CPL0":
 						for (int i = 0; i < numColors; i++)
@@ -245,7 +245,7 @@ namespace OpenRA.FileFormats
 							palette[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 						}
 					break;
-					
+
 					// Frame data
 					case "VPTZ":
 						Format80.DecodeInto( reader.ReadBytes(subchunkLength), origData );
@@ -256,39 +256,36 @@ namespace OpenRA.FileFormats
 				}
 			}
 		}
-		
+
 		int cachedFrame = -1;
-		public uint[,] FrameData	{ get
+
+		void DecodeFrameData( int frame )
 		{
-			if (cachedFrame != currentFrame)
+			cachedFrame = currentFrame;
+			for (var y = 0; y < blocks.Y; y++)
+				for (var x = 0; x < blocks.X; x++)
+				{
+					var px = origData[x + y*blocks.X];
+					var mod = origData[x + (y + blocks.Y)*blocks.X];
+					for (var j = 0; j < blockHeight; j++)
+						for (var i = 0; i < blockWidth; i++)
+						{
+							var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
+							byte color = (mod == 0x0f) ? px : cbf[cbfi];
+							frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
+						}
+				}
+		}
+
+		public uint[,] FrameData
+		{
+			get
 			{
-				cachedFrame = currentFrame;
-				for (var y = 0; y < blocks.Y; y++)
-					for (var x = 0; x < blocks.X; x++)
-					{
-						var px = origData[x + y*blocks.X];
-						var mod = origData[x + (y + blocks.Y)*blocks.X];
-						for (var j = 0; j < blockHeight; j++)
-							for (var i = 0; i < blockWidth; i++)
-							{
-								var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
-								byte color = (mod == 0x0f) ? px : cbf[cbfi];
-								frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
-							}
-					}
+				if (cachedFrame != currentFrame)
+					DecodeFrameData(currentFrame);
+
+				return frameData;
 			}
-			return frameData;
-		}}
-		
-		int NextPowerOf2(int v)
-		{
-			--v;
-			v |= v >> 1;
-			v |= v >> 2;
-			v |= v >> 4;
-			v |= v >> 8;
-			++v;
-			return v;
 		}
 	}
 }

OpenRA.FileFormats/HttpUtil.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/InstallUtils.cs

@@ -0,0 +1,131 @@
+#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.IO;
+using System.Linq;
+using ICSharpCode.SharpZipLib;
+using ICSharpCode.SharpZipLib.Zip;
+
+namespace OpenRA.FileFormats
+{
+	public static class InstallUtils
+	{
+		static IEnumerable<ZipEntry> GetEntries(this ZipInputStream z)
+		{
+			for (; ; )
+			{
+				var e = z.GetNextEntry();
+				if (e != null) yield return e; else break;
+			}
+		}
+
+		public static string GetMountedDisk(Func<string, bool> isValidDisk)
+		{
+			var volumes = DriveInfo.GetDrives()
+				.Where(v => v.DriveType == DriveType.CDRom && v.IsReady)
+				.Select(v => v.RootDirectory.FullName);
+
+			return volumes.FirstOrDefault(v => isValidDisk(v));
+		}
+
+		// TODO: The package should be mounted into its own context to avoid name collisions with installed files
+		public static bool ExtractFromPackage(string srcPath, string package, string[] files, string destPath, Action<string> onProgress, Action<string> onError)
+		{
+			if (!Directory.Exists(destPath))
+				Directory.CreateDirectory(destPath);
+
+			if (!Directory.Exists(srcPath)) { onError("Cannot find "+package); return false; }
+			FileSystem.Mount(srcPath);
+			if (!FileSystem.Exists(package)) { onError("Cannot find "+package); return false; }
+			FileSystem.Mount(package);
+
+			foreach (string s in files)
+			{
+				var destFile = Path.Combine(destPath, s);
+				using (var sourceStream = FileSystem.Open(s))
+				using (var destStream = File.Create(destFile))
+				{
+					onProgress("Extracting "+s);
+					destStream.Write(sourceStream.ReadAllBytes());
+				}
+			}
+			return true;
+		}
+
+		public static bool CopyFiles(string srcPath, string[] files, string destPath, Action<string> onProgress, Action<string> onError)
+		{
+			foreach (var file in files)
+			{
+				var fromPath = Path.Combine(srcPath, file);
+				if (!File.Exists(fromPath))
+				{
+					onError("Cannot find "+file);
+					return false;
+				}
+				var destFile = Path.GetFileName(file).ToLowerInvariant();
+				onProgress("Extracting "+destFile);
+				File.Copy(fromPath,	Path.Combine(destPath, destFile), true);
+			}
+			return true;
+		}
+
+		public static bool ExtractZip(string zipFile, string dest, Action<string> onProgress, Action<string> onError)
+		{
+			if (!File.Exists(zipFile))
+			{
+				onError("Invalid path: "+zipFile);
+				return false;
+			}
+
+			List<string> extracted = new List<string>();
+			try
+			{
+				var z = new ZipInputStream(File.OpenRead(zipFile));
+				z.ExtractZip(dest, extracted, s => onProgress("Extracting "+s));
+			}
+			catch (SharpZipBaseException)
+			{
+				foreach(var f in extracted)
+					File.Delete(f);
+
+				onError("Invalid archive");
+				return false;
+			}
+			return true;
+		}
+
+		// TODO: this belongs in FileSystem/ZipFile
+		static void ExtractZip(this ZipInputStream z, string destPath, List<string> extracted, Action<string> onProgress)
+		{
+			foreach (var entry in z.GetEntries())
+			{
+				if (!entry.IsFile) continue;
+
+				onProgress(entry.Name);
+
+				Directory.CreateDirectory(Path.Combine(destPath, Path.GetDirectoryName(entry.Name)));
+				var path = Path.Combine(destPath, entry.Name);
+				extracted.Add(path);
+
+				using (var f = File.Create(path))
+				{
+					int bufSize = 2048;
+					byte[] buf = new byte[bufSize];
+					while ((bufSize = z.Read(buf, 0, buf.Length)) > 0)
+					f.Write(buf, 0, bufSize);
+				}
+			}
+
+			z.Close();
+		}
+	}
+}

OpenRA.FileFormats/Manifest.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -20,17 +20,18 @@ namespace OpenRA.FileFormats
 		public readonly string[]
 			Mods, Folders, Packages, Rules, ServerTraits,
 			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
-			Weapons, Voices, Music, Movies, TileSets;
-		public readonly string LoadScreen;
+			Weapons, Voices, Music, Movies, TileSets, ChromeMetrics;
+		public readonly MiniYaml LoadScreen;
+		public readonly Dictionary<string, Pair<string,int>> Fonts;
 		public readonly int TileSize = 24;
 
 		public Manifest(string[] mods)
 		{
 			Mods = mods;
-			var yaml = mods
+			var yaml = new MiniYaml(null, mods
 				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
-				.Aggregate(MiniYaml.Merge);
-			
+				.Aggregate(MiniYaml.MergeLiberal)).NodesDict;
+
 			// Todo: Use fieldloader
 			Folders = YamlList(yaml, "Folders");
 			Packages = YamlList(yaml, "Packages");
@@ -46,20 +47,21 @@ namespace OpenRA.FileFormats
 			Music = YamlList(yaml, "Music");
 			Movies = YamlList(yaml, "Movies");
 			TileSets = YamlList(yaml, "TileSets");
+			ChromeMetrics = YamlList(yaml, "ChromeMetrics");
 
-			LoadScreen = yaml.First( x => x.Key == "LoadScreen" ).Value.Value;
-			
-			if (yaml.FirstOrDefault( x => x.Key == "TileSize" ) != null)
-				TileSize = int.Parse(yaml.First( x => x.Key == "TileSize" ).Value.Value);
+			LoadScreen = yaml["LoadScreen"];
+			Fonts = yaml["Fonts"].NodesDict.ToDictionary(x => x.Key, x => Pair.New(x.Value.NodesDict["Font"].Value,
+				                                                  int.Parse(x.Value.NodesDict["Size"].Value)));
+			if (yaml.ContainsKey("TileSize"))
+				TileSize = int.Parse(yaml["TileSize"].Value);
 		}
 
-		static string[] YamlList(List<MiniYamlNode> ys, string key)
+		static string[] YamlList(Dictionary<string, MiniYaml> yaml, string key)
 		{
-			var y = ys.FirstOrDefault( x => x.Key == key );
-			if( y == null )
+			if (!yaml.ContainsKey(key))
 				return new string[ 0 ];
 
-			return y.Value.NodesDict.Keys.ToArray();
+			return yaml[key].NodesDict.Keys.ToArray();
 		}
 	}
 }

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -20,31 +20,30 @@ namespace OpenRA.FileFormats
 		public bool OwnsWorld = false;
 		public bool NonCombatant = false;
 		public bool Playable = false;
+		public string Bot = null;
 		public bool DefaultStartingUnits = false;
 		public bool AllowBots = true;
-		
+
 		public bool LockRace = false;
 		public string Race;
-		
+
 		public bool LockColor = false;
         public ColorRamp ColorRamp = new ColorRamp(0,0,238,34);
-		
+
+		public bool LockSpawn = false;
+		public int Spawn = 0;
+
+		public bool LockTeam = false;
+		public int Team = 0;
+
 		public int InitialCash = 0;
 		public string[] Allies = {};
 		public string[] Enemies = {};
-		
+
 		public PlayerReference() {}
 		public PlayerReference(MiniYaml my)
 		{
 			FieldLoader.Load(this, my);
 		}
-		
-		public PlayerReference(string name, string race, bool ownsworld, bool noncombatant)
-		{
-			Name = name;
-			Race = race;
-			OwnsWorld = ownsworld;
-			NonCombatant = noncombatant;
-		}
 	}
 }

OpenRA.FileFormats/Map/SmudgeReference.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -21,7 +21,7 @@ namespace OpenRA.FileFormats
 			Location = location;
 			Depth = depth;
 		}
-		
+
 		public override string ToString ()
 		{
 			return string.Format("{0} {1},{2} {3}", Type, Location.X,Location.Y, Depth);

OpenRA.FileFormats/Map/Terrain.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -18,35 +18,35 @@ namespace OpenRA.FileFormats
 		public readonly List<byte[]> TileBitmapBytes = new List<byte[]>();
 
 		public Terrain( Stream stream, int size )
-		{		
+		{
 			// Try loading as a cnc .tem
 			BinaryReader reader = new BinaryReader( stream );
 			int Width = reader.ReadUInt16();
 			int Height = reader.ReadUInt16();
-			
+
 			if( Width != size || Height != size )
 				throw new InvalidDataException( "{0}x{1} != {2}x{2}".F(Width, Height, size ) );
-			
+
 			/*NumTiles = */reader.ReadUInt16();
-			/*Zero1 = */reader.ReadUInt16();			
+			/*Zero1 = */reader.ReadUInt16();
 			/*uint Size = */reader.ReadUInt32();
 			uint ImgStart = reader.ReadUInt32();
 			/*Zero2 = */reader.ReadUInt32();
-			
+
 			int IndexEnd, IndexStart;
 			if (reader.ReadUInt16() == 65535) // ID1 = FFFFh for cnc
 			{
-				/*ID2 = */reader.ReadUInt16();	
+				/*ID2 = */reader.ReadUInt16();
 				IndexEnd = reader.ReadInt32();
 				IndexStart = reader.ReadInt32();
 			}
 			else // Load as a ra .tem
 			{
-				stream.Position = 0;	
+				stream.Position = 0;
 				reader = new BinaryReader( stream );
 				Width = reader.ReadUInt16();
 				Height = reader.ReadUInt16();
-				
+
 				/*NumTiles = */reader.ReadUInt16();
 				reader.ReadUInt16();
 				/*XDim = */reader.ReadUInt16();
@@ -57,7 +57,7 @@ namespace OpenRA.FileFormats
 				reader.ReadUInt32();
 				IndexEnd = reader.ReadInt32();
 				reader.ReadUInt32();
-				IndexStart = reader.ReadInt32();		
+				IndexStart = reader.ReadInt32();
 			}
 			stream.Position = IndexStart;
 

OpenRA.FileFormats/Map/TileReference.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -14,7 +14,7 @@ namespace OpenRA.FileFormats
 	{
 		public T type;
 		public U index;
-		
+
 		public TileReference(T t, U i)
 		{
 			type = t;

OpenRA.FileFormats/Map/TileSet.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -19,7 +19,6 @@ namespace OpenRA.FileFormats
 	public class TerrainTypeInfo
 	{
 		public string Type;
-		public bool Buildable = true;
 		public bool AcceptSmudge = true;
 		public bool IsWater = false;
 		public Color Color;
@@ -28,17 +27,17 @@ namespace OpenRA.FileFormats
 		public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
 		public MiniYaml Save() { return FieldSaver.Save(this); }
 	}
-	
+
 	public class TileTemplate
 	{
-		[FieldLoader.Load] public ushort Id;
-		[FieldLoader.Load] public string Image;
-		[FieldLoader.Load] public int2 Size;
-		[FieldLoader.Load] public bool PickAny;
+		public ushort Id;
+		public string Image;
+		public int2 Size;
+		public bool PickAny;
 
 		[FieldLoader.LoadUsing( "LoadTiles" )]
 		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
-		
+
 		public TileTemplate() {}
 		public TileTemplate(MiniYaml my)
 		{
@@ -51,7 +50,7 @@ namespace OpenRA.FileFormats
 				t => byte.Parse(t.Key),
 				t => t.Value.Value );
 		}
-		
+
 		public MiniYaml Save()
 		{
 			var root = new List<MiniYamlNode>();
@@ -64,11 +63,11 @@ namespace OpenRA.FileFormats
 
 			root.Add( new MiniYamlNode( "Tiles", null,
 				Tiles.Select( x => new MiniYamlNode( x.Key.ToString(), x.Value ) ).ToList() ) );
-			
+
 			return new MiniYaml(null, root);
 		}
 	}
-	
+
 	public class TileSet
 	{
 		public string Name;
@@ -85,7 +84,7 @@ namespace OpenRA.FileFormats
 		public TileSet( string filepath )
 		{
 			var yaml = MiniYaml.DictFromFile( filepath );
-			
+
 			// General info
 			FieldLoader.Load(this, yaml["General"]);
 
@@ -97,7 +96,7 @@ namespace OpenRA.FileFormats
 			Templates = yaml["Templates"].NodesDict.Values
 				.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
 		}
-		
+
 		public void LoadTiles()
 		{
 			foreach (var t in Templates)
@@ -107,9 +106,9 @@ namespace OpenRA.FileFormats
 						Tiles.Add( t.Key, new Terrain( s, TileSize ) );
 				}
 		}
-		
+
 		public void Save(string filepath)
-		{			
+		{
 			var root = new List<MiniYamlNode>();
 			var gen = new List<MiniYamlNode>();
 			foreach (var field in fields)
@@ -120,7 +119,7 @@ namespace OpenRA.FileFormats
 			}
 			root.Add( new MiniYamlNode( "General", null, gen ) );
 
-			root.Add( new MiniYamlNode( "Terrain", null, 
+			root.Add( new MiniYamlNode( "Terrain", null,
 				Terrain.Select( t => new MiniYamlNode(
 					"TerrainType@{0}".F( t.Value.Type ),
 					t.Value.Save() ) ).ToList() ) );
@@ -130,14 +129,14 @@ namespace OpenRA.FileFormats
 					"Template@{0}".F( t.Value.Id ),
 					t.Value.Save() ) ).ToList() ) );
 			root.WriteToFile(filepath);
-		} 
-				
+		}
+
 		public byte[] GetBytes(TileReference<ushort,byte> r)
 		{
 			Terrain tile;
 			if( Tiles.TryGetValue( r.type, out tile ) )
 				return tile.TileBitmapBytes[ r.index ];
-			
+
 			byte[] missingTile = new byte[ TileSize * TileSize ];
 			for( int i = 0 ; i < missingTile.Length ; i++ )
 				missingTile[ i ] = 0x36;

OpenRA.FileFormats/MiniYaml.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -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
@@ -60,7 +66,20 @@ namespace OpenRA.FileFormats
 		public string Value;
 		public List<MiniYamlNode> Nodes;
 
-		public Dictionary<string, MiniYaml> NodesDict { get { return Nodes.ToDictionary( x => x.Key, x => x.Value ); } }
+		public Dictionary<string, MiniYaml> NodesDict
+		{
+			get
+			{
+				var ret = new Dictionary<string, MiniYaml>();
+				foreach (var y in Nodes)
+				{
+					if (ret.ContainsKey(y.Key))
+						throw new InvalidDataException("Duplicate key `{0}' in MiniYaml".F(y.Key));
+					ret.Add(y.Key, y.Value);
+				}
+				return ret;
+			}
+		}
 
 		public MiniYaml( string value ) : this( value, null ) { }
 
@@ -79,7 +98,7 @@ namespace OpenRA.FileFormats
 		{
 			return new MiniYaml( null, list.Select( x => new MiniYamlNode( x.ToString(), new MiniYaml( null ) ) ).ToList() );
 		}
-		
+
 		static List<MiniYamlNode> FromLines(string[] lines, string filename)
 		{
 			var levels = new List<List<MiniYamlNode>>();
@@ -95,14 +114,14 @@ 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);
 
 				var d = new List<MiniYamlNode>();
 				var rhs = SplitAtColon( ref t );
 				levels[ level ].Add( new MiniYamlNode( t, rhs, d, new MiniYamlNode.SourceLocation { Filename = filename, Line = lineNo } ) );
-				
+
 				levels.Add(d);
 			}
 			return levels[ 0 ];
@@ -124,11 +143,11 @@ namespace OpenRA.FileFormats
 		{
 			StreamReader reader = new StreamReader( FileSystem.Open(path) );
 			List<string> lines = new List<string>();
-			
+
 			while( !reader.EndOfStream )
 				lines.Add(reader.ReadLine());
 			reader.Close();
-			
+
 			return FromLines(lines.ToArray(), path);
 		}
 
@@ -143,7 +162,7 @@ namespace OpenRA.FileFormats
 		}
 
 		public static List<MiniYamlNode> FromFile( string path )
-		{			
+		{
 			return FromLines(File.ReadAllLines( path ), path);
 		}
 
@@ -158,7 +177,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 +200,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 +209,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)
@@ -225,7 +273,7 @@ namespace OpenRA.FileFormats
 		{
 			return string.Join("\n", y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
 		}
-		
+
 		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
 		{
 			foreach (var kv in y)
@@ -237,4 +285,9 @@ namespace OpenRA.FileFormats
 			}
 		}
 	}
+
+    public class YamlException : Exception
+    {
+        public YamlException(string s) : base(s) { }
+    }
 }

OpenRA.FileFormats/Mod.cs

@@ -1,47 +1,56 @@
-#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 
+ * 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.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class Mod
+	{
+		public string Id;
+		public string Title;
+		public string Description;
+		public string Version;
+		public string Author;
+		public string Requires;
+
+		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)
+			{
+				var yamlPath = new[] { "mods", m, "mod.yaml" }.Aggregate( Path.Combine );
+				if (!File.Exists(yamlPath))
+					continue;
+
+				var yaml = new MiniYaml(null, MiniYaml.FromFile(yamlPath));
+				if (!yaml.NodesDict.ContainsKey("Metadata"))
+					continue;
+
+				var mod = FieldLoader.Load<Mod>(yaml.NodesDict["Metadata"]);
+				mod.Id = m;
+
+				ret.Add(m, mod);
+			}
+			return ret;
+		}
+
+		public string[] WithPrerequisites()
+		{
+			return Id.Iterate(m => AllMods[m].Requires)
+				.TakeWhile(m => m != null)
+				.ToArray();
+		}
+	}
+}

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -1,124 +1,128 @@
-<?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>
+<?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="ColorRamp.cs" />
+    <Compile Include="Evaluator.cs" />
+    <Compile Include="Exts.cs" />
+    <Compile Include="FieldLoader.cs" />
+    <Compile Include="FileFormats\AudLoader.cs" />
+    <Compile Include="FileFormats\Blast.cs" />
+    <Compile Include="FileFormats\Blowfish.cs" />
+    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
+    <Compile Include="FileFormats\Format2.cs" />
+    <Compile Include="FileFormats\Format40.cs" />
+    <Compile Include="FileFormats\Format80.cs" />
+    <Compile Include="FileFormats\IniFile.cs" />
+    <Compile Include="Filesystem\FileSystem.cs" />
+    <Compile Include="Filesystem\Folder.cs" />
+    <Compile Include="Filesystem\InstallShieldPackage.cs" />
+    <Compile Include="Filesystem\MixFile.cs" />
+    <Compile Include="Filesystem\ZipFile.cs" />
+    <Compile Include="Graphics\Dune2ShpReader.cs" />
+    <Compile Include="Graphics\IGraphicsDevice.cs" />
+    <Compile Include="Graphics\IInputHandler.cs" />
+    <Compile Include="Graphics\PngLoader.cs" />
+    <Compile Include="Graphics\ShpReader.cs" />
+    <Compile Include="Graphics\ShpWriter.cs" />
+    <Compile Include="Graphics\Vertex.cs" />
+    <Compile Include="Graphics\VqaReader.cs" />
+    <Compile Include="HttpUtil.cs" />
+    <Compile Include="InstallUtils.cs" />
+    <Compile Include="Manifest.cs" />
+    <Compile Include="Map\PlayerReference.cs" />
+    <Compile Include="Map\SmudgeReference.cs" />
+    <Compile Include="Map\Terrain.cs" />
+    <Compile Include="Map\TileReference.cs" />
+    <Compile Include="Map\TileSet.cs" />
+    <Compile Include="MiniYaml.cs" />
+    <Compile Include="Mod.cs" />
+    <Compile Include="PackageEntry.cs" />
+    <Compile Include="Palette.cs" />
+    <Compile Include="Platform.cs" />
+    <Compile Include="PlayerColorRemap.cs" />
+    <Compile Include="Primitives\ActionQueue.cs" />
+    <Compile Include="Primitives\Bits.cs" />
+    <Compile Include="Primitives\Cache.cs" />
+    <Compile Include="Primitives\Cached.cs" />
+    <Compile Include="Primitives\DisposableAction.cs" />
+    <Compile Include="Primitives\Lazy.cs" />
+    <Compile Include="Primitives\Pair.cs" />
+    <Compile Include="Primitives\PriorityQueue.cs" />
+    <Compile Include="Primitives\Set.cs" />
+    <Compile Include="Primitives\float2.cs" />
+    <Compile Include="Primitives\int2.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Support\Log.cs" />
+    <Compile Include="Support\Stopwatch.cs" />
+    <Compile Include="Support\Timer.cs" />
+    <Compile Include="Thirdparty\Random.cs" />
+    <Compile Include="TypeDictionary.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/PackageEntry.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -20,21 +20,21 @@ namespace OpenRA.FileFormats
 		public readonly uint Offset;
 		public readonly uint Length;
 
-		
+
 		public PackageEntry(uint hash, uint offset, uint length)
 		{
 			Hash = hash;
 			Offset = offset;
 			Length = length;
 		}
-		
+
 		public PackageEntry(BinaryReader r)
 		{
 			Hash = r.ReadUInt32();
 			Offset = r.ReadUInt32();
 			Length = r.ReadUInt32();
 		}
-		
+
 		public void Write(BinaryWriter w)
 		{
 			w.Write(Hash);
@@ -63,7 +63,7 @@ namespace OpenRA.FileFormats
 			MemoryStream ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
 			BinaryReader reader = new BinaryReader(ms);
 
-			int len = name.Length >> 2; 
+			int len = name.Length >> 2;
 			uint result = 0;
 
 			while (len-- != 0)
@@ -73,7 +73,7 @@ namespace OpenRA.FileFormats
 		}
 
 		static Dictionary<uint, string> Names = new Dictionary<uint,string>();
-		
+
 		public static void AddStandardName(string s)
 		{
 			uint hash = HashFilename(s);

OpenRA.FileFormats/Palette.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -9,7 +9,10 @@
 #endregion
 
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
+using System;
+using System.Reflection;
 
 namespace OpenRA.FileFormats
 {
@@ -20,26 +23,26 @@ namespace OpenRA.FileFormats
 		{
 			return Color.FromArgb((int)colors[index]);
 		}
-		
+
 		public void SetColor(int index, Color color)
 		{
 			colors[index] = (uint)color.ToArgb();
 		}
-		
+
 		public void SetColor(int index, uint color)
 		{
 			colors[index] = (uint)color;
 		}
-				
+
 		public uint[] Values
-		{			
+		{
 			get { return colors; }
 		}
 
 		public Palette(Stream s, bool remapTransparent)
 		{
 			colors = new uint[256];
-			
+
 			using (BinaryReader reader = new BinaryReader(s))
 			{
 				for (int i = 0; i < 256; i++)
@@ -66,11 +69,34 @@ namespace OpenRA.FileFormats
 			for(int i = 0; i < 256; i++)
 				colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)p.colors[i]),i).ToArgb();
 		}
-		
+
 		public Palette(Palette p)
 		{
 			colors = (uint[])p.colors.Clone();
 		}
+
+		public ColorPalette AsSystemPalette()
+		{
+			ColorPalette pal;
+			using (var b = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
+				pal = b.Palette;
+
+			for (var i = 0; i < 256; i++)
+				pal.Entries[i] = GetColor(i);
+
+			// hack around a mono bug -- the palette flags get set wrong.
+			if (Platform.CurrentPlatform != PlatformType.Windows)
+				typeof(ColorPalette).GetField("flags",
+					BindingFlags.Instance | BindingFlags.NonPublic).SetValue(pal, 1);
+
+			return pal;
+		}
+
+		public static Palette Load( string filename, bool remap )
+		{
+			using(var s = File.OpenRead(filename))
+				return new Palette(s, remap);
+		}
 	}
 
 	public interface IPaletteRemap { Color GetRemappedColor(Color original, int index);	}

OpenRA.FileFormats/Platform.cs

@@ -0,0 +1,75 @@
+#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.Diagnostics;
+using System.IO;
+using OpenRA.FileFormats;
+
+namespace OpenRA
+{
+	public enum PlatformType { Unknown, Windows, OSX, Linux }
+
+	public static class Platform
+	{
+		public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } }
+
+		static Lazy<PlatformType> currentPlatform = new Lazy<PlatformType>(GetCurrentPlatform);
+
+		static PlatformType GetCurrentPlatform()
+		{
+				if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+					return PlatformType.Windows;
+
+				try
+				{
+					var psi = new ProcessStartInfo("uname", "-s");
+					psi.UseShellExecute = false;
+					psi.RedirectStandardOutput = true;
+					var p = Process.Start(psi);
+					var kernelName = p.StandardOutput.ReadToEnd();
+					if (kernelName.Contains("Linux") || kernelName.Contains("BSD"))
+						return PlatformType.Linux;
+					if (kernelName.Contains("Darwin"))
+						return PlatformType.OSX;
+				}
+				catch {	}
+
+				return PlatformType.Unknown;
+		}
+
+		public static string SupportDir
+		{
+			get
+			{
+				var dir = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+
+				switch (CurrentPlatform)
+				{
+				case PlatformType.Windows:
+					dir += Path.DirectorySeparatorChar + "OpenRA";
+					break;
+				case PlatformType.OSX:
+					dir += "/Library/Application Support/OpenRA";
+					break;
+				case PlatformType.Linux:
+				default:
+					dir += "/.openra";
+					break;
+				}
+
+				if (!Directory.Exists(dir))
+					Directory.CreateDirectory(dir);
+
+				return dir + Path.DirectorySeparatorChar;
+			}
+		}
+	}
+}

OpenRA.FileFormats/PlayerColorRemap.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -42,11 +42,11 @@ namespace OpenRA.FileFormats
 				(int)(t * c2.G + (1 - t) * c1.G),
 				(int)(t * c2.B + (1 - t) * c1.B));
 		}
-		
+
 		public Color GetRemappedColor(Color original, int index)
 		{
 			Color c;
-			return remapColors.TryGetValue(index, out c) 
+			return remapColors.TryGetValue(index, out c)
 				? c : original;
 		}
 	}

OpenRA.FileFormats/Primitives/ActionQueue.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -18,23 +18,45 @@ namespace OpenRA.FileFormats
 	public class ActionQueue
 	{
 		object syncRoot = new object();
-		Action actions = () => { };
+		PriorityQueue<DelayedAction> actions = new PriorityQueue<DelayedAction>();
 
-		public void Add(Action a)
+		public void Add(Action a) { Add(a, 0); }
+		public void Add(Action a, int delay)
 		{
 			lock (syncRoot)
-				actions += a;
+				actions.Add(new DelayedAction(a, Environment.TickCount + delay));
 		}
 
 		public void PerformActions()
 		{
-			Action a;
+			Action a = () => {};
 			lock (syncRoot)
 			{
-				a = actions; 
-				actions = () => { };
+				var t = Environment.TickCount;
+				while (!actions.Empty && actions.Peek().Time <= t)
+				{
+					var da = actions.Pop();
+					a += da.Action;
+				}
 			}
 			a();
 		}
 	}
+
+	struct DelayedAction : IComparable<DelayedAction>
+	{
+		public int Time;
+		public Action Action;
+
+		public DelayedAction(Action action, int time)
+		{
+			Action = action;
+			Time = time;
+		}
+
+		public int CompareTo(DelayedAction other)
+		{
+			return Math.Sign(Time - other.Time);
+		}
+	}
 }

OpenRA.FileFormats/Primitives/Bits.cs

@@ -0,0 +1,65 @@
+#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.FileFormats
+{
+	static class BitAllocator<T> where T : struct
+	{
+		static int nextVal = 1;
+		static Cache<string,int> bits;
+
+		static BitAllocator() {	bits = new Cache<string, int>( _ => Allocate() ); }
+
+		static int Allocate()
+		{
+			if (nextVal == 0)
+				throw new InvalidOperationException(
+					"Too many values in BitAllocator<{0}>".F(typeof(T).Name));
+
+			var val = nextVal;
+			nextVal <<= 1;
+			return val;
+		}
+
+		public static int GetValue(string[] val)
+		{
+			return val.Select( a => bits[a] ).Aggregate( 0, (a,b) => a | b );
+		}
+
+		public static IEnumerable<string> GetStrings(int val)
+		{
+			for( var i = 0; i < 32; i++ )
+			{
+				var x = 1 << i;
+				if ((val & x) != 0)
+					yield return bits.Single( a => a.Value == x ).Key;
+			}
+		}
+	}
+
+	public struct Bits<T> where T : struct
+	{
+		public int Value;
+
+		public Bits(string[] val) { Value = BitAllocator<T>.GetValue(val); }
+		public Bits(Bits<T> other) { Value = other.Value; }
+
+		public override string ToString()
+		{
+			return string.Join(",", BitAllocator<T>.GetStrings(Value).ToArray());
+		}
+
+		public override int GetHashCode() { return Value.GetHashCode(); }
+	}
+}

OpenRA.FileFormats/Primitives/Cache.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -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/Cached.cs

@@ -0,0 +1,55 @@
+#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 OpenRA.FileFormats
+{
+	public class Cached<T>
+	{
+		Func<T> p;
+		T value;
+		bool hasValue;
+
+		public Cached(Func<T> p)
+		{
+			if (p == null)
+				throw new ArgumentNullException();
+
+			this.p = p;
+		}
+
+		public T Value
+		{
+			get
+			{
+				if (hasValue)
+					return value;
+
+				value = p();
+				hasValue = true;
+				return value;
+			}
+		}
+
+		public T Force() { return Value; }
+
+		public void Invalidate()
+		{
+			hasValue = false;
+		}
+	}
+
+	public static class Cached
+	{
+		public static Cached<T> New<T>(Func<T> p) { return new Cached<T>(p); }
+	}
+}
+

OpenRA.FileFormats/Primitives/DisposableAction.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/Primitives/Lazy.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -36,12 +36,9 @@ namespace OpenRA.FileFormats
 				p = null;
 				return value;
 			}
-		}
-
-        public void Force()
-        {
-            var ignored = Value;
-        }
+		}
+
+		public T Force() { return Value; }
 	}
 
 	public static class Lazy

OpenRA.FileFormats/Primitives/Pair.cs

@@ -1,15 +1,15 @@
 #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 
+ * 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;
+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/PriorityQueue.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -62,6 +62,7 @@ namespace OpenRA.FileFormats
 			return At(lastLevel, lastIndex);
 		}
 
+		public T Peek() { return At(0,0); }
 		public T Pop()
 		{
 			if (level == 0 && index == 0)

OpenRA.FileFormats/Primitives/Set.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/Primitives/float2.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/Primitives/int2.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -56,7 +56,7 @@ namespace OpenRA
 		public float2 ToFloat2() { return new float2(X, Y); }
 
 		public override string ToString() { return string.Format("{0},{1}", X, Y); }
-		
+
 		// Change endianness of a uint32
 		public static uint Swap(uint orig)
 		{
@@ -72,13 +72,13 @@ namespace OpenRA
 		{
 			return a + ( b - a ) * mul / div;
 		}
-		
+
 		public int2 Clamp(Rectangle r)
 		{
 			return new int2(Math.Min(r.Right, Math.Max(X, r.Left)),
 			                Math.Min(r.Bottom, Math.Max(Y, r.Top)));
 		}
-		
+
 		public static int Dot(int2 a, int2 b) { return a.X * b.X + a.Y * b.Y; }
 
 	}

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

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -33,34 +33,39 @@ namespace OpenRA
 			get { return LogPathPrefix; }
 			set
 			{
-				LogPathPrefix = value;				
-				if (!Directory.Exists(LogPathPrefix))
-					Directory.CreateDirectory(LogPathPrefix);
+				LogPathPrefix = value;
+				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.FileFormats/Support/Stopwatch.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/Support/Timer.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.FileFormats/Thirdparty/Random.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -18,11 +18,11 @@ namespace OpenRA.Thirdparty
 	{
 		uint[] mt = new uint[624];
 		int index = 0;
-		
+
 		public int Last;
 
 		public Random() : this(Environment.TickCount) { }
-		
+
 		public Random(int seed)
 		{
 			mt[0] = (uint)seed;

OpenRA.FileFormats/TypeDictionary.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.

OpenRA.Game/Actor.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -13,9 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.Support;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA
 {
@@ -26,12 +24,30 @@ namespace OpenRA
 		public readonly World World;
 		public readonly uint ActorID;
 
-		public int2 Location { get { return Trait<IOccupySpace>().TopLeft; } }
-		public int2 CenterLocation { get { return Trait<IHasLocation>().PxPosition; } }
+		Lazy<IOccupySpace> occupySpace;
+		IHasLocation HasLocation;
+		Lazy<IMove> Move;
+		public Cached<Rectangle> Bounds;
+		public Cached<Rectangle> ExtendedBounds;
+
+		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
+
+		public int2 Location { get { return occupySpace.Value.TopLeft; } }
+
+		public int2 CenterLocation
+		{
+			get
+			{
+				if (HasLocation == null)
+					HasLocation = Trait<IHasLocation>();
+				return HasLocation.PxPosition;
+			}
+		}
+
 		[Sync]
 		public Player Owner;
 
-		private IActivity currentActivity;
+		Activity currentActivity;
 		public Group Group;
 
 		internal Actor(World world, string name, TypeDictionary initDict )
@@ -43,6 +59,8 @@ namespace OpenRA
 			if( initDict.Contains<OwnerInit>() )
 				Owner = init.Get<OwnerInit,Player>();
 
+			occupySpace = Lazy.New( () => TraitOrDefault<IOccupySpace>() );
+
 			if (name != null)
 			{
 				if (!Rules.Info.ContainsKey(name.ToLowerInvariant()))
@@ -53,27 +71,31 @@ namespace OpenRA
 					AddTrait(trait.Create(init));
 			}
 
+			Move = Lazy.New( () => TraitOrDefault<IMove>() );
+
 			Size = Lazy.New(() =>
 			{
 				var si = Info.Traits.GetOrDefault<SelectableInfo>();
 				if (si != null && si.Bounds != null)
-					return new float2(si.Bounds[0], si.Bounds[1]);
+					return new int2(si.Bounds[0], si.Bounds[1]);
 
 				// auto size from render
 				var firstSprite = TraitsImplementing<IRender>().SelectMany(ApplyIRender).FirstOrDefault();
-				if (firstSprite.Sprite == null) return float2.Zero;
-                return firstSprite.Sprite.size * firstSprite.Scale;
+				if (firstSprite.Sprite == null) return int2.Zero;
+                return (firstSprite.Sprite.size * firstSprite.Scale).ToInt2();
 			});
 
-			ApplyIRender = x => x.Render(this);
+			ApplyIRender = x => x.Render(this);
 			ApplyRenderModifier = (m, p) => p.ModifyRender(this, m);
+
+			Bounds = Cached.New( () => CalculateBounds(false) );
+			ExtendedBounds = Cached.New( () => CalculateBounds(true) );
 		}
 
 		public void Tick()
 		{
-			if (currentActivity == null)
-				foreach (var ni in TraitsImplementing<INotifyIdle>())
-					ni.TickIdle(this);
+			Bounds.Invalidate();
+			ExtendedBounds.Invalidate();
 
 			currentActivity = Util.RunActivity( this, currentActivity );
 		}
@@ -83,52 +105,55 @@ 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<int2> 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);
 		}
-		
+
 		// When useAltitude = true, the bounding box is extended
 		// vertically to altitude = 0 to support FindUnitsInCircle queries
 		// When false, the bounding box is given for the actor
 		// at its current altitude
-		public RectangleF GetBounds(bool useAltitude)
+		Rectangle CalculateBounds(bool useAltitude)
 		{
 			var size = Size.Value;
-			var loc = CenterLocation - 0.5f * size;
-			
+			var loc = CenterLocation - size / 2;
+
 			var si = Info.Traits.GetOrDefault<SelectableInfo>();
 			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
-				loc += new float2(si.Bounds[2], si.Bounds[3]);
+			{
+				loc.X += si.Bounds[2];
+				loc.Y += si.Bounds[3];
+			}
 
-			var move = TraitOrDefault<IMove>();
+			var move = Move.Value;
 			if (move != null)
 			{
-				loc -= new float2(0, move.Altitude);
+				loc.Y -= move.Altitude;
 				if (useAltitude)
-					size = new float2(size.X, size.Y + move.Altitude);
+					size = new int2(size.X, size.Y + move.Altitude);
 			}
-		
-			return new RectangleF(loc.X, loc.Y, size.X, size.Y);
+
+			return new Rectangle(loc.X, loc.Y, size.X, size.Y);
 		}
 
 		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 +167,7 @@ namespace OpenRA
 				currentActivity.Cancel( this );
 		}
 
-		public IActivity GetCurrentActivity()
+		public Activity GetCurrentActivity()
 		{
 			return currentActivity;
 		}

OpenRA.Game/ActorInitializer.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -17,6 +17,7 @@ namespace OpenRA
 	{
 		public readonly Actor self;
 		public World world { get { return self.World; } }
+
 		internal TypeDictionary dict;
 
 		public ActorInitializer( Actor actor, TypeDictionary dict )
@@ -25,101 +26,67 @@ namespace OpenRA
 			this.dict = dict;
 		}
 
-		public T Get<T>()
-			where T : IActorInit
-		{
-			return dict.Get<T>();
-		}
-
-		public U Get<T,U>()
-			where T : IActorInit<U>
-		{
-			return dict.Get<T>().Value( world );
-		}
-		
-		public bool Contains<T>()
-			where T : IActorInit
-		{
-			return dict.Contains<T>();
-		}
+		public T Get<T>() where T : IActorInit { return dict.Get<T>(); }
+		public U Get<T,U>()	where T : IActorInit<U> { return dict.Get<T>().Value( world ); }
+		public bool Contains<T>() where T : IActorInit { return dict.Contains<T>(); }
 	}
-	
+
 	public interface IActorInit {}
 
 	public interface IActorInit<T> : IActorInit
 	{
 		T Value( World world );
 	}
-	
+
 	public class FacingInit : IActorInit<int>
 	{
-		[FieldFromYamlKey]
-		public readonly int value = 128;
-		
+		[FieldFromYamlKey] public readonly int value = 128;
 		public FacingInit() { }
-		
-		public FacingInit( int init )
-		{
-			value = init;
-		}
-		
-		public int Value( World world )
-		{
-			return value;	
-		}
+		public FacingInit( int init ) { value = init; }
+		public int Value( World world ) { return value; }
 	}
-	
+
+	public class TurretFacingInit : IActorInit<int>
+	{
+		[FieldFromYamlKey] public readonly int value = 128;
+		public TurretFacingInit() { }
+		public TurretFacingInit( int init ) { value = init; }
+		public int Value( World world ) { return value; }
+	}
+
 	public class AltitudeInit : IActorInit<int>
 	{
-		[FieldFromYamlKey]
-		public readonly int value = 0;
-		
+		[FieldFromYamlKey] public readonly int value = 0;
 		public AltitudeInit() { }
-		
-		public AltitudeInit( int init )
-		{
-			value = init;
-		}
-		
-		public int Value( World world )
-		{
-			return value;	
-		}
+		public AltitudeInit( int init ) { value = init; }
+		public int Value( World world ) { return value; }
 	}
 
 	public class LocationInit : IActorInit<int2>
 	{
-		[FieldFromYamlKey]
-		public readonly int2 value = int2.Zero;
-
+		[FieldFromYamlKey] public readonly int2 value = int2.Zero;
 		public LocationInit() { }
+		public LocationInit( int2 init ) { value = init; }
+		public int2 Value( World world ) { return value; }
+	}
 
-		public LocationInit( int2 init )
-		{
-			value = init;
-		}
-
-		public int2 Value( World world )
-		{
-			return value;
-		}
+	public class CenterLocationInit : IActorInit<int2>
+	{
+		[FieldFromYamlKey] public readonly int2 value = int2.Zero;
+		public CenterLocationInit() { }
+		public CenterLocationInit( int2 init ) { value = init; }
+		public int2 Value( World world ) { return value; }
 	}
 
 	public class OwnerInit : IActorInit<Player>
 	{
-		[FieldFromYamlKey]
-		public readonly string PlayerName = "Neutral";
+		[FieldFromYamlKey] public readonly string PlayerName = "Neutral";
 		Player player;
 
 		public OwnerInit() { }
+		public OwnerInit( string playerName ) { this.PlayerName = playerName; }
 
-		public OwnerInit( string playerName )
-		{
-			this.PlayerName = playerName;
-		}
-
-		public OwnerInit( Player player )
-		{
+		public OwnerInit( Player player ) {
 			this.player = player;
 			this.PlayerName = player.InternalName;
 		}
@@ -128,7 +95,7 @@ namespace OpenRA
 		{
 			if( player != null )
 				return player;
-			return world.players.Values.First( x => x.InternalName == PlayerName );
+			return world.Players.First( x => x.InternalName == PlayerName );
 		}
 	}
 }

OpenRA.Game/ActorMap.cs

@@ -1,27 +1,22 @@
 #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 
+ * 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.Diagnostics;
 using System.Linq;
-using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA
 {
-	public class UnitInfluenceInfo : ITraitInfo
-	{
-		public object Create( ActorInitializer init ) { return new UnitInfluence( init.world ); }
-	}
+	public enum SubCell { FullCell, TopLeft, TopRight, Center, BottomLeft, BottomRight }
 
-	public class UnitInfluence
+	public class ActorMap
 	{
 		class InfluenceNode
 		{
@@ -29,17 +24,17 @@ namespace OpenRA.Traits
 			public SubCell subCell;
 			public Actor actor;
 		}
-	
+
 		InfluenceNode[,] influence;
 		Map map;
 
-		public UnitInfluence( World world )
+		public ActorMap( World world )
 		{
 			map = world.Map;
 			influence = new InfluenceNode[world.Map.MapSize.X, world.Map.MapSize.Y];
 
-			world.ActorAdded += a => Add( a, a.TraitOrDefault<IOccupySpace>() );
-			world.ActorRemoved += a => Remove( a, a.TraitOrDefault<IOccupySpace>() );
+			world.ActorAdded += a => Add( a, a.OccupiesSpace );
+			world.ActorRemoved += a => Remove( a, a.OccupiesSpace );
 		}
 
 		public IEnumerable<Actor> GetUnitsAt( int2 a )
@@ -50,7 +45,7 @@ namespace OpenRA.Traits
 				if (!i.actor.Destroyed)
 					yield return i.actor;
 		}
-		
+
 		public IEnumerable<Actor> GetUnitsAt( int2 a, SubCell sub )
 		{
 			if (!map.IsInMap(a)) yield break;
@@ -59,23 +54,23 @@ namespace OpenRA.Traits
 				if (!i.actor.Destroyed && (i.subCell == sub || i.subCell == SubCell.FullCell))
 					yield return i.actor;
 		}
-		
+
 		public bool HasFreeSubCell(int2 a)
 		{
 			if (!AnyUnitsAt(a))
 				return true;
-			
-			return new[]{SubCell.TopLeft, SubCell.TopRight, SubCell.Center,
-				SubCell.BottomLeft, SubCell.BottomRight}.Any(b => !AnyUnitsAt(a,b));
+
+			return new[]{ SubCell.TopLeft, SubCell.TopRight, SubCell.Center,
+				SubCell.BottomLeft, SubCell.BottomRight }.Any(b => !AnyUnitsAt(a,b));
 		}
 
 		public bool AnyUnitsAt(int2 a)
 		{
 			return influence[ a.X, a.Y ] != null;
 		}
-		
+
 		public bool AnyUnitsAt(int2 a, SubCell sub)
-		{		
+		{
 			for( var i = influence[ a.X, a.Y ] ; i != null ; i = i.next )
 				if (i.subCell == sub || i.subCell == SubCell.FullCell)
 					return true;

OpenRA.Game/ActorReference.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -10,7 +10,6 @@
 
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 
 namespace OpenRA.FileFormats
 {