Set Allied units to defensive stance in Allies 01

typo leading to a crash when clicking a disabled tab

.gitignore

@@ -7,8 +7,12 @@ obj
 *.suo
 *.user
 *.sln.cache
+*.manifest
 mods/*/*.dll
 
+# ReSharper crap
+_ReSharper.*/
+
 # Red Alert binary files
 mods/*/packages/*.[mM][iI][xX]
 
@@ -21,6 +25,8 @@ mods/*/packages/*.[mM][iI][xX]
 # backup files by various editors
 *~
 *.orig
+\#*
+.*.sw?
 # dependency DLLs (different for every platform!)
 cg.dll
 cgGL.dll
@@ -31,8 +37,6 @@ cgGL.dll
 *.pidb
 *.userprefs
 
-packaging/windows/*.exe
-
 # osx crap
 .DS_Store
 
@@ -51,7 +55,6 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 *.config
 *.resources
 
-# other crap
-Logs/
-Replays/
-settings.yaml
+# KDE crap
+*.kate-swp
+*.directory

AUTHORS

@@ -1,13 +1,39 @@
-AUTHORS
-
-The OpenRA developers are:
-	* Chris Forbes
-	* Robert Pepperell
-	* Matthew Bowra-Dean
-	* Paul Chote
-	* Alli Witheford
-	* Joakim Lindberg
-	* Andrew Riedi
-	* Tim Mylemans
-	* Curtis Shmyr
-	* Caleb Anderson
+AUTHORS
+
+The OpenRA developers are:
+	* Alli Witheford	(alzeih)
+	* Caleb Anderson	(RobotCaleb)
+	* Chris Forbes		(chrisf)
+	* Curtis Shmyr		(hamb)
+	* Daniel Hernandez	(Mancano)
+	* Matthew Bowra-Dean	(beedee)
+	* Mike Bundy		(kehaar)
+
+Also thanks to:
+	* Akseli Virtanen       (RAGEQUIT)
+	* Andrew Riedi
+	* Barnaby Smith		(mvi)
+	* Bellator
+	* Christer Ulfsparre	(Holloweye)
+	* Erasmus Schroder	(rasco)
+	* Igor Popov		(ihptru)
+	* James Dunne		(jsd)
+	* Jeff Harris		(jeff_1amstudios)
+	* Joakim Lindberg	(booom3)
+	* Kenny Hoxworth	(hoxworth)
+	* Lawrence Wang
+	* Mark Olson		(markolson)
+	* Matthew Gatland	(mgatland)
+	* Matthias Mailänder	(Mailaender)
+	* Max Ugrumov		(katzsmile)
+	* Max621
+	* Nukem
+	* Paolo Chiodi		(paolochiodi)
+	* Paul Dovydaitis	(pdovy)
+	* Raymond Martineau	(mart0258)
+	* Riderr3
+	* Tim Mylemans		(gecko)
+
+Past developers included:
+	* Paul Chote		(pchote)
+	* Robert Pepperell	(ytinasni)

CHANGELOG

@@ -1,4 +1,246 @@
 NEW:
+	Engine:
+		General performance improvements
+		Fixed minimap export breaking subsequent actions in the editor
+		Added owner chooser for new actors in the editor
+		Added actor info panel in the editor (doubleclick)
+		Added a Setup Default Players menu item to map editor
+	Both Mods:
+		Server lobbies upon creation use the previously played map
+		Added support for a Game.ConnectTo argument which allows clients to direct connect to a server when game is launched
+		Helicopters now bob slightly in flight
+		Bots now repair their own buildings
+		Fixed a bug where bots would be unable to set rallypoints for production buildings
+		Bots now maintain a level of aggro on enemy units
+		Made SpawnMPUnits' initial unit configurable
+		Added a dropdown list in the map editor for setting an actor's owner upon placement
+		Replaced the server browser with a new and awesome one
+		Fixed a bug where infantry squish sounds weren't positioned
+		Fixed a bug where actor priority wasn't correct for doubleclick
+
+	Red Alert:
+		Fixed a crash which occurred when playing an online game with Hard AI
+		Fixed a bug where planes could stack more than 1-per-airfield
+		Fixed a bug where planes would not rearm at airfields
+		Improved logic for sending planes and helicopters back to base
+		Changed MIG to fire 2 missiles per burst instead of 4
+		Changed HELI (longbow) to fire missiles in bursts of 2
+		Added a Show Shellmap setting
+		Changed team color picker to match C&C's
+		Fixed a bug where infantry could not pass over anti-tank mines, and vice versa
+		Fixed a bug where the shellmap would reload unnecessarily when disconnecting from a lobby that hasn't started
+		Added AutoTarget capability to submarines, but they are set to HoldFire stance by default
+		New Map: Bombardment Islands (Sprog)
+		New Map: Engagement (Nukem)
+		New Map: Man to Man (Nukem)
+		New Map: Asymetric Battle (Seru)
+	C&C:
+		Changed the bot spawn picker to match RA's
+		Reduced delay of tooltips
+
+20111013:
+	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
+		Added --tmp-png cmdlet in Utility, to convert terrain to PNG.
+	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
+		Added internal machinery for IFV-style units
+	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
+		Changed AI behavior -- now has Easy/Normal/Hard difficulty
+		Increased range of FTUR by 1
+		Reduced cost of MEDI from 500 to 300
+		Reduced cost of SHOK from 800 to 500
+		Heavy vehicles (Tanks, Harvesters, MCV) now crush infantry
+		New map: Classic DropZone (Holloweye)
+		New map: DropZone Battle of Tikiaki (Knivesron)
+		New map: DropZone W (Riderr3)
+		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: Chokepoint (Nukem)
+		New map: HotZone (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: Mad Scramble (Bellator)
+		New map: Free Coasts (Ihptru)
+		New map: Battle Lake (Bellator)
+	C&C:
+		Slightly increased Tiberium growth rate
+		Increased harvester unload time
+		Reduced Tiberium value by 20%
+		Changed FTNK armor type to Light
+		Fixed tank squish animations to show properly
+		New map: Tiberium Oasis (Bellator)
+
+
+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
@@ -16,27 +258,25 @@ NEW:
 		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
-		Capturable/repairable unit husks with an engineer
-	
 	RA:
-		Fix several bugs related to GPS
 		New unit: Supply truck for donating funds to another player
 		Pilots (sometimes) parachute from shot down planes
 		Bounties on killed units
 		Use RA2 style missile trails
+		New GPS logic
 		New map: Pressure by seru
-		
 	Packaging:
-		Fix several Utility crashes
 		Utility writes a log to support dir when crashing
-		Fix incorrect ownership of files in deb package
+		Support for Ubuntu 11.04
+		Fix osx crash when run from a path with spaces
 
 20110320
 	Engine:
@@ -641,4 +881,4 @@ NEW:
     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,62 +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;
-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>

INSTALL

@@ -22,7 +22,7 @@ WINDOWS:
 * Cg Toolkit >= 2.2
 	(http://developer.download.nvidia.com/cg/Cg_2.2/Cg-2.2_October2009_Setup.exe)
 
-To compile OpenRA, open the OpenRA.sln solution in the main folder, 
+To compile OpenRA, open the OpenRA.sln solution in the main folder,
 or build it from the command-line with MSBuild.
 
 Run the game with `OpenRA.Game.exe Game.Mods=ra` for Red Alert
@@ -37,28 +37,30 @@ UBUNTU (substitute comparable packages for other linux distros):
 * libmono-winforms2.0-cil
 * libopenal1
 * libsdl1.2-dev
-* nvidia-cg-toolkit (download the latest version from
-  http://developer.nvidia.com/object/cg_download.html)
+* nvidia-cg-toolkit (for Cg renderer)
 
-OpenRA is incompatible with Compiz, please disable desktop effects when trying
-to run OpenRA or the game will crash.
+OpenRA does not work with some older versions of Compiz. On affected systems, disable desktop effects before playing. This is fixed in Ubuntu Natty and later.
 
-You will additionally need to copy the third party dependencies (.dll and .config) from the
-thirdparty and thirdparty/Tao directories into the game root:
-
-	cp -v thirdparty/*.dll thirdparty/Tao/* .
-
-Alternatively, the dlls can be installed into your system GAC. This is not
+The following dlls can also be installed into your system GAC. This is not
 recommended because we ship a custom Tao.FreeType that can conflict with
 other applications that use Tao:
 
-	gacutil -i thirdparty/Tao/Tao.Cg.dll
-	gacutil -i thirdparty/Tao/Tao.OpenGl.dll
-	gacutil -i thirdparty/Tao/Tao.OpenAl.dll
-	gacutil -i thirdparty/Tao/Tao.Sdl.dll
-	gacutil -i thirdparty/Tao/Tao.FreeType.dll
-	gacutil -i thirdparty/ICSharpCode.SharpZipLib.dll
+	gacutil -i Tao.Cg.dll
+	gacutil -i Tao.OpenGl.dll
+	gacutil -i Tao.OpenAl.dll
+	gacutil -i Tao.Sdl.dll
+	gacutil -i Tao.FreeType.dll
+	gacutil -i ICSharpCode.SharpZipLib.dll
 
 To compile OpenRA, run `make' from the command line.
+To install run 'make install'.
 Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert
 or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
+
+SLACKWARE:
+
+The following packages from slackbuilds.org are required, on 13.37 32bit:
+* libgdiplus
+* mono
+* openAL
+* nvidia-cg-toolkit (for Cg renderer)

Makefile

@@ -5,27 +5,26 @@ COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll third
 PHONY		= core tools package all mods clean distclean
 
 .SUFFIXES:
-core: game renderers mod_ra mod_cnc utility
-tools: editor ralint seqed filex tsbuild
-package: fixheader core editor
-mods: mod_ra mod_cnc
+core: game renderers mods utility tsbuild
+tools: editor ralint tsbuild
+package: core editor
+mods: mod_ra mod_cnc mod_d2k
 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,82 @@ 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
+
+# Dune 2000
+mod_d2k_SRCS		:= $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
+mod_d2k_TARGET		= mods/d2k/OpenRA.Mods.D2k.dll
+mod_d2k_KIND		= library
+mod_d2k_DEPS		= $(STD_MOD_DEPS) $(mod_ra_TARGET) $(mod_cnc_TARGET) $(utility_TARGET)
+mod_d2k_LIBS		= $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET) $(utility_TARGET)
+mod_d2k_EXTRA_CMDS	= mono --debug RALint.exe d2k
+PROGRAMS 		+= mod_d2k
+mod_d2k: $(mod_d2k_TARGET)
 
 #
 # 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,45 +127,40 @@ 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_TARGET		= TilesetBuilder.exe
+tsbuild_SRCS		:= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_TARGET		= OpenRA.TilesetBuilder.exe
 tsbuild_KIND		= winexe
 tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
 tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
-tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
+tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.frmBuilder.resources -resource:OpenRA.TilesetBuilder.frmNew.resources -resource:OpenRA.TilesetBuilder.Surface.resources
 PROGRAMS 			+= tsbuild
-OpenRA.TilesetBuilder.Form1.resources:
-	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
-tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
+OpenRA.TilesetBuilder.frmBuilder.resources:
+	resgen2 OpenRA.TilesetBuilder/frmBuilder.resx OpenRA.TilesetBuilder.frmBuilder.resources 1> /dev/null
+OpenRA.TilesetBuilder.frmNew.resources:
+	resgen2 OpenRA.TilesetBuilder/frmNew.resx OpenRA.TilesetBuilder.frmNew.resources 1> /dev/null
+OpenRA.TilesetBuilder.Surface.resources:
+	resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null
+tsbuild: OpenRA.TilesetBuilder.frmBuilder.resources OpenRA.TilesetBuilder.frmNew.resources OpenRA.TilesetBuilder.Surface.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 +175,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,8 +183,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))))
@@ -189,15 +194,15 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 #
 # Install / Uninstall for *nix
 #
-prefix = /usr/local
-datarootdir = $(prefix)/share
-datadir = $(datarootdir)
-bindir = $(prefix)/bin
+prefix ?= /usr/local
+datarootdir ?= $(prefix)/share
+datadir ?= $(datarootdir)
+bindir ?= $(prefix)/bin
 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 tsbuild
 
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
@@ -205,6 +210,10 @@ install: all
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
 	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) $(INSTALL_DIR)/mods/cnc
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/d2k
+	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) $(INSTALL_DIR)/mods/d2k
 
 	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
@@ -214,8 +223,6 @@ install: all
 	@cp -r mods/cnc/sequences $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/tilesets $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/uibits $(INSTALL_DIR)/mods/cnc
-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
-	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(INSTALL_DIR)/mods/ra
 
 	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
@@ -224,20 +231,34 @@ install: all
 	@cp -r mods/ra/rules $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/tilesets $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/uibits $(INSTALL_DIR)/mods/ra
+	
+	@-cp $(foreach f,$(shell ls mods/d2k --hide=*.dll),mods/d2k/$(f)) $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/maps $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/bits $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/chrome $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/rules $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/tilesets $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/uibits $(INSTALL_DIR)/mods/d2k
 
 	@cp -r glsl $(INSTALL_DIR)
 	@cp -r cg $(INSTALL_DIR)
 	@cp *.ttf $(INSTALL_DIR)
-	@cp --parents -r thirdparty/Tao $(INSTALL_DIR)
+	@cp thirdparty/Tao/* $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
 
 	@echo "#!/bin/sh" > openra
 	@echo "cd "$(datadir)"/openra" >> openra
-	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=~/.openra \"$$""@\"" >> openra
+	@echo "exec mono "$(datadir)"/openra/OpenRA.Game.exe \"$$""@\"" >> openra
+
+	@echo "#!/bin/sh" > openra-editor
+	@echo "cd "$(datadir)"/openra" >> openra-editor
+	@echo "exec mono "$(datadir)"/openra/OpenRA.Editor.exe \"$$""@\"" >> openra-editor
 
 	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
+	@$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR)
 
 uninstall:
 	@-rm -r $(INSTALL_DIR)
 	@-rm $(DESTDIR)$(bindir)/openra
+	@-rm $(DESTDIR)$(bindir)/openra-editor

OpenRA.Editor/ActorPropertiesDialog.Designer.cs

@@ -1,16 +1,6 @@
-#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 SequenceEditor
+namespace OpenRA.Editor
 {
-	partial class GetTextForm
+	partial class ActorPropertiesDialog
 	{
 		/// <summary>
 		/// Required designer variable.
@@ -38,67 +28,65 @@ namespace SequenceEditor
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.textBox1 = new System.Windows.Forms.TextBox();
 			this.button1 = new System.Windows.Forms.Button();
 			this.button2 = new System.Windows.Forms.Button();
+			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
 			this.SuspendLayout();
 			// 
-			// textBox1
-			// 
-			this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.textBox1.Location = new System.Drawing.Point(13, 13);
-			this.textBox1.Name = "textBox1";
-			this.textBox1.Size = new System.Drawing.Size(337, 20);
-			this.textBox1.TabIndex = 0;
-			// 
 			// 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.OK;
-			this.button1.Location = new System.Drawing.Point(194, 50);
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(226, 333);
 			this.button1.Name = "button1";
 			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 1;
-			this.button1.Text = "OK";
+			this.button1.TabIndex = 0;
+			this.button1.Text = "Cancel";
 			this.button1.UseVisualStyleBackColor = true;
 			// 
 			// 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.Cancel;
-			this.button2.Location = new System.Drawing.Point(275, 50);
+			this.button2.Enabled = false;
+			this.button2.Location = new System.Drawing.Point(145, 333);
 			this.button2.Name = "button2";
 			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 2;
-			this.button2.Text = "Cancel";
+			this.button2.TabIndex = 0;
+			this.button2.Text = "OK";
 			this.button2.UseVisualStyleBackColor = true;
 			// 
-			// GetTextForm
+			// flowLayoutPanel1
 			// 
-			this.AcceptButton = this.button1;
+			this.flowLayoutPanel1.AutoScroll = true;
+			this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.flowLayoutPanel1.Location = new System.Drawing.Point(13, 13);
+			this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+			this.flowLayoutPanel1.Size = new System.Drawing.Size(288, 314);
+			this.flowLayoutPanel1.TabIndex = 1;
+			// 
+			// ActorPropertiesDialog
+			// 
+			this.AcceptButton = this.button2;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button2;
-			this.ClientSize = new System.Drawing.Size(362, 85);
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(313, 368);
+			this.Controls.Add(this.flowLayoutPanel1);
 			this.Controls.Add(this.button2);
 			this.Controls.Add(this.button1);
-			this.Controls.Add(this.textBox1);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
-			this.Name = "GetTextForm";
+			this.Name = "ActorPropertiesDialog";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Placeholder";
+			this.Text = "Actor Properties";
 			this.ResumeLayout(false);
-			this.PerformLayout();
 
 		}
 
 		#endregion
 
-		private System.Windows.Forms.TextBox textBox1;
 		private System.Windows.Forms.Button button1;
 		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
 	}
 }

OpenRA.Editor/ActorPropertiesDialog.cs

@@ -0,0 +1,49 @@
+#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.Drawing;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+
+namespace OpenRA.Editor
+{
+	public partial class ActorPropertiesDialog : Form
+	{
+		public ActorPropertiesDialog()
+		{
+			InitializeComponent();
+		}
+
+		public void AddRow(string name, Control c)
+		{
+			flowLayoutPanel1.Controls.Add(new Label
+			{
+				Text = name,
+				Width = flowLayoutPanel1.Width * 3 / 10,
+				Height = 25,
+				TextAlign = ContentAlignment.MiddleLeft,
+			});
+
+			c.Width = flowLayoutPanel1.Width * 6 / 10 - 25;
+			c.Height = 25;
+			flowLayoutPanel1.Controls.Add(c);
+		}
+
+		public Control MakeEditorControl(Type t, Func<object> getter, Action<object> setter)
+		{
+			var r = new TextBox();
+			r.Text = FieldSaver.FormatValue(getter(), t);
+			r.LostFocus += (e,_) => setter(FieldLoader.GetValue("<editor internals>", t, r.Text));
+			r.Enabled = false;
+			return r;
+		}
+	}
+}

OpenRA.Editor/ActorPropertiesDialog.resx

@@ -1,117 +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.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: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" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </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" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </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/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,10 +22,8 @@ namespace OpenRA.Editor
 
 		public void Preview(Surface surface, SGraphics g)
 		{
-			/* todo: include the player 
-				* in the brush so we can color new buildings too */
-
-			surface.DrawActor(g, surface.GetBrushLocation(), Actor, null);
+			surface.DrawActor(g, surface.GetBrushLocation(), Actor,
+				surface.GetPaletteForPlayer(surface.NewActorOwner));
 		}
 
 		public void Apply(Surface surface)
@@ -33,7 +31,7 @@ namespace OpenRA.Editor
 			if (surface.Map.Actors.Value.Any(a => a.Value.Location() == surface.GetBrushLocation()))
 				return;
 
-			var owner = "Neutral";
+			var owner = surface.NewActorOwner;
 			var id = NextActorName(surface);
 			surface.Map.Actors.Value[id] = new ActorReference(Actor.Info.Name.ToLowerInvariant())
 			{

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.
@@ -26,8 +26,8 @@ namespace OpenRA.Editor
 		public void Apply(Surface surface)
 		{
 			// change the bits in the map
-			var tile = surface.TileSet.Tiles[Brush.N];
 			var template = surface.TileSet.Templates[Brush.N];
+			var tile = template.Data;
 			var pos = surface.GetBrushLocation();
 
 			if (surface.GetModifiers() == Keys.Shift)
@@ -39,7 +39,7 @@ namespace OpenRA.Editor
 			for (var u = 0; u < template.Size.X; u++)
 				for (var v = 0; v < template.Size.Y; v++)
 				{
-					if (surface.Map.IsInMap(new int2(u, v) + pos))
+					if (surface.Map.IsInMap(new CVec(u, v) + pos))
 					{
 						var z = u + v * template.Size.X;
 						if (tile.TileBitmapBytes[z] != null)
@@ -69,17 +69,17 @@ namespace OpenRA.Editor
 					Brush.Bitmap.Height * surface.Zoom);
 		}
 
-		void FloodFillWithBrush(Surface s, int2 pos)
+		void FloodFillWithBrush(Surface s, CPos pos)
 		{
-			var queue = new Queue<int2>();
+			var queue = new Queue<CPos>();
 			var replace = s.Map.MapTiles.Value[pos.X, pos.Y];
 			var touched = new bool[s.Map.MapSize.X, s.Map.MapSize.Y];
 
-			Action<int, int> MaybeEnqueue = (x, y) =>
+			Action<int, int> maybeEnqueue = (x, y) =>
 			{
 				if (s.Map.IsInMap(x, y) && !touched[x, y])
 				{
-					queue.Enqueue(new int2(x, y));
+					queue.Enqueue(new CPos(x, y));
 					touched[x, y] = true;
 				}
 			};
@@ -91,16 +91,16 @@ namespace OpenRA.Editor
 				if (!s.Map.MapTiles.Value[p.X, p.Y].Equals(replace))
 					continue;
 
-				var a = FindEdge(s, p, new int2(-1, 0), replace);
-				var b = FindEdge(s, p, new int2(1, 0), replace);
+				var a = FindEdge(s, p, new CVec(-1, 0), replace);
+				var b = FindEdge(s, p, new CVec(1, 0), replace);
 
 				for (var x = a.X; x <= b.X; x++)
 				{
 					s.Map.MapTiles.Value[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, index = (byte)0 };
 					if (s.Map.MapTiles.Value[x, p.Y - 1].Equals(replace))
-						MaybeEnqueue(x, p.Y - 1);
+						maybeEnqueue(x, p.Y - 1);
 					if (s.Map.MapTiles.Value[x, p.Y + 1].Equals(replace))
-						MaybeEnqueue(x, p.Y + 1);
+						maybeEnqueue(x, p.Y + 1);
 				}
 			}
 
@@ -109,7 +109,7 @@ namespace OpenRA.Editor
 			s.Chunks.Clear();
 		}
 
-		int2 FindEdge(Surface s, int2 p, int2 d, TileReference<ushort, byte> replace)
+		CPos FindEdge(Surface s, CPos p, CVec d, TileReference<ushort, byte> replace)
 		{
 			for (; ; )
 			{

OpenRA.Editor/ErrorListDialog.Designer.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,9 +42,9 @@ namespace OpenRA.Editor
 			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);
@@ -52,9 +52,9 @@ namespace OpenRA.Editor
 			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)));
@@ -63,9 +63,9 @@ namespace OpenRA.Editor
 			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);
@@ -74,9 +74,9 @@ namespace OpenRA.Editor
 			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);

OpenRA.Editor/ErrorListDialog.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/Form1.Designer.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.
@@ -47,12 +47,13 @@ namespace OpenRA.Editor
 			this.tabPage1 = new System.Windows.Forms.TabPage();
 			this.tilePalette = new System.Windows.Forms.FlowLayoutPanel();
 			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.panel1 = new System.Windows.Forms.Panel();
 			this.actorPalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.actorOwnerChooser = new System.Windows.Forms.ComboBox();
 			this.tabPage3 = new System.Windows.Forms.TabPage();
 			this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel();
 			this.surface1 = new OpenRA.Editor.Surface();
 			this.tt = new System.Windows.Forms.ToolTip(this.components);
-			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
 			this.splitContainer3 = new System.Windows.Forms.SplitContainer();
 			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
 			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -72,12 +73,18 @@ namespace OpenRA.Editor
 			this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.showActorNamesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.showGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.fixOpenAreasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.setupDefaultPlayersMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripComboBox1 = new System.Windows.Forms.ToolStripComboBox();
 			this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
 			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
 			this.toolStripStatusLabelFiller = new System.Windows.Forms.ToolStripStatusLabel();
 			this.toolStripStatusLabelMousePosition = new System.Windows.Forms.ToolStripStatusLabel();
-			this.showActorNamesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.copySelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
 			this.splitContainer1.Panel1.SuspendLayout();
 			this.splitContainer1.Panel2.SuspendLayout();
 			this.splitContainer1.SuspendLayout();
@@ -88,6 +95,7 @@ namespace OpenRA.Editor
 			this.tabControl1.SuspendLayout();
 			this.tabPage1.SuspendLayout();
 			this.tabPage2.SuspendLayout();
+			this.panel1.SuspendLayout();
 			this.tabPage3.SuspendLayout();
 			this.splitContainer3.Panel1.SuspendLayout();
 			this.splitContainer3.Panel2.SuspendLayout();
@@ -181,7 +189,8 @@ namespace OpenRA.Editor
 			// 
 			// tabPage2
 			// 
-			this.tabPage2.Controls.Add(this.actorPalette);
+			this.tabPage2.Controls.Add(this.panel1);
+			this.tabPage2.Controls.Add(this.actorOwnerChooser);
 			this.tabPage2.Location = new System.Drawing.Point(4, 20);
 			this.tabPage2.Name = "tabPage2";
 			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
@@ -190,15 +199,37 @@ namespace OpenRA.Editor
 			this.tabPage2.Text = "Actors";
 			this.tabPage2.UseVisualStyleBackColor = true;
 			// 
+			// panel1
+			// 
+			this.panel1.Controls.Add(this.actorPalette);
+			this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.panel1.Location = new System.Drawing.Point(3, 24);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(184, 525);
+			this.panel1.TabIndex = 4;
+			// 
 			// actorPalette
 			// 
 			this.actorPalette.AutoScroll = true;
 			this.actorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.actorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.actorPalette.Location = new System.Drawing.Point(3, 3);
+			this.actorPalette.Location = new System.Drawing.Point(0, 0);
 			this.actorPalette.Name = "actorPalette";
-			this.actorPalette.Size = new System.Drawing.Size(184, 546);
-			this.actorPalette.TabIndex = 2;
+			this.actorPalette.Size = new System.Drawing.Size(184, 525);
+			this.actorPalette.TabIndex = 3;
+			// 
+			// actorOwnerChooser
+			// 
+			this.actorOwnerChooser.Dock = System.Windows.Forms.DockStyle.Top;
+			this.actorOwnerChooser.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.actorOwnerChooser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.actorOwnerChooser.FormattingEnabled = true;
+			this.actorOwnerChooser.Location = new System.Drawing.Point(3, 3);
+			this.actorOwnerChooser.Name = "actorOwnerChooser";
+			this.actorOwnerChooser.Size = new System.Drawing.Size(184, 21);
+			this.actorOwnerChooser.TabIndex = 3;
+			this.actorOwnerChooser.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawPlayerListItem);
+			this.actorOwnerChooser.SelectionChangeCommitted += new System.EventHandler(this.OnSelectedPlayerChanged);
 			// 
 			// tabPage3
 			// 
@@ -234,12 +265,6 @@ namespace OpenRA.Editor
 			// 
 			this.tt.ShowAlways = true;
 			// 
-			// saveFileDialog
-			// 
-			this.saveFileDialog.DefaultExt = "*.png";
-			this.saveFileDialog.Filter = "PNG Image (*.png)|";
-			this.saveFileDialog.Title = "Export minimap to PNG";
-			// 
 			// splitContainer3
 			// 
 			this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -393,7 +418,13 @@ namespace OpenRA.Editor
 			this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.propertiesToolStripMenuItem,
             this.resizeToolStripMenuItem,
-            this.showActorNamesToolStripMenuItem});
+            this.showActorNamesToolStripMenuItem,
+            this.showGridToolStripMenuItem,
+            this.toolStripSeparator5,
+            this.fixOpenAreasToolStripMenuItem,
+            this.setupDefaultPlayersMenuItem,
+            this.toolStripSeparator4,
+            this.copySelectionToolStripMenuItem});
 			this.mapToolStripMenuItem.Name = "mapToolStripMenuItem";
 			this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 23);
 			this.mapToolStripMenuItem.Text = "&Map";
@@ -403,7 +434,7 @@ namespace OpenRA.Editor
 			this.propertiesToolStripMenuItem.Enabled = false;
 			this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image")));
 			this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
-			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
 			this.propertiesToolStripMenuItem.Text = "&Properties...";
 			this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked);
 			// 
@@ -412,10 +443,38 @@ namespace OpenRA.Editor
 			this.resizeToolStripMenuItem.Enabled = false;
 			this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image")));
 			this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem";
-			this.resizeToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+			this.resizeToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
 			this.resizeToolStripMenuItem.Text = "&Resize...";
 			this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked);
 			// 
+			// showActorNamesToolStripMenuItem
+			// 
+			this.showActorNamesToolStripMenuItem.Name = "showActorNamesToolStripMenuItem";
+			this.showActorNamesToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+			this.showActorNamesToolStripMenuItem.Text = "Show Actor &Names";
+			this.showActorNamesToolStripMenuItem.Click += new System.EventHandler(this.ShowActorNamesClicked);
+			// 
+			// showGridToolStripMenuItem
+			// 
+			this.showGridToolStripMenuItem.Name = "showGridToolStripMenuItem";
+			this.showGridToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+			this.showGridToolStripMenuItem.Text = "Show &Grid";
+			this.showGridToolStripMenuItem.Click += new System.EventHandler(this.ShowGridClicked);
+			// 
+			// fixOpenAreasToolStripMenuItem
+			// 
+			this.fixOpenAreasToolStripMenuItem.Name = "fixOpenAreasToolStripMenuItem";
+			this.fixOpenAreasToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+			this.fixOpenAreasToolStripMenuItem.Text = "&Fix Open Areas";
+			this.fixOpenAreasToolStripMenuItem.Click += new System.EventHandler(this.FixOpenAreas);
+			// 
+			// setupDefaultPlayersMenuItem
+			// 
+			this.setupDefaultPlayersMenuItem.Name = "setupDefaultPlayersMenuItem";
+			this.setupDefaultPlayersMenuItem.Size = new System.Drawing.Size(185, 22);
+			this.setupDefaultPlayersMenuItem.Text = "&Setup Default Players";
+			this.setupDefaultPlayersMenuItem.Click += new System.EventHandler(this.SetupDefaultPlayers);
+			// 
 			// toolStripComboBox1
 			// 
 			this.toolStripComboBox1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -454,12 +513,22 @@ namespace OpenRA.Editor
 			this.toolStripStatusLabelMousePosition.Size = new System.Drawing.Size(22, 17);
 			this.toolStripStatusLabelMousePosition.Text = "0,0";
 			// 
-			// showActorNamesToolStripMenuItem
+			// copySelectionToolStripMenuItem
 			// 
-			this.showActorNamesToolStripMenuItem.Name = "showActorNamesToolStripMenuItem";
-			this.showActorNamesToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.showActorNamesToolStripMenuItem.Text = "Show Actor &Names";
-			this.showActorNamesToolStripMenuItem.Click += new System.EventHandler(this.ShowActorNamesClicked);
+			this.copySelectionToolStripMenuItem.Name = "copySelectionToolStripMenuItem";
+			this.copySelectionToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+			this.copySelectionToolStripMenuItem.Text = "Copy Selection";
+			this.copySelectionToolStripMenuItem.Click += new System.EventHandler(this.copySelectionToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator4
+			// 
+			this.toolStripSeparator4.Name = "toolStripSeparator4";
+			this.toolStripSeparator4.Size = new System.Drawing.Size(182, 6);
+			// 
+			// toolStripSeparator5
+			// 
+			this.toolStripSeparator5.Name = "toolStripSeparator5";
+			this.toolStripSeparator5.Size = new System.Drawing.Size(182, 6);
 			// 
 			// Form1
 			// 
@@ -474,9 +543,9 @@ namespace OpenRA.Editor
 			this.Name = "Form1";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
 			this.Text = "OpenRA Editor";
-			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp);
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing);
 			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);
+			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp);
 			this.splitContainer1.Panel1.ResumeLayout(false);
 			this.splitContainer1.Panel2.ResumeLayout(false);
 			this.splitContainer1.ResumeLayout(false);
@@ -487,6 +556,7 @@ namespace OpenRA.Editor
 			this.tabControl1.ResumeLayout(false);
 			this.tabPage1.ResumeLayout(false);
 			this.tabPage2.ResumeLayout(false);
+			this.panel1.ResumeLayout(false);
 			this.tabPage3.ResumeLayout(false);
 			this.splitContainer3.Panel1.ResumeLayout(false);
 			this.splitContainer3.Panel1.PerformLayout();
@@ -509,13 +579,11 @@ namespace OpenRA.Editor
 		private System.Windows.Forms.TabPage tabPage1;
 		private System.Windows.Forms.FlowLayoutPanel tilePalette;
 		private System.Windows.Forms.TabPage tabPage2;
-		private System.Windows.Forms.FlowLayoutPanel actorPalette;
 		private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.FlowLayoutPanel resourcePalette;
+		private System.Windows.Forms.FlowLayoutPanel resourcePalette;
 		private Surface surface1;
-        private System.Windows.Forms.PictureBox pmMiniMap;
+		private System.Windows.Forms.PictureBox pmMiniMap;
 		private System.Windows.Forms.SplitContainer splitContainer2;
-		private System.Windows.Forms.SaveFileDialog saveFileDialog;
 		private System.Windows.Forms.SplitContainer splitContainer3;
 		private System.Windows.Forms.StatusStrip statusStrip1;
 		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelMousePosition;
@@ -541,6 +609,15 @@ namespace OpenRA.Editor
 		private System.Windows.Forms.ToolStripLabel toolStripLabel1;
 		private System.Windows.Forms.ToolStripComboBox toolStripComboBox1;
 		private System.Windows.Forms.ToolStripMenuItem showActorNamesToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem showGridToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem fixOpenAreasToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem setupDefaultPlayersMenuItem;
+		private System.Windows.Forms.Panel panel1;
+		private System.Windows.Forms.FlowLayoutPanel actorPalette;
+		private System.Windows.Forms.ComboBox actorOwnerChooser;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+		private System.Windows.Forms.ToolStripMenuItem copySelectionToolStripMenuItem;
 
 	}
 }

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.
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -29,8 +30,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 +45,20 @@ 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;
-			
+			surface1.ActorDoubleClicked += ActorDoubleClicked;
+
 			if (args.Length >= 2)
 				LoadMap(args[1]);
 		}
@@ -67,7 +69,31 @@ namespace OpenRA.Editor
 			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
 		}
 
+		void ActorDoubleClicked(KeyValuePair<string,ActorReference> kv)
+		{
+			using( var apd = new ActorPropertiesDialog() )
+			{
+				var name = kv.Key;
+				apd.AddRow("(Name)", apd.MakeEditorControl(typeof(string), () => name, v => name = (string)v));
+				apd.AddRow("(Type)", apd.MakeEditorControl(typeof(string), () => kv.Value.Type, v => kv.Value.Type = (string)v));
+
+				var objSaved = kv.Value.Save();
+
+				// TODO: make this work properly
+				foreach( var init in Rules.Info[kv.Value.Type].GetInitKeys() )
+					apd.AddRow(init.First,
+						apd.MakeEditorControl(init.Second,
+							() => objSaved.NodesDict.ContainsKey( init.First ) ? objSaved.NodesDict[init.First].Value : null,
+							_ => {}));
+
+				apd.ShowDialog();
+
+				// TODO: writeback
+			}
+		}
+
 		void MakeDirty() { dirty = true; }
+
 		string loadedMapName;
 		string currentMod = "ra";
 		TileSet tileset;
@@ -87,13 +113,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
-				{
-					Name = "Neutral",
-					Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
-					OwnsWorld = true,
-					NonCombatant = true
-				});
+				map.MakeDefaultPlayers();
 
 			PrepareMapResources(Game.modData.Manifest, map);
 
@@ -118,39 +138,62 @@ namespace OpenRA.Editor
 			Rules.LoadRules(manifest, map);
 			tileset = Rules.TileSets[map.Tileset];
 			tileset.LoadTiles();
-			var palette = new Palette(FileSystem.Open(tileset.Palette), true);
-
+			int[] ShadowIndex = { 3, 4 };
+			var palette = new Palette(FileSystem.Open(tileset.Palette), ShadowIndex);
 
 			surface1.Bind(map, tileset, palette);
 			// construct the palette of tiles
 			var palettes = new[] { tilePalette, actorPalette, resourcePalette };
 			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
-			foreach (var t in tileset.Templates)
+
+			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category))
 			{
-				try
+				var category = tc.Key ?? "(Uncategorized)";
+				var categoryHeader = new Label
 				{
-					var bitmap = RenderUtils.RenderTemplate(tileset, (ushort)t.Key, palette);
-					var ibox = new PictureBox
+					BackColor = SystemColors.Highlight,
+					ForeColor = SystemColors.HighlightText,
+					Text = category,
+					AutoSize = false,
+					Height = 24,
+					TextAlign = ContentAlignment.MiddleLeft,
+					Width = tilePalette.ClientSize.Width,
+				};
+				// hook this manually, anchoring inside FlowLayoutPanel is flaky.
+				tilePalette.Resize += (_,e) => categoryHeader.Width = tilePalette.ClientSize.Width;
+
+				if (tilePalette.Controls.Count > 0)
+					tilePalette.SetFlowBreak(
+						tilePalette.Controls[tilePalette.Controls.Count - 1], true);
+				tilePalette.Controls.Add(categoryHeader);
+
+				foreach( var t in tc )
+				{
+					try
 					{
-						Image = bitmap,
-						Width = bitmap.Width / 2,
-						Height = bitmap.Height / 2,
-						SizeMode = PictureBoxSizeMode.StretchImage
-					};
-
-					var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
-					ibox.Click += (_, e) => surface1.SetTool(new BrushTool(brushTemplate));
-
-					var template = t.Value;
-					tilePalette.Controls.Add(ibox);
-					tt.SetToolTip(ibox,
-						"{1}:{0} ({2}x{3})".F(
-						template.Image,
-						template.Id,
-						template.Size.X,
-						template.Size.Y));
+						var bitmap = tileset.RenderTemplate((ushort)t.Key, palette);
+						var ibox = new PictureBox
+						{
+							Image = bitmap,
+							Width = bitmap.Width / 2,
+							Height = bitmap.Height / 2,
+							SizeMode = PictureBoxSizeMode.StretchImage
+						};
+	
+						var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
+						ibox.Click += (_, e) => surface1.SetTool(new BrushTool(brushTemplate));
+	
+						var template = t.Value;
+						tilePalette.Controls.Add(ibox);
+						tt.SetToolTip(ibox,
+							"{1}:{0} ({2}x{3})".F(
+							template.Image,
+							template.Id,
+							template.Size.X,
+							template.Size.Y));
+					}
+					catch { }
 				}
-				catch { }
 			}
 
 			var actorTemplates = new List<ActorTemplate>();
@@ -161,6 +204,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
 					{
@@ -171,7 +221,6 @@ namespace OpenRA.Editor
 						BorderStyle = BorderStyle.FixedSingle
 					};
 
-
 					ibox.Click += (_, e) => surface1.SetTool(new ActorTool(template));
 
 					actorPalette.Controls.Add(ibox);
@@ -234,6 +283,16 @@ namespace OpenRA.Editor
 			saveToolStripMenuItem.Enabled = true;
 			saveAsToolStripMenuItem.Enabled = true;
 			mnuMinimapToPNG.Enabled = true;	// todo: what is this VB naming bullshit doing here?
+
+			PopulateActorOwnerChooser();
+		}
+
+		void PopulateActorOwnerChooser()
+		{
+			actorOwnerChooser.Items.Clear();
+			actorOwnerChooser.Items.AddRange(surface1.Map.Players.Values.ToArray());
+			actorOwnerChooser.SelectedIndex = 0;
+			surface1.NewActorOwner = (actorOwnerChooser.SelectedItem as PlayerReference).Name;
 		}
 
 		void ResizeClicked(object sender, EventArgs e)
@@ -251,9 +310,9 @@ namespace OpenRA.Editor
 					return;
 
 				surface1.Map.ResizeCordon((int)rd.cordonLeft.Value,
-									   (int)rd.cordonTop.Value,
-									   (int)rd.cordonRight.Value,
-									   (int)rd.cordonBottom.Value);
+					(int)rd.cordonTop.Value,
+					(int)rd.cordonRight.Value,
+					(int)rd.cordonBottom.Value);
 
 				if ((int)rd.width.Value != surface1.Map.MapSize.X || (int)rd.height.Value != surface1.Map.MapSize.Y)
 				{
@@ -326,21 +385,8 @@ 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
-					{
-						Name = "Neutral",
-						Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
-						OwnsWorld = true,
-						NonCombatant = true
-					});
-					
-					map.Players.Add("Creeps", new PlayerReference
-					{
-						Name = "Creeps",
-						Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
-						NonCombatant = true
-					});
+
+					map.MakeDefaultPlayers();
 
 					NewMap(map);
 				}
@@ -378,7 +424,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())
 				{
@@ -395,23 +441,9 @@ namespace OpenRA.Editor
 					if (errors.Count > 0)
 						using (var eld = new ErrorListDialog(errors))
 							eld.ShowDialog();
-				
-					if (!map.Players.ContainsKey("Neutral"))
-						map.Players.Add("Neutral", new PlayerReference
-						{
-							Name = "Neutral",
-							Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
-							OwnsWorld = true,
-							NonCombatant = true
-						});
-					
-					map.Players.Add("Creeps", new PlayerReference
-					{
-						Name = "Creeps",
-						Race = Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race,
-						NonCombatant = true
-					});
-				
+
+					map.MakeDefaultPlayers();
+
 					map.Save(savePath);
 					LoadMap(savePath);
 					loadedMapName = null;	/* editor needs to think this hasnt been saved */
@@ -436,11 +468,15 @@ namespace OpenRA.Editor
 
 		void ExportMinimap(object sender, EventArgs e)
 		{
-			saveFileDialog.InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps");
-			saveFileDialog.FileName = Path.ChangeExtension(loadedMapName, ".png");
-
-			if (DialogResult.OK == saveFileDialog.ShowDialog())
-				pmMiniMap.Image.Save(saveFileDialog.FileName);
+			using( var sfd = new SaveFileDialog() { 
+				InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps"),
+				DefaultExt = "*.png",
+				Filter = "PNG Image (*.png)|*.png",
+				Title = "Export Minimap to PNG",
+				FileName = Path.ChangeExtension(loadedMapName, ".png"),
+				RestoreDirectory = true } )
+				if (DialogResult.OK == sfd.ShowDialog())
+					pmMiniMap.Image.Save(sfd.FileName);
 		}
 
 		void ShowActorNamesClicked(object sender, EventArgs e)
@@ -448,5 +484,72 @@ namespace OpenRA.Editor
 			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].Templates[tr.type].Data.TileBitmapBytes.Count);
+
+					surface1.Map.MapTiles.Value[i, j] = tr;
+				}
+
+			surface1.Chunks.Clear();
+			surface1.Invalidate();
+		}
+
+		void SetupDefaultPlayers(object sender, EventArgs e)
+		{
+			dirty = true;
+			surface1.Map.MakeDefaultPlayers();
+
+			surface1.Chunks.Clear();
+			surface1.Invalidate();
+
+			PopulateActorOwnerChooser();
+		}
+
+		void DrawPlayerListItem(object sender, DrawItemEventArgs e)
+		{
+			// color block
+			var player = e.Index >= 0 ? (PlayerReference)(sender as ComboBox).Items[e.Index] : null;
+
+			e.DrawBackground();
+			e.DrawFocusRectangle();
+
+			if (player == null)
+				return;
+
+			var color = player.ColorRamp.GetColor(0);
+			using( var brush = new SolidBrush(color) )
+				e.Graphics.FillRectangle( brush, e.Bounds.Left + 2, e.Bounds.Top + 2, e.Bounds.Height + 6, e.Bounds.Height - 4 );
+			using( var foreBrush = new SolidBrush(e.ForeColor) )
+				e.Graphics.DrawString( player.Name, e.Font, foreBrush, e.Bounds.Left + e.Bounds.Height + 12, e.Bounds.Top );
+		}
+
+		void OnSelectedPlayerChanged(object sender, EventArgs e)
+		{
+			var player = actorOwnerChooser.SelectedItem as PlayerReference;
+			surface1.NewActorOwner = player.Name;
+		}
+
+		private void copySelectionToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			surface1.CopySelection();
+		}
 	}
 }

OpenRA.Editor/Form1.resx

@@ -120,13 +120,45 @@
   <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>76, 17</value>
-  </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>198, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="propertiesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACCklE
+        QVQ4T6WT30tTUQDHz39QD0UQSpAPIkgPyR60AiUiyoGBL4qZjOyt0tZP9tBDk1AsXIhj93ILdd27DPPH
+        3VwrUrdK2ioJHAgVOdoPaQsarBg43L6ec+akuRsEPnw5D4fP5/vlXg4BQHaSf8LjjwdqaTA2cg+y1Ith
+        qxmi5Tas/SYWk+QRoPgmtNsLcPq7GYX8+XoTqaUL+KR2cAmDxeBgqeBv2NhWzwUFOBk4g5/zRxB3V8Es
+        38AtbzuIw/0RLMrMeyhTs2CzGdRtaOTn1dajvLkAR9VKLNvLcHmoExddzSDKzAfkcjkkEtEiOLxoQpdB
+        z+Er7ScQUg/DL5TD2bsfl5oPoKWnCZ3jehDZGeAC1hwL3uXNs55Jep7Gis/AJWxyTeVe1FXvhq5qH6oP
+        7nlw/NoxGByNIKPT77CezSEeD6Pn+jlEIiGk6X8N+F9zyfLYIZzUVUCwT0J36jy9yX83KjDq7zSADE8t
+        cGB7kpksFt76YDzbgMWVFLzBX0WCTcku8mjiTSm8lkUslcHnH2kK/+aw6k+UCJiESE+9XCApz2Gzu5Gk
+        sEVy4r6got82vRV5blVbIDyZ21rAZrPmL7w5P5s1KxQWXRFtgU15lV8ge2AbdXPY8pAuEIsXWJ6FtAVW
+        +SWSmXWssuZ4vnl+s5nNFl1hMLjP8U1bMGR/wS/+N9tf7o6eMpNtADko6xybtEXLAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="resizeToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAADLklE
+        QVQ4T3WS60/ScRjFf39CL3rR1ovurduWbbU2t7ZqdlkXt7Lrym6O1VoXcdYqQ54wKlGxABE1CzWF0nIm
+        lZcoTbyUNJFIzDJSJK+E0qy8wInvz+i2erazfd+cz3m+zw4nTS+FLOeZNim3Vp6UU5sqvf5MSZqnyjhV
+        pfKUvEx54kqp8rCkWHVQVKSJPHtbs+tUgSYiOicVAMfEqfR1dVFCGSqrX94cHQeN/aXhbyD3Zz91uf3U
+        9tFHTQ4fzVtH9BOQVdKcW2F6/eKkWA1zcxu6vUAQMmCzk/3AErLtDyFrrY035z16T3PXin8B5LfqZE6P
+        HyZzKw5FX+Yh4XtjwZKZGV3lNPIkhhojplON3Uc3S9/Q7LDfADKtKYklMsgTkwV7joixKHQr2Nq2fSET
+        5uQwqtsyjcot45R510ozV8f/2iAhsyolCNh9WIyFoRGYHbIGfYN+SVd7Nznzk8ll0FLzKxdZO3xkaOjG
+        GYUxcIIfRxSlPU4N/rn1fS8JJVlU1WCT3npggVLfAIWuHjJtNRIyjIhTPEKM7D6OSop4RcXpwZ2Wl11l
+        gHanmze/c36ioc8jyRlFjSzljxl2daI9Pwuv1Cnw9PRjZeQ1cCcSS68Fza6+IXL2fCG7w0ssmc3o2IR8
+        gbc1PQU9NUp48sNRcUyAkPBL4AIlUbLk3gEvS6YXrW6p0dx9UZ5n4gHjzBmYAAPPYwRwazeiMXYWqjcs
+        wLSVInAHRYWq0TEf9Q+NUEsg+fr9t2nF1U71leyqn+u3vPuIl2298HZ2wnxkO5q2LYOtxoKpK86D23tW
+        r+7zfCVzywAVGT/QVV2LvNDo0Eo0j3mAtbUTiRnFOJ94Axp9LfIKK5Ctq0RDmw9TQuPAsW7bHYNUYLCQ
+        JL2GRAqjtMDYwV+8wzUAWeY9eIfHYW0fxNodxyGWZeOSPBvzl27C5OXnwG0T5irmr79wgdWTNYyVJFL8
+        kAeo8wyBA/rx2jGErBIH0nXPsWmPEHcM9YgURGPS0jMTZfiXGKDfM4Y0fVOgA/UgRQWECTpExaqxUyDF
+        wuUbJjb4H0AQfxtrDqiweLMUc8LEmLEqnv9zUMzM9B1/cM83lepxTAAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="newToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -260,41 +292,6 @@
         z2ki+Wo1CWklROkMCiT8wEm0kXEsCTmrAiTbDtcEpTVdZOS1oDfWk5xZ6RPeQZeUR8zxK0Qe1BO65xjr
         t0YotXhjAEAeQ7It8ZSESUjkznIq2bYsTGYW29JZxIs2nFEdLOSdfwFwpvLxRKIY2AAAAABJRU5ErkJg
         gg==
-</value>
-  </data>
-  <data name="propertiesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACCklE
-        QVQ4T6WT30tTUQDHz39QD0UQSpAPIkgPyR60AiUiyoGBL4qZjOyt0tZP9tBDk1AsXIhj93ILdd27DPPH
-        3VwrUrdK2ioJHAgVOdoPaQsarBg43L6ec+akuRsEPnw5D4fP5/vlXg4BQHaSf8LjjwdqaTA2cg+y1Ith
-        qxmi5Tas/SYWk+QRoPgmtNsLcPq7GYX8+XoTqaUL+KR2cAmDxeBgqeBv2NhWzwUFOBk4g5/zRxB3V8Es
-        38AtbzuIw/0RLMrMeyhTs2CzGdRtaOTn1dajvLkAR9VKLNvLcHmoExddzSDKzAfkcjkkEtEiOLxoQpdB
-        z+Er7ScQUg/DL5TD2bsfl5oPoKWnCZ3jehDZGeAC1hwL3uXNs55Jep7Gis/AJWxyTeVe1FXvhq5qH6oP
-        7nlw/NoxGByNIKPT77CezSEeD6Pn+jlEIiGk6X8N+F9zyfLYIZzUVUCwT0J36jy9yX83KjDq7zSADE8t
-        cGB7kpksFt76YDzbgMWVFLzBX0WCTcku8mjiTSm8lkUslcHnH2kK/+aw6k+UCJiESE+9XCApz2Gzu5Gk
-        sEVy4r6got82vRV5blVbIDyZ21rAZrPmL7w5P5s1KxQWXRFtgU15lV8ge2AbdXPY8pAuEIsXWJ6FtAVW
-        +SWSmXWssuZ4vnl+s5nNFl1hMLjP8U1bMGR/wS/+N9tf7o6eMpNtADko6xybtEXLAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="resizeToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAADLklE
-        QVQ4T3WS60/ScRjFf39CL3rR1ovurduWbbU2t7ZqdlkXt7Lrym6O1VoXcdYqQ54wKlGxABE1CzWF0nIm
-        lZcoTbyUNJFIzDJSJK+E0qy8wInvz+i2erazfd+cz3m+zw4nTS+FLOeZNim3Vp6UU5sqvf5MSZqnyjhV
-        pfKUvEx54kqp8rCkWHVQVKSJPHtbs+tUgSYiOicVAMfEqfR1dVFCGSqrX94cHQeN/aXhbyD3Zz91uf3U
-        9tFHTQ4fzVtH9BOQVdKcW2F6/eKkWA1zcxu6vUAQMmCzk/3AErLtDyFrrY035z16T3PXin8B5LfqZE6P
-        HyZzKw5FX+Yh4XtjwZKZGV3lNPIkhhojplON3Uc3S9/Q7LDfADKtKYklMsgTkwV7joixKHQr2Nq2fSET
-        5uQwqtsyjcot45R510ozV8f/2iAhsyolCNh9WIyFoRGYHbIGfYN+SVd7Nznzk8ll0FLzKxdZO3xkaOjG
-        GYUxcIIfRxSlPU4N/rn1fS8JJVlU1WCT3npggVLfAIWuHjJtNRIyjIhTPEKM7D6OSop4RcXpwZ2Wl11l
-        gHanmze/c36ioc8jyRlFjSzljxl2daI9Pwuv1Cnw9PRjZeQ1cCcSS68Fza6+IXL2fCG7w0ssmc3o2IR8
-        gbc1PQU9NUp48sNRcUyAkPBL4AIlUbLk3gEvS6YXrW6p0dx9UZ5n4gHjzBmYAAPPYwRwazeiMXYWqjcs
-        wLSVInAHRYWq0TEf9Q+NUEsg+fr9t2nF1U71leyqn+u3vPuIl2298HZ2wnxkO5q2LYOtxoKpK86D23tW
-        r+7zfCVzywAVGT/QVV2LvNDo0Eo0j3mAtbUTiRnFOJ94Axp9LfIKK5Ctq0RDmw9TQuPAsW7bHYNUYLCQ
-        JL2GRAqjtMDYwV+8wzUAWeY9eIfHYW0fxNodxyGWZeOSPBvzl27C5OXnwG0T5irmr79wgdWTNYyVJFL8
-        kAeo8wyBA/rx2jGErBIH0nXPsWmPEHcM9YgURGPS0jMTZfiXGKDfM4Y0fVOgA/UgRQWECTpExaqxUyDF
-        wuUbJjb4H0AQfxtrDqiweLMUc8LEmLEqnv9zUMzM9B1/cM83lepxTAAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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,13 +96,13 @@ 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>();
 		Action<string> errorHandler;
-		
+
 		LegacyMapImporter(string filename, Action<string> errorHandler)
 		{
 			this.errorHandler = errorHandler;
@@ -116,10 +116,10 @@ namespace OpenRA.Editor
 		}
 
 		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 LocationInit((CPos)kv.Second));
+				a.Add(new OwnerInit("Neutral"));
 				Map.Actors.Value.Add("spawn" + kv.First, a);
 			}
-			
+
 		}
 
 		static int2 LocationFromMapOffset(int offset, int mapSize)
@@ -188,27 +189,27 @@ namespace OpenRA.Editor
 
 		static MemoryStream ReadPackedSection(IniSection mapPackSection)
 		{
-			StringBuilder sb = new StringBuilder();
+			var sb = new StringBuilder();
 			for (int i = 1; ; i++)
 			{
-				string line = mapPackSection.GetValue(i.ToString(), null);
+				var line = mapPackSection.GetValue(i.ToString(), null);
 				if (line == null)
 					break;
 
 				sb.Append(line.Trim());
 			}
 
-			byte[] data = Convert.FromBase64String(sb.ToString());
-			List<byte[]> chunks = new List<byte[]>();
-			BinaryReader reader = new BinaryReader(new MemoryStream(data));
+			var data = Convert.FromBase64String(sb.ToString());
+			var chunks = new List<byte[]>();
+			var reader = new BinaryReader(new MemoryStream(data));
 
 			try
 			{
 				while (true)
 				{
-					uint length = reader.ReadUInt32() & 0xdfffffff;
-					byte[] dest = new byte[8192];
-					byte[] src = reader.ReadBytes((int)length);
+					var length = reader.ReadUInt32() & 0xdfffffff;
+					var dest = new byte[8192];
+					var src = reader.ReadBytes((int)length);
 
 					/*int actualLength =*/
 					Format80.DecodeInto(src, dest);
@@ -218,8 +219,8 @@ namespace OpenRA.Editor
 			}
 			catch (EndOfStreamException) { }
 
-			MemoryStream ms = new MemoryStream();
-			foreach (byte[] chunk in chunks)
+			var ms = new MemoryStream();
+			foreach (var chunk in chunks)
 				ms.Write(chunk, 0, chunk.Length);
 
 			ms.Position = 0;
@@ -242,7 +243,7 @@ namespace OpenRA.Editor
 
 			return ret;
 		}
-		
+
 		void UnpackRATileData(MemoryStream ms)
 		{
 			for (int i = 0; i < MapSize; i++)
@@ -273,27 +274,27 @@ namespace OpenRA.Editor
 
 					if (o != 255 && overlayActorMapping.ContainsKey(raOverlayNames[o]))
 						Map.Actors.Value.Add("Actor" + ActorCount++,
-							new ActorReference(overlayActorMapping[raOverlayNames[o]]) 
-							{ 
-								new LocationInit( new int2(i, j) ),
-								new OwnerInit( "Neutral" ) 
+							new ActorReference(overlayActorMapping[raOverlayNames[o]])
+							{
+								new LocationInit( new CPos(i, j) ),
+								new OwnerInit( "Neutral" )
 							});
 				}
 		}
 
 		void ReadRATrees(IniFile file)
 		{
-			IniSection terrain = file.GetSection("TERRAIN", true);
+			var terrain = file.GetSection("TERRAIN", true);
 			if (terrain == null)
 				return;
 
 			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)),
+						new LocationInit(new CPos(loc % MapSize, loc / MapSize)),
 						new OwnerInit("Neutral")
 					});
 			}
@@ -312,17 +313,17 @@ namespace OpenRA.Editor
 					Map.MapTiles.Value[i, j].index = ReadByte(ms);
 				}
 		}
-		
+
 		void ReadCncOverlay(IniFile file)
 		{
-			IniSection overlay = file.GetSection("OVERLAY", true);
+			var overlay = file.GetSection("OVERLAY", true);
 			if (overlay == null)
 				return;
 
 			foreach (KeyValuePair<string, string> kv in overlay)
 			{
 				var loc = int.Parse(kv.Key);
-				int2 cell = new int2(loc % MapSize, loc / MapSize);
+				var cell = new CPos(loc % MapSize, loc / MapSize);
 
 				var res = Pair.New((byte)0, (byte)0);
 				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
@@ -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,10 +340,10 @@ namespace OpenRA.Editor
 						});
 			}
 		}
-		
+
 		void ReadCncTrees(IniFile file)
 		{
-			IniSection terrain = file.GetSection("TERRAIN", true);
+			var terrain = file.GetSection("TERRAIN", true);
 			if (terrain == null)
 				return;
 
@@ -352,7 +353,7 @@ namespace OpenRA.Editor
 				Map.Actors.Value.Add("Actor" + ActorCount++,
 					new ActorReference(kv.Value.Split(',')[0].ToLowerInvariant())
 					{
-						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new LocationInit(new CPos(loc % MapSize, loc / MapSize)),
 						new OwnerInit("Neutral")
 					});
 			}
@@ -374,42 +375,15 @@ namespace OpenRA.Editor
 					if (parts[0] == "")
 						parts[0] = "Neutral";
 
-
 					if (!Players.Contains(parts[0]))
 						Players.Add(parts[0]);
 
-					var stance = ActorStance.Stance.None;
-					switch (parts[5])
-					{
-						case "Area Guard":
-						case "Guard":
-							stance = ActorStance.Stance.Guard;
-							break;
-						case "Defend Base":
-							stance = ActorStance.Stance.Defend;
-							break;
-						case "Hunt":
-						case "Rampage":
-						case "Attack Base":
-						case "Attack Units":
-						case "Attack Civil.":
-						case "Attack Tarcom":
-							stance = ActorStance.Stance.Hunt;
-							break;
-						case "Retreat":
-						case "Return":
-							stance = ActorStance.Stance.Retreat;
-							break;
-						// do we care about `Harvest' and `Sticky'?
-					}
-
 					var actor = new ActorReference(parts[1].ToLowerInvariant())
 					{
-						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new LocationInit(new CPos(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")
@@ -426,7 +400,7 @@ namespace OpenRA.Editor
 				}
 			}
 		}
-		
+
 		void LoadSmudges(IniFile file, string section)
 		{
 			foreach (var s in file.GetSection(section, true))
@@ -437,28 +411,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))
+						(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);
@@ -468,12 +442,12 @@ namespace OpenRA.Editor
 						pr.InitialCash = int.Parse(s.Value);
 					break;
 					case "Allies":
-						pr.Allies = s.Value.Split(',').Intersect(Players).Except(Neutral).ToArray();
-						pr.Enemies = s.Value.Split(',').SymmetricDifference(Players).Except(Neutral).ToArray();
+						pr.Allies = s.Value.Split(',').Intersect(Players).Except(neutral).ToArray();
+						pr.Enemies = s.Value.Split(',').SymmetricDifference(Players).Except(neutral).ToArray();
 					break;
 				}
 			}
-			
+
 			Map.Players.Add(section, pr);
 		}
 

OpenRA.Editor/MapSelect.Designer.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,33 +10,33 @@
 
 namespace OpenRA.Editor
 {
-    partial class MapSelect
-    {
-        /// <summary>
-        /// TODO
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
+	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);
-        }
+		/// <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
+		#region Код, автоматически созданный конструктором форм Windows
 
-        /// <summary>
-        /// TODO
-        /// </summary>
-        private void InitializeComponent()
-        {
+		/// <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();
@@ -70,12 +70,12 @@ namespace OpenRA.Editor
 			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.colMapName});
 			this.MapList.FullRowSelect = true;
 			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
 			this.MapList.LargeImageList = this.MapIconsList;
@@ -89,20 +89,20 @@ namespace OpenRA.Editor
 			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";
@@ -110,9 +110,9 @@ namespace OpenRA.Editor
 			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";
@@ -120,9 +120,9 @@ namespace OpenRA.Editor
 			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);
@@ -130,18 +130,18 @@ namespace OpenRA.Editor
 			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);
@@ -150,9 +150,9 @@ namespace OpenRA.Editor
 			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);
@@ -167,9 +167,9 @@ namespace OpenRA.Editor
 			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";
@@ -177,17 +177,17 @@ namespace OpenRA.Editor
 			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);
@@ -195,20 +195,20 @@ namespace OpenRA.Editor
 			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);
@@ -222,90 +222,90 @@ namespace OpenRA.Editor
 			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);
@@ -313,9 +313,9 @@ namespace OpenRA.Editor
 			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";
@@ -323,9 +323,9 @@ namespace OpenRA.Editor
 			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;
@@ -353,33 +353,33 @@ namespace OpenRA.Editor
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
 			this.ResumeLayout(false);
 
-        }
+		}
 
-        #endregion
+		#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;
+		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,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,75 +10,73 @@
 
 using System;
 using System.IO;
-using System.Windows.Forms;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
 using System.Linq;
+using System.Windows.Forms;
+using OpenRA.Graphics;
 
 namespace OpenRA.Editor
 {
-    public partial class MapSelect : Form
-    {
-        public string MapFolderPath;
+	public partial class MapSelect : Form
+	{
+		public string MapFolderPath;
 
-        public MapSelect(string currentMod)
-        {
-            MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+		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();
+		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);
-            }
-            
+				map1.ImageIndex = 0;
+				MapList.Items.Add(map1);
+			}
+
 			// hack
 			if (txtNew.Text != "unnamed")
-                MapList.Items[0].Selected = true;
-        }
+				MapList.Items[0].Selected = true;
+		}
 
-        void MapList_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (MapList.SelectedItems.Count == 1)
-            {
-                txtNew.Text = MapList.SelectedItems[0].Text;
+		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;
+				txtTitle.Text = map.Title;
+				txtAuthor.Text = map.Author;
+				txtTheater.Text = map.Tileset;
+				txtDesc.Text = map.Description;
 				pbMinimap.Image = null;
-				
-                try
-                {
+
+				try
+				{
 					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
-                }
-                catch (Exception ed)
-                {
-                    Console.WriteLine("No map preview image found: {0}", ed.ToString());
-                }
-                finally { }
-            }
-        }
+				}
+				catch (Exception ed)
+				{
+					Console.WriteLine("No map preview image found: {0}", ed.ToString());
+				}
+				finally { }
+			}
+		}
 
-        void txtPathOut_TextChanged(object sender, EventArgs e)
-        {
-            MapFolderPath = txtPathOut.Text;
-        }
-
-    }
+		void txtPathOut_TextChanged(object sender, EventArgs e)
+		{
+			MapFolderPath = txtPathOut.Text;
+		}
+	}
 }

OpenRA.Editor/NewMapDialog.Designer.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.
@@ -58,9 +58,9 @@ namespace OpenRA.Editor
 			((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";
@@ -68,9 +68,9 @@ namespace OpenRA.Editor
 			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";
@@ -78,172 +78,172 @@ namespace OpenRA.Editor
 			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});
+			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});
+			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});
+			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});
+			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});
+			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});
+			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});
+			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});
+			16,
+			0,
+			0,
+			0});
 			this.cordonLeft.Enter += new System.EventHandler(this.SelectText);
-			// 
+			//
 			// height
-			// 
+			//
 			this.height.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
+			8,
+			0,
+			0,
+			0});
 			this.height.Location = new System.Drawing.Point(280, 23);
 			this.height.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			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});
+			128,
+			0,
+			0,
+			0});
 			this.height.Enter += new System.EventHandler(this.SelectText);
-			// 
+			//
 			// width
-			// 
+			//
 			this.width.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
+			8,
+			0,
+			0,
+			0});
 			this.width.Location = new System.Drawing.Point(169, 23);
 			this.width.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			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});
+			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;

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/OpenRA.Editor.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,6 +13,25 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +44,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -35,6 +55,7 @@
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -53,6 +74,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ActorPropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ActorPropertiesDialog.Designer.cs">
+      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="ActorTemplate.cs" />
     <Compile Include="ActorTool.cs" />
     <Compile Include="BrushTool.cs" />
@@ -90,6 +117,9 @@
       <DependentUpon>PropertiesDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="ActorPropertiesDialog.resx">
+      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
@@ -113,6 +143,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -148,6 +179,23 @@
   <ItemGroup>
     <Content Include="OpenRA.Editor.Icon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </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.

OpenRA.Editor/Program.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,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);
+			{
+				var map = new Map(path);
 				// Touch the lazy bits to initialize them
-                map.Actors.Force();
-                map.Smudges.Force();
-                map.MapTiles.Force();
-                map.MapResources.Force();
+				map.Actors.Force();
+				map.Smudges.Force();
+				map.MapTiles.Force();
+				map.MapResources.Force();
 				map.Save(path);
-            }
+			}
 		}
-		
+
 	}
 }

OpenRA.Editor/Properties/AssemblyInfo.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.
@@ -12,7 +12,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// 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")]
@@ -24,8 +24,8 @@ using System.Runtime.InteropServices;
 [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 
+// 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)]
 
@@ -35,11 +35,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// 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")]

OpenRA.Editor/Properties/Resources.Designer.cs

@@ -1,71 +1,63 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:4.0.30319.269
 //
 //     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;
-			}
-		}
-	}
+namespace OpenRA.Editor.Properties {
+    using System;
+    
+    
+    /// <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", "4.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 (object.ReferenceEquals(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,26 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:4.0.30319.269
 //
 //     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;
-			}
-		}
-	}
+namespace OpenRA.Editor.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.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/PropertiesDialog.Designer.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.
@@ -38,131 +38,131 @@ namespace OpenRA.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();
+			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 = "Map Properties";
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
@@ -177,6 +177,6 @@ namespace OpenRA.Editor
 		public System.Windows.Forms.CheckBox selectable;
 		private System.Windows.Forms.Label label3;
 		public System.Windows.Forms.TextBox author;
-        public System.Windows.Forms.CheckBox useAsShellmap;
+		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/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,65 +18,15 @@ 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];
-			var tile = ts.Tiles[n];
-
-			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y,
-				PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = MakeSystemPalette(p);
-
-			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				byte* q = (byte*)data.Scan0.ToPointer();
-				var stride = data.Stride;
-
-				for (var u = 0; u < template.Size.X; u++)
-					for (var v = 0; v < template.Size.Y; v++)
-						if (tile.TileBitmapBytes[u + v * template.Size.X] != null)
-						{
-							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
-							for (var i = 0; i < ts.TileSize; i++)
-								for (var j = 0; j < ts.TileSize; j++)
-									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = rawImage[i + ts.TileSize * j];
-						}
-						else
-						{
-							for (var i = 0; i < ts.TileSize; i++)
-								for (var j = 0; j < ts.TileSize; j++)
-									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = 0;
-						}
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
 		static Bitmap RenderShp(ShpReader shp, Palette p)
 		{
 			var frame = shp[0];
 
 			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),
+			var data = bitmap.LockBits(bitmap.Bounds(),
 				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
 			unsafe
@@ -95,9 +45,9 @@ namespace OpenRA.Editor
 
 		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
 		{
-            var image = RenderSimple.GetImage(info, tileset.Id);
-			
-            using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			var image = RenderSimple.GetImage(info);
+
+			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
 			{
 				var shp = new ShpReader(s);
 				var bitmap = RenderShp(shp, p);
@@ -133,8 +83,8 @@ namespace OpenRA.Editor
 				var frame = shp[shp.ImageCount - 1];
 
 				var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
-				bitmap.Palette = MakeSystemPalette(p);
-				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				bitmap.Palette = p.AsSystemPalette();
+				var data = bitmap.LockBits(bitmap.Bounds(),
 					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
 				unsafe

OpenRA.Editor/ResizeDialog.Designer.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,101 +56,101 @@ namespace OpenRA.Editor
 			((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});
+			8,
+			0,
+			0,
+			0});
 			this.width.Location = new System.Drawing.Point(161, 18);
 			this.width.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			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});
+			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});
+			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});
+			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});
+			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";
@@ -158,9 +158,9 @@ namespace OpenRA.Editor
 			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";
@@ -168,26 +168,26 @@ namespace OpenRA.Editor
 			this.button2.TabIndex = 2;
 			this.button2.Text = "OK";
 			this.button2.UseVisualStyleBackColor = true;
-			// 
+			//
 			// height
-			// 
+			//
 			this.height.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
+			8,
+			0,
+			0,
+			0});
 			this.height.Location = new System.Drawing.Point(272, 18);
 			this.height.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			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;

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/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,12 +33,22 @@ namespace OpenRA.Editor
 		public float Zoom = 1.0f;
 
 		ITool Tool;
-		
+
 		public bool IsPanning;
 		public bool ShowActorNames;
+		public bool ShowGrid;
+
+		public bool IsPaste { get { return TileSelection != null && ResourceSelection != null; } }
+		public TileReference<ushort, byte>[,] TileSelection;
+		public TileReference<byte, byte>[,] ResourceSelection;
+		public CPos SelectionStart;
+		public CPos SelectionEnd;
+
+		public string NewActorOwner;
 
 		public event Action AfterChange = () => { };
 		public event Action<string> MousePositionChanged = _ => { };
+		public event Action<KeyValuePair<string, ActorReference>> ActorDoubleClicked = _ => { };
 
 		Dictionary<string, ActorTemplate> ActorTemplates = new Dictionary<string, ActorTemplate>();
 		Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
@@ -55,7 +65,7 @@ namespace OpenRA.Editor
 			Tool = null;
 		}
 
-		public void SetTool(ITool tool) { Tool = tool; }
+		public void SetTool(ITool tool) { Tool = tool; ClearSelection(); }
 
 		public void BindActorTemplates(IEnumerable<ActorTemplate> templates)
 		{
@@ -79,6 +89,8 @@ namespace OpenRA.Editor
 			UpdateStyles();
 		}
 
+		static readonly Pen SelectionPen = new Pen(Color.Blue);
+		static readonly Pen PastePen = new Pen(Color.Green);
 		static readonly Pen CordonPen = new Pen(Color.Red);
 		int2 MousePos;
 
@@ -88,6 +100,15 @@ namespace OpenRA.Editor
 			Invalidate();
 		}
 
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			base.OnDoubleClick(e);
+
+			var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
+			if (x.Key != null)
+				ActorDoubleClicked(x);
+		}
+
 		protected override void OnMouseWheel(MouseEventArgs e)
 		{
 			base.OnMouseWheel(e);
@@ -144,23 +165,23 @@ namespace OpenRA.Editor
 		void Erase()
 		{
 			// Crash preventing
-			var BrushLocation = GetBrushLocation();
+			var brushLocation = GetBrushLocation();
 
-			if (Map == null || BrushLocation.X >= Map.MapSize.X ||
-				BrushLocation.Y >= Map.MapSize.Y ||
-				BrushLocation.X < 0 ||
-				BrushLocation.Y < 0)
+			if (Map == null || brushLocation.X >= Map.MapSize.X ||
+				brushLocation.Y >= Map.MapSize.Y ||
+				brushLocation.X < 0 ||
+				brushLocation.Y < 0)
 				return;
 
 			Tool = null;
-			
-			var key = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == BrushLocation);
+
+			var key = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == brushLocation);
 			if (key.Key != null) Map.Actors.Value.Remove(key.Key);
 
-			if (Map.MapResources.Value[BrushLocation.X, BrushLocation.Y].type != 0)
+			if (Map.MapResources.Value[brushLocation.X, brushLocation.Y].type != 0)
 			{
-				Map.MapResources.Value[BrushLocation.X, BrushLocation.Y] = new TileReference<byte, byte>();
-				var ch = new int2((BrushLocation.X) / ChunkSize, (BrushLocation.Y) / ChunkSize);
+				Map.MapResources.Value[brushLocation.X, brushLocation.Y] = new TileReference<byte, byte>();
+				var ch = new int2((brushLocation.X) / ChunkSize, (brushLocation.Y) / ChunkSize);
 				if (Chunks.ContainsKey(ch))
 				{
 					Chunks[ch].Dispose();
@@ -169,12 +190,20 @@ namespace OpenRA.Editor
 			}
 
 			AfterChange();
+			ClearSelection();
 		}
 
 		void Draw()
 		{
-			if (Tool != null) Tool.Apply(this);
-			AfterChange();
+			if (Tool != null)
+			{
+				Tool.Apply(this);
+				AfterChange();
+			}
+			else if (IsPaste)
+				PasteSelection();
+			else
+				SelectionEnd = GetBrushLocationBR();
 		}
 
 		protected override void OnMouseDown(MouseEventArgs e)
@@ -186,7 +215,12 @@ namespace OpenRA.Editor
 			if (!IsPanning)
 			{
 				if (e.Button == MouseButtons.Right) Erase();
-				if (e.Button == MouseButtons.Left) Draw();
+				if (e.Button == MouseButtons.Left)
+				{
+					Draw();
+					if (!IsPaste)
+						SelectionStart = SelectionEnd = GetBrushLocation();
+				}
 			}
 
 			Invalidate();
@@ -198,9 +232,8 @@ 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),
+			var data = bitmap.LockBits(bitmap.Bounds(),
 				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
 
 			unsafe
@@ -212,7 +245,7 @@ namespace OpenRA.Editor
 					for (var j = 0; j < ChunkSize; j++)
 					{
 						var tr = Map.MapTiles.Value[u * ChunkSize + i, v * ChunkSize + j];
-						var tile = TileSet.Tiles[tr.type];
+						var tile = TileSet.Templates[tr.type].Data;
 						var index = (tr.index < tile.TileBitmapBytes.Count) ? tr.index : (byte)0;
 						var rawImage = tile.TileBitmapBytes[index];
 						for (var x = 0; x < TileSet.TileSize; x++)
@@ -222,7 +255,7 @@ namespace OpenRA.Editor
 						if (Map.MapResources.Value[u * ChunkSize + i, v * ChunkSize + j].type != 0)
 						{
 							var resourceImage = ResourceTemplates[Map.MapResources.Value[u * ChunkSize + i, v * ChunkSize + j].type].Bitmap;
-							var srcdata = resourceImage.LockBits(new Rectangle(0, 0, resourceImage.Width, resourceImage.Height),
+							var srcdata = resourceImage.LockBits(resourceImage.Bounds(),
 								ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
 
 							int* q = (int*)srcdata.Scan0.ToPointer();
@@ -242,34 +275,52 @@ 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;
 		}
 
-		public int2 GetBrushLocation()
+		public CPos GetBrushLocation()
 		{
 			var vX = (int)Math.Floor((MousePos.X - Offset.X) / Zoom);
 			var vY = (int)Math.Floor((MousePos.Y - Offset.Y) / Zoom);
-			return new int2(vX / TileSet.TileSize, vY / TileSet.TileSize);
+			return new CPos(vX / TileSet.TileSize, vY / TileSet.TileSize);
 		}
 
-		public void DrawActor(SGraphics g, int2 p, ActorTemplate t, ColorPalette cp)
+		public CPos GetBrushLocationBR()
+		{
+			var vX = (int)Math.Floor((MousePos.X - Offset.X) / Zoom);
+			var vY = (int)Math.Floor((MousePos.Y - Offset.Y) / Zoom);
+			return new CPos((vX + TileSet.TileSize - 1) / TileSet.TileSize,
+			                (vY + TileSet.TileSize - 1) / TileSet.TileSize);
+		}
+
+		public void DrawActor(SGraphics g, CPos p, ActorTemplate t, ColorPalette cp)
 		{
 			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
 			DrawImage(g, t.Bitmap, p, centered, cp);
 		}
 
-		float2 GetDrawPosition(int2 location, Bitmap bmp, bool centered)
+		float2 GetDrawPosition(CPos location, Bitmap bmp, bool centered)
 		{
-			float OffsetX = centered ? bmp.Width / 2 - TileSet.TileSize / 2 : 0;
-			float DrawX = TileSet.TileSize * location.X * Zoom + Offset.X - OffsetX;
+			float offsetX = centered ? bmp.Width / 2 - TileSet.TileSize / 2 : 0;
+			float drawX = TileSet.TileSize * location.X * Zoom + Offset.X - offsetX;
 
-			float OffsetY = centered ? bmp.Height / 2 - TileSet.TileSize / 2 : 0;
-			float DrawY = TileSet.TileSize * location.Y * Zoom + Offset.Y - OffsetY;
+			float offsetY = centered ? bmp.Height / 2 - TileSet.TileSize / 2 : 0;
+			float drawY = TileSet.TileSize * location.Y * Zoom + Offset.Y - offsetY;
 
-			return new float2(DrawX, DrawY);
+			return new float2(drawX, drawY);
 		}
 
-		public void DrawImage(SGraphics g, Bitmap bmp, int2 location, bool centered, ColorPalette cp)
+		public void DrawImage(SGraphics g, Bitmap bmp, CPos location, bool centered, ColorPalette cp)
 		{
 			var drawPos = GetDrawPosition(location, bmp, centered);
 
@@ -282,36 +333,41 @@ namespace OpenRA.Editor
 			if (cp != null) bmp.Palette = restorePalette;
 		}
 
-		void DrawActorBorder(System.Drawing.Graphics g, int2 p, ActorTemplate t)
+		void DrawActorBorder(SGraphics g, CPos p, ActorTemplate t)
 		{
 			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);
 		}
 
-		ColorPalette GetPaletteForPlayer(string name)
+		ColorPalette GetPaletteForPlayerInner(string name)
 		{
 			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));
+			var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.ColorRamp);
+			return new Palette(Palette, remap).AsSystemPalette();
 		}
 
 		Cache<string, ColorPalette> PlayerPalettes;
 
-		ColorPalette GetPaletteForActor(ActorReference ar)
+		public ColorPalette GetPaletteForPlayer(string player)
 		{
 			if (PlayerPalettes == null)
-				PlayerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayer);
+				PlayerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayerInner);
 
+			return PlayerPalettes[player];
+		}
+
+		ColorPalette GetPaletteForActor(ActorReference ar)
+		{
 			var ownerInit = ar.InitDict.GetOrDefault<OwnerInit>();
 			if (ownerInit == null)
 				return null;
 
-			return PlayerPalettes[ownerInit.PlayerName];
+			return GetPaletteForPlayer(ownerInit.PlayerName);
 		}
 
 		protected override void OnPaint(PaintEventArgs e)
@@ -340,11 +396,32 @@ namespace OpenRA.Editor
 				Map.Bounds.Width * TileSet.TileSize * Zoom,
 				Map.Bounds.Height * TileSet.TileSize * Zoom);
 
+			e.Graphics.DrawRectangle(SelectionPen,
+				(SelectionStart.X * TileSet.TileSize * Zoom) + Offset.X,
+				(SelectionStart.Y * TileSet.TileSize * Zoom) + Offset.Y,
+				(SelectionEnd - SelectionStart).X * TileSet.TileSize * Zoom,
+				(SelectionEnd - SelectionStart).Y * TileSet.TileSize * Zoom);
+
+			if (IsPaste)
+			{
+				var loc = GetBrushLocation();
+				var width = Math.Abs((SelectionStart - SelectionEnd).X);
+				var height = Math.Abs((SelectionStart - SelectionEnd).Y);
+
+				e.Graphics.DrawRectangle(PastePen,
+					(loc.X * TileSet.TileSize * Zoom) + Offset.X,
+					(loc.Y * TileSet.TileSize * Zoom) + Offset.Y,
+					width * (TileSet.TileSize * Zoom),
+					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)
@@ -358,7 +435,7 @@ namespace OpenRA.Editor
 
 			if (Tool != null)
 				Tool.Preview(this, e.Graphics);
-				
+
 			if (Tool == null)
 			{
 				var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
@@ -366,13 +443,74 @@ namespace OpenRA.Editor
 					DrawActorBorder(e.Graphics, x.Value.Location(), ActorTemplates[x.Value.Type]);
 			}
 		}
+
+		public void CopySelection()
+		{
+			// Grab tiles and resources within selection (doesn't do actors)
+			var start = SelectionStart;
+			var end = SelectionEnd;
+
+			if (start == end) return;
+
+			int width = Math.Abs((start - end).X);
+			int height = Math.Abs((start - end).Y);
+
+			TileSelection = new TileReference<ushort, byte>[width, height];
+			ResourceSelection = new TileReference<byte, byte>[width, height];
+
+			for (int x = 0; x < width; x++)
+			{
+				for (int y = 0; y < height; y++)
+				{
+					//todo: crash prevention
+					TileSelection[x, y] = Map.MapTiles.Value[start.X + x, start.Y + y];
+					ResourceSelection[x, y] = Map.MapResources.Value[start.X + x, start.Y + y];
+				}
+			}
+		}
+
+		void PasteSelection()
+		{
+			var loc = GetBrushLocation();
+			var width = Math.Abs((SelectionStart - SelectionEnd).X);
+			var height = Math.Abs((SelectionStart - SelectionEnd).Y);
+
+			for (int x = 0; x < width; x++)
+			{
+				for (int y = 0; y < height; y++)
+				{
+					var mapX = loc.X + x;
+					var mapY = loc.Y + y;
+
+					//todo: crash prevention for outside of bounds
+					Map.MapTiles.Value[mapX, mapY] = TileSelection[x, y];
+					Map.MapResources.Value[mapX, mapY] = ResourceSelection[x, y];
+
+					var ch = new int2(mapX / ChunkSize, mapY / ChunkSize);
+					if (Chunks.ContainsKey(ch))
+					{
+						Chunks[ch].Dispose();
+						Chunks.Remove(ch);
+					}
+				}
+			}
+			AfterChange();
+		}
+
+		void ClearSelection()
+		{
+			SelectionStart = CPos.Zero;
+			SelectionEnd = CPos.Zero;
+			TileSelection = null;
+			ResourceSelection = null;
+		}
 	}
 
 	static class ActorReferenceExts
 	{
-		public static int2 Location(this ActorReference ar)
+		public static CPos Location(this ActorReference ar)
 		{
-			return ar.InitDict.Get<LocationInit>().value;
+			return (CPos)ar.InitDict.Get<LocationInit>().value;
 		}
 
 		public static void DrawStringContrast(this SGraphics g, Font f, string s, int x, int y, Brush fg, Brush bg)

OpenRA.FileFormats/ColorHSLR.cs

@@ -1,64 +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.Drawing;
-
-namespace OpenRA.FileFormats
-{
-    public struct ColorRamp
-    {
-        public byte H,S,L,R;
-
-        public ColorRamp(byte h, byte s, byte l, byte r)
-        {
-            H = h; S = s; L = l; R = r;
-        }
-
-        /* returns a color along the Lum ramp */
-        public Color GetColor( float t )
-        {
-            return ColorFromHSL( H / 255f, S / 255f, float2.Lerp( L / 255f, L*R / (255f * 255f), t ) );
-        }
-
-        public override string ToString()
-        {
-            return "{0},{1},{2},{3}".F(H, S, L, R);
-        }
-
-        // hk is hue in the range [0,1] instead of [0,360]
-		public static Color ColorFromHSL(float hk, float s, float l)
-		{
-			// Convert from HSL to RGB
-			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
-			var p = 2 * l - q;
-
-			float[] trgb = { hk + 1 / 3.0f,
-							  hk,
-							  hk - 1/3.0f };
-			float[] rgb = { 0, 0, 0 };
-
-			for (int k = 0; k < 3; k++)
-			{
-				while (trgb[k] < 0) trgb[k] += 1.0f;
-				while (trgb[k] > 1) trgb[k] -= 1.0f;
-			}
-
-			for (int k = 0; k < 3; k++)
-			{
-				if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
-				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
-				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
-				else { rgb[k] = p; }
-			}
-
-			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
-		}
-    }
-}

OpenRA.FileFormats/ColorRamp.cs

@@ -0,0 +1,80 @@
+#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.Drawing;
+
+namespace OpenRA.FileFormats
+{
+	public struct ColorRamp
+	{
+		public byte H,S,L,R;
+
+		public ColorRamp(byte h, byte s, byte l, byte r)
+		{
+			H = h; S = s; L = l; R = r;
+		}
+
+		/* returns a color along the Lum ramp */
+		public Color GetColor( float t )
+		{
+			return ColorFromHSL( H / 255f, S / 255f, float2.Lerp( L / 255f, L*R / (255f * 255f), t ) );
+		}
+
+		public override string ToString()
+		{
+			return "{0},{1},{2},{3}".F(H, S, L, R);
+		}
+
+		// hk is hue in the range [0,1] instead of [0,360]
+		static Color ColorFromHSL(float hk, float s, float l)
+		{
+			// Convert from HSL to RGB
+			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
+			var p = 2 * l - q;
+
+			float[] trgb = { hk + 1 / 3.0f, hk, hk - 1/3.0f };
+			float[] rgb = { 0, 0, 0 };
+
+			for (int k = 0; k < 3; k++)
+			{
+				while (trgb[k] < 0) trgb[k] += 1.0f;
+				while (trgb[k] > 1) trgb[k] -= 1.0f;
+			}
+
+			for (int k = 0; k < 3; k++)
+			{
+				if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
+				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
+				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
+				else { rgb[k] = p; }
+			}
+
+			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
+		}
+
+		public static bool operator ==(ColorRamp me, ColorRamp other)
+		{
+			return (me.H == other.H && me.S == other.S && me.L == other.L && me.R == other.R );
+		}
+
+		public static bool operator !=(ColorRamp me, ColorRamp other) { return !(me == other); }
+
+		public override int GetHashCode() { return H.GetHashCode() ^ S.GetHashCode() ^ L.GetHashCode() ^ R.GetHashCode(); }
+
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
+
+			ColorRamp o = (ColorRamp)obj;
+			return o == this;
+		}
+	}
+}

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)
@@ -107,52 +113,153 @@ namespace OpenRA
 			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)
+			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 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 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 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> 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;
+		}
+
+		public static Size NextPowerOf2(this Size s) { return new Size(NextPowerOf2(s.Width), NextPowerOf2(s.Height)); }
+
+		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
+		{
+			return string.Join(j, ts.Select(t => t.ToString()).ToArray());
+		}
+
+		public static IEnumerable<T> Append<T>( this IEnumerable<T> ts, params T[] moreTs)
+		{
+			return ts.Concat(moreTs);
+		}
+
+		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
+		{
+			return ToDictionaryWithConflictLog(source, keySelector, x => x, debugName, logKey, logValue);
+		}
+
+		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector, string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
+		{
+			// Fall back on ToString() if null functions are provided:
+			logKey = logKey ?? (s => s.ToString());
+			logValue = logValue ?? (s => s.ToString());
+
+			// Try to build a dictionary and log all duplicates found (if any):
+			var dupKeys = new Dictionary<TKey, List<string>>();
+			var d = new Dictionary<TKey, TElement>();
+			foreach (var item in source)
+			{
+				TKey key = keySelector(item);
+				TElement element = elementSelector(item);
+
+				// Check for a key conflict:
+				if (d.ContainsKey(key))
+				{
+					List<string> dupKeyMessages;
+					if (!dupKeys.TryGetValue(key, out dupKeyMessages))
+					{
+						// Log the initial conflicting value already inserted:
+						dupKeyMessages = new List<string>();
+						dupKeyMessages.Add(logValue(d[key]));
+						dupKeys.Add(key, dupKeyMessages);
+					}
+
+					// Log this conflicting value:
+					dupKeyMessages.Add(logValue(element));
+					continue;
+				}
+
+				d.Add(key, element);
+			}
+
+			// If any duplicates were found, log it and throw a descriptive error
+			if (dupKeys.Count > 0)
+			{
+				string badKeysFormatted = String.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), String.Join(",", p.Value.ToArray()))).ToArray());
+				string msg = "{0}, duplicate values found for the following keys: {1}".F(debugName, badKeysFormatted);
+				Log.Write("debug", msg);
+				throw new ArgumentException(msg);
+			}
+
+			// Return the dictionary we built:
+			return d;
+		}
+
+		public static Color ColorLerp(float t, Color c1, Color c2)
+		{
+			return Color.FromArgb(
+				(int)(t * c2.A + (1 - t) * c1.A),
+				(int)(t * c2.R + (1 - t) * c1.R),
+				(int)(t * c2.G + (1 - t) * c1.G),
+				(int)(t * c2.B + (1 - t) * c1.B));
+		}
+
+		public static T[] MakeArray<T>(int count, Func<int, T> f)
+		{
+			T[] result = new T[count];
+			for (int i = 0; i < count; i++)
+				result[i] = f(i);
+
+			return result;
+		}
+
+		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
+	}
+
+	public static class Enum<T>
+	{
+		public static T Parse(string s) { return (T)Enum.Parse(typeof(T), s); }
+		public static T[] GetValues() { return (T[])Enum.GetValues(typeof(T)); }
 	}
 }

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.
@@ -56,6 +56,11 @@ namespace OpenRA.FileFormats
 				ret = GetValue( fieldName, fieldType, n[ 0 ].Value.Value );
 				return true;
 			}
+			else if ( n.Count > 1 )
+			{
+				throw new InvalidOperationException("The field {0} has multiple definitions:\n{1}"
+					.F(fieldName, n.Select(m => "\t- " + m.Location).JoinWith("\n")));
+			}
 			throw new InvalidOperationException( "TryGetValueFromYaml: unable to load field {0} (of type {1})".F( fieldName, fieldType ) );
 		}
 
@@ -66,16 +71,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 +122,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 +130,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);
 			}
@@ -126,64 +148,71 @@ namespace OpenRA.FileFormats
 				return InvalidValueAction(x,fieldType, field);
 			}
 
-            else if (fieldType == typeof(ColorRamp))
-            {
-                var parts = x.Split(',');
-                if (parts.Length == 4)
-                    return new ColorRamp(
-                        (byte)int.Parse(parts[0]).Clamp(0, 255),
-                        (byte)int.Parse(parts[1]).Clamp(0, 255),
-                        (byte)int.Parse(parts[2]).Clamp(0, 255),
-                        (byte)int.Parse(parts[3]).Clamp(0, 255));
+			else if (fieldType == typeof(ColorRamp))
+			{
+				var parts = x.Split(',');
+				if (parts.Length == 4)
+					return new ColorRamp(
+						(byte)int.Parse(parts[0]).Clamp(0, 255),
+						(byte)int.Parse(parts[1]).Clamp(0, 255),
+						(byte)int.Parse(parts[2]).Clamp(0, 255),
+						(byte)int.Parse(parts[3]).Clamp(0, 255));
 
-                return InvalidValueAction(x, fieldType, field);
-            }
+				return InvalidValueAction(x, fieldType, field);
+			}
 
-            else if (fieldType.IsEnum)
-            {
-                if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
-                    return InvalidValueAction(x, fieldType, field);
-                return Enum.Parse(fieldType, x, true);
-            }
+			else if (fieldType.IsEnum)
+			{
+				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
+					return InvalidValueAction(x, fieldType, field);
+				return Enum.Parse(fieldType, x, true);
+			}
 
-            else if (fieldType == typeof(bool))
-                return ParseYesNo(x, fieldType, field);
+			else if (fieldType == typeof(bool))
+				return ParseYesNo(x, fieldType, field);
 
-            else if (fieldType.IsArray)
-            {
-                if (x == null)
-                    return Array.CreateInstance(fieldType.GetElementType(), 0);
+			else if (fieldType.IsArray)
+			{
+				if (x == null)
+					return Array.CreateInstance(fieldType.GetElementType(), 0);
 
-                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
-                var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
-                for (int i = 0; i < parts.Length; i++)
-                    ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
-                return ret;
-            }
-            else if (fieldType == typeof(int2))
-            {
-                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
-            }
-            else if (fieldType == typeof(float2))
-            {
-                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                float xx = 0;
-                float yy = 0;
-                float res;
-                if (float.TryParse(parts[0].Replace("%", ""), out res))
-                    xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
-                if (float.TryParse(parts[1].Replace("%", ""), out res))
-                    yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
-                return new float2(xx, yy);
-            }
+				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
+				for (int i = 0; i < parts.Length; i++)
+					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
+				return ret;
+			}
+			else if (fieldType == typeof(int2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
+			}
+			else if (fieldType == typeof(float2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				float xx = 0;
+				float yy = 0;
+				float res;
+				if (float.TryParse(parts[0].Replace("%", ""), out res))
+					xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
+				if (float.TryParse(parts[1].Replace("%", ""), out res))
+					yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
+				return new float2(xx, yy);
+			}
 			else if (fieldType == typeof(Rectangle))
-            {
-                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]));
-            }
-			
+			{
+				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 +236,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,15 +309,14 @@ namespace OpenRA.FileFormats
 		{
 			return new MiniYamlNode(field, FieldSaver.FormatValue( o, o.GetType().GetField(field) ));
 		}
-		
-		public static string FormatValue(object o, FieldInfo f)
+
+		public static string FormatValue(object v, Type t)
 		{
-			var v = f.GetValue(o);
 			if (v == null)
 				return "";
 
 			// Color.ToString() does the wrong thing; force it to format as an array
-			if (f.FieldType == typeof(Color))
+			if (t == typeof(Color))
 			{
 				var c = (Color)v;
 				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
@@ -300,15 +324,29 @@ namespace OpenRA.FileFormats
 					((int)c.G).Clamp(0, 255),
 					((int)c.B).Clamp(0, 255));
 			}
-			else if (f.FieldType == typeof(Rectangle))
+
+			// Don't save floats in settings.yaml using country-specific decimal separators which can be misunderstood as group seperators.
+			if (t == typeof(float))
+				return ((float)v).ToString(CultureInfo.InvariantCulture);
+
+			if (t == 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 (t.IsArray)
+			{
+				var elems = ((Array)v).OfType<object>();
+				return elems.JoinWith(",");
+			}
+
+			return v.ToString();
+		}
+
+		public static string FormatValue(object o, FieldInfo f)
+		{
+			return FormatValue(f.GetValue(o), f.FieldType);
 		}
 	}
 

OpenRA.FileFormats/FileFormats/AudLoader.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.
@@ -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,9 +140,9 @@ namespace OpenRA.FileFormats
 					var t = DecodeSample(b, 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;

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,19 +178,19 @@ namespace OpenRA.FileFormats
 			}
 		}
 	}
-	
+
 	class BitReader
 	{
 		readonly byte[] src;
-        int offset = 0;
+		int offset = 0;
 		int bitBuffer = 0;
 		int bitCount = 0;
 
 		public BitReader(byte[] src)
 		{
-            this.src = src;
+			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.
@@ -13,516 +13,482 @@ using System.Linq;
 
 namespace OpenRA.FileFormats
 {
-    /* possibly the fugliest C# i've ever seen. */
+	/* possibly the fugliest C# i've ever seen. */
 
-    class BlowfishKeyProvider
-    {
-        const string pubkeyStr = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
+	class BlowfishKeyProvider
+	{
+		const string pubkeyStr = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
 
-        static sbyte[] char2num = {
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
-    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
-    -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-    -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+		class PublicKey
+		{
+			public uint[] key1 = new uint[64];
+			public uint[] key2 = new uint[64];
+			public uint len;
+		}
+		PublicKey pubkey = new PublicKey();
 
-        class PublicKey
-        {
-            public uint[] key1 = new uint[64];
-            public uint[] key2 = new uint[64];
-            public uint len;
-        }
-        PublicKey pubkey = new PublicKey();
+		uint[] glob1 = new uint[64];
+		uint glob1_bitlen, glob1_len_x2;
+		uint[] glob2 = new uint[130];
+		uint[] glob1_hi = new uint[4];
+		uint[] glob1_hi_inv = new uint[4];
+		uint glob1_hi_bitlen;
+		uint glob1_hi_inv_lo, glob1_hi_inv_hi;
 
-        uint[] glob1 = new uint[64];
-        uint glob1_bitlen, glob1_len_x2;
-        uint[] glob2 = new uint[130];
-        uint[] glob1_hi = new uint[4];
-        uint[] glob1_hi_inv = new uint[4];
-        uint glob1_hi_bitlen;
-        uint glob1_hi_inv_lo, glob1_hi_inv_hi;
+		void init_bignum(uint[] n, uint val, uint len)
+		{
+			for (int i = 0; i < len; i++) n[i] = 0;
+			n[0] = val;
+		}
 
-        void init_bignum(uint[] n, uint val, uint len)
-        {
-            for (int i = 0; i < len; i++) n[i] = 0;
-            n[0] = val;
-        }
+		void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
+		{
+			byte sign;
 
-        void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
-        {
-            byte sign;
+			if ((key[0] & 0x80) != 0) sign = 0xff;
+			else sign = 0;
 
-            if ((key[0] & 0x80) != 0) sign = 0xff;
-            else sign = 0;
+			unsafe
+			{
+				fixed (uint* _pn = &n[0])
+				{
+					byte* pn = (byte*)_pn;
+					uint i = blen * 4;
+					for (; i > klen; i--) pn[i - 1] = (byte)sign;
+					for (; i > 0; i--) pn[i - 1] = key[klen - i];
+				}
+			}
+		}
 
-            unsafe
-            {
-                fixed (uint* _pn = &n[0])
-                {
-                    byte* pn = (byte*)_pn;
-                    uint i = blen * 4;
-                    for (; i > klen; i--) pn[i - 1] = (byte)sign;
-                    for (; i > 0; i--) pn[i - 1] = key[klen - i];
-                }
-            }
-        }
+		void key_to_bignum(uint[] n, byte[] key, uint len)
+		{
+			uint keylen;
+			int i;
 
-        void key_to_bignum(uint[] n, byte[] key, uint len)
-        {
-            uint keylen;
-            int i;
+			int j = 0;
 
-            int j = 0;
+			if (key[j] != 2) return;
+			j++;
 
-            if (key[j] != 2) return;
-            j++;
+			if ((key[j] & 0x80) != 0)
+			{
+				keylen = 0;
+				for (i = 0; i < (key[j] & 0x7f); i++) keylen = (keylen << 8) | key[j + i + 1];
+				j += (key[j] & 0x7f) + 1;
+			}
+			else
+			{
+				keylen = key[j];
+				j++;
+			}
+			if (keylen <= len * 4)
+				move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
+		}
 
-            if ((key[j] & 0x80) != 0)
-            {
-                keylen = 0;
-                for (i = 0; i < (key[j] & 0x7f); i++) keylen = (keylen << 8) | key[j + i + 1];
-                j += (key[j] & 0x7f) + 1;
-            }
-            else
-            {
-                keylen = key[j];
-                j++;
-            }
-            if (keylen <= len * 4)
-                move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
-        }
+		uint len_bignum(uint[] n, uint len)
+		{
+			uint i;
+			i = len - 1;
+			while ((i >= 0) && (n[i] == 0)) i--;
+			return i + 1;
+		}
 
-        uint len_bignum(uint[] n, uint len)
-        {
-            uint i;
-            i = len - 1;
-            while ((i >= 0) && (n[i] == 0)) i--;
-            return i + 1;
-        }
+		uint bitlen_bignum(uint[] n, uint len)
+		{
+			uint ddlen, bitlen, mask;
+			ddlen = len_bignum(n, len);
+			if (ddlen == 0) return 0;
+			bitlen = ddlen * 32;
+			mask = 0x80000000;
+			while ((mask & n[ddlen - 1]) == 0)
+			{
+				mask >>= 1;
+				bitlen--;
+			}
+			return bitlen;
+		}
 
-        uint bitlen_bignum(uint[] n, uint len)
-        {
-            uint ddlen, bitlen, mask;
-            ddlen = len_bignum(n, len);
-            if (ddlen == 0) return 0;
-            bitlen = ddlen * 32;
-            mask = 0x80000000;
-            while ((mask & n[ddlen - 1]) == 0)
-            {
-                mask >>= 1;
-                bitlen--;
-            }
-            return bitlen;
-        }
+		void init_pubkey()
+		{
+			init_bignum(pubkey.key2, 0x10001, 64);
 
-        void init_pubkey()
-        {
-            int i = 0;
-            uint i2, tmp;
-            byte[] keytmp = new byte[256];
+			key_to_bignum(pubkey.key1, Convert.FromBase64String(pubkeyStr), 64);
+			pubkey.len = bitlen_bignum(pubkey.key1, 64) - 1;
+		}
 
-            init_bignum(pubkey.key2, 0x10001, 64);
+		uint len_predata()
+		{
+			uint a = (pubkey.len - 1) / 8;
+			return (55 / a + 1) * (a + 1);
+		}
 
-            i2 = 0;
-            while (i < pubkeyStr.Length)
-            {
-                tmp = (uint)char2num[pubkeyStr[i++]];
-                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
-                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
-                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
-                keytmp[i2++] = (byte)((tmp >> 16) & 0xff);
-                keytmp[i2++] = (byte)((tmp >> 8) & 0xff);
-                keytmp[i2++] = (byte)(tmp & 0xff);
-            }
+		int cmp_bignum(uint[] n1, uint[] n2, uint len)
+		{
 
-            key_to_bignum(pubkey.key1, keytmp, 64);
-            pubkey.len = bitlen_bignum(pubkey.key1, 64) - 1;
-        }
+			while (len > 0)
+			{
+				--len;
+				if (n1[len] < n2[len]) return -1;
+				if (n1[len] > n2[len]) return 1;
+			}
+			return 0;
+		}
 
-        uint len_predata()
-        {
-            uint a = (pubkey.len - 1) / 8;
-            return (55 / a + 1) * (a + 1);
-        }
+		void mov_bignum(uint[] dest, uint[] src, uint len)
+		{
+			Array.Copy(src, dest, len);
+		}
 
-        int cmp_bignum(uint[] n1, uint[] n2, uint len)
-        {
+		void shr_bignum(uint[] n, int bits, int len)
+		{
+			int i; int i2 = bits / 32;
 
-            while (len > 0)
-            {
-                --len;
-                if (n1[len] < n2[len]) return -1;
-                if (n1[len] > n2[len]) return 1;
-            }
-            return 0;
-        }
+			if (i2 > 0)
+			{
+				for (i = 0; i < len - i2; i++) n[i] = n[i + i2];
+				for (; i < len; i++) n[i] = 0;
+				bits = bits % 32;
+			}
+			if (bits == 0) return;
+			for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 -
+		  bits));
+			n[i] = n[i] >> bits;
+		}
 
-        void mov_bignum(uint[] dest, uint[] src, uint len)
-        {
-            Array.Copy(src, dest, len);
-        }
+		void shl_bignum(uint[] n, int bits, int len)
+		{
+			int i, i2;
 
-        void shr_bignum(uint[] n, int bits, int len)
-        {
-            int i; int i2 = bits / 32;
+			i2 = bits / 32;
+			if (i2 > 0)
+			{
+				for (i = len - 1; i > i2; i--) n[i] = n[i - i2];
+				for (; i > 0; i--) n[i] = 0;
+				bits = bits % 32;
+			}
+			if (bits == 0) return;
+			for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 -
+		  bits));
+			n[0] <<= bits;
+		}
 
-            if (i2 > 0)
-            {
-                for (i = 0; i < len - i2; i++) n[i] = n[i + i2];
-                for (; i < len; i++) n[i] = 0;
-                bits = bits % 32;
-            }
-            if (bits == 0) return;
-            for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 -
-          bits));
-            n[i] = n[i] >> bits;
-        }
+		uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
+		{
+			uint i1, i2;
 
-        void shl_bignum(uint[] n, int bits, int len)
-        {
-            int i, i2;
+			len += len;
+			unsafe
+			{
+				fixed (uint* _ps1 = &src1[0])
+				fixed (uint* _ps2 = &src2[0])
+				fixed (uint* _pd = &dest[0])
+				{
+					ushort* ps1 = (ushort*)_ps1;
+					ushort* ps2 = (ushort*)_ps2;
+					ushort* pd = (ushort*)_pd;
 
-            i2 = bits / 32;
-            if (i2 > 0)
-            {
-                for (i = len - 1; i > i2; i--) n[i] = n[i - i2];
-                for (; i > 0; i--) n[i] = 0;
-                bits = bits % 32;
-            }
-            if (bits == 0) return;
-            for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 -
-          bits));
-            n[0] <<= bits;
-        }
+					while (--len != -1)
+					{
+						i1 = *ps1++;
+						i2 = *ps2++;
+						*pd++ = (ushort)(i1 - i2 - carry);
+						if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
+					}
+				}
+			}
+			return carry;
+		}
 
-        uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
-        {
-            uint i1, i2;
+		unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
+		{
+			uint i1, i2;
 
-            len += len;
-            unsafe
-            {
-                fixed (uint* _ps1 = &src1[0])
-                fixed (uint* _ps2 = &src2[0])
-                fixed (uint* _pd = &dest[0])
-                {
-                    ushort* ps1 = (ushort*)_ps1;
-                    ushort* ps2 = (ushort*)_ps2;
-                    ushort* pd = (ushort*)_pd;
+			len += len;
 
-                    while (--len != -1)
-                    {
-                        i1 = *ps1++;
-                        i2 = *ps2++;
-                        *pd++ = (ushort)(i1 - i2 - carry);
-                        if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
-                    }
-                }
-            }
-            return carry;
-        }
+			ushort* ps1 = (ushort*)src1;
+			ushort* ps2 = (ushort*)src2;
+			ushort* pd = (ushort*)dest;
 
-        unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
-        {
-            uint i1, i2;
+			while (--len != -1)
+			{
+				i1 = *ps1++;
+				i2 = *ps2++;
+				*pd++ = (ushort)(i1 - i2 - carry);
+				if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
 
-            len += len;
+			}
+			return carry;
+		}
 
-            ushort* ps1 = (ushort*)src1;
-            ushort* ps2 = (ushort*)src2;
-            ushort* pd = (ushort*)dest;
+		void inv_bignum(uint[] n1, uint[] n2, uint len)
+		{
+			uint[] n_tmp = new uint[64];
+			uint n2_bytelen, bit;
+			int n2_bitlen;
 
-            while (--len != -1)
-            {
-                i1 = *ps1++;
-                i2 = *ps2++;
-                *pd++ = (ushort)(i1 - i2 - carry);
-                if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
+			int j = 0;
 
-            }
-            return carry;
-        }
+			init_bignum(n_tmp, 0, len);
+			init_bignum(n1, 0, len);
+			n2_bitlen = (int)bitlen_bignum(n2, len);
+			bit = ((uint)1) << (n2_bitlen % 32);
+			j = ((n2_bitlen + 32) / 32) - 1;
+			n2_bytelen = (uint)((n2_bitlen - 1) / 32) * 4;
+			n_tmp[n2_bytelen / 4] |= ((uint)1) << ((n2_bitlen - 1) & 0x1f);
 
-        void inv_bignum(uint[] n1, uint[] n2, uint len)
-        {
-            uint[] n_tmp = new uint[64];
-            uint n2_bytelen, bit;
-            int n2_bitlen;
+			while (n2_bitlen > 0)
+			{
+				n2_bitlen--;
+				shl_bignum(n_tmp, 1, (int)len);
+				if (cmp_bignum(n_tmp, n2, len) != -1)
+				{
+					sub_bignum(n_tmp, n_tmp, n2, 0, (int)len);
+					n1[j] |= bit;
+				}
+				bit >>= 1;
+				if (bit == 0)
+				{
+					j--;
+					bit = 0x80000000;
+				}
+			}
+			init_bignum(n_tmp, 0, len);
+		}
 
-            int j = 0;
+		void inc_bignum(uint[] n, uint len)
+		{
+			int i = 0;
+			while ((++n[i] == 0) && (--len > 0)) i++;
+		}
 
-            init_bignum(n_tmp, 0, len);
-            init_bignum(n1, 0, len);
-            n2_bitlen = (int)bitlen_bignum(n2, len);
-            bit = ((uint)1) << (n2_bitlen % 32);
-            j = ((n2_bitlen + 32) / 32) - 1;
-            n2_bytelen = (uint)((n2_bitlen - 1) / 32) * 4;
-            n_tmp[n2_bytelen / 4] |= ((uint)1) << ((n2_bitlen - 1) & 0x1f);
+		void init_two_dw(uint[] n, uint len)
+		{
+			mov_bignum(glob1, n, len);
+			glob1_bitlen = bitlen_bignum(glob1, len);
+			glob1_len_x2 = (glob1_bitlen + 15) / 16;
+			mov_bignum(glob1_hi, glob1.Skip((int)len_bignum(glob1, len) - 2).ToArray(), 2);
+			glob1_hi_bitlen = bitlen_bignum(glob1_hi, 2) - 32;
+			shr_bignum(glob1_hi, (int)glob1_hi_bitlen, 2);
+			inv_bignum(glob1_hi_inv, glob1_hi, 2);
+			shr_bignum(glob1_hi_inv, 1, 2);
+			glob1_hi_bitlen = (glob1_hi_bitlen + 15) % 16 + 1;
+			inc_bignum(glob1_hi_inv, 2);
+			if (bitlen_bignum(glob1_hi_inv, 2) > 32)
+			{
+				shr_bignum(glob1_hi_inv, 1, 2);
+				glob1_hi_bitlen--;
+			}
+			glob1_hi_inv_lo = (ushort)glob1_hi_inv[0];
+			glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
+		}
 
-            while (n2_bitlen > 0)
-            {
-                n2_bitlen--;
-                shl_bignum(n_tmp, 1, (int)len);
-                if (cmp_bignum(n_tmp, n2, len) != -1)
-                {
-                    sub_bignum(n_tmp, n_tmp, n2, 0, (int)len);
-                    n1[j] |= bit;
-                }
-                bit >>= 1;
-                if (bit == 0)
-                {
-                    j--;
-                    bit = 0x80000000;
-                }
-            }
-            init_bignum(n_tmp, 0, len);
-        }
+		unsafe void mul_bignum_word(ushort *pn1, uint[] n2, uint mul, uint len)
+		{
+			uint i, tmp;
+			unsafe
+			{
+				fixed (uint* _pn2 = &n2[0])
+				{
+					ushort* pn2 = (ushort*)_pn2;
 
-        void inc_bignum(uint[] n, uint len)
-        {
-            int i = 0;
-            while ((++n[i] == 0) && (--len > 0)) i++;
-        }
+					tmp = 0;
+					for (i = 0; i < len; i++)
+					{
+						tmp = mul * (*pn2) + (*pn1) + tmp;
+						*pn1 = (ushort)tmp;
+						pn1++;
+						pn2++;
+						tmp >>= 16;
+					}
+					*pn1 += (ushort)tmp;
+				}
+			}
+		}
 
-        void init_two_dw(uint[] n, uint len)
-        {
-            mov_bignum(glob1, n, len);
-            glob1_bitlen = bitlen_bignum(glob1, len);
-            glob1_len_x2 = (glob1_bitlen + 15) / 16;
-            mov_bignum(glob1_hi, glob1.Skip((int)len_bignum(glob1, len) - 2).ToArray(), 2);
-            glob1_hi_bitlen = bitlen_bignum(glob1_hi, 2) - 32;
-            shr_bignum(glob1_hi, (int)glob1_hi_bitlen, 2);
-            inv_bignum(glob1_hi_inv, glob1_hi, 2);
-            shr_bignum(glob1_hi_inv, 1, 2);
-            glob1_hi_bitlen = (glob1_hi_bitlen + 15) % 16 + 1;
-            inc_bignum(glob1_hi_inv, 2);
-            if (bitlen_bignum(glob1_hi_inv, 2) > 32)
-            {
-                shr_bignum(glob1_hi_inv, 1, 2);
-                glob1_hi_bitlen--;
-            }
-            glob1_hi_inv_lo = (ushort)glob1_hi_inv[0];
-            glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
-        }
+		void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
+		{
+		  uint i;
 
-        unsafe void mul_bignum_word(ushort *pn1, uint[] n2, uint mul, uint len)
-        {
-            uint i, tmp;
-            unsafe
-            {
-                fixed (uint* _pn2 = &n2[0])
-                {
-                    ushort* pn2 = (ushort*)_pn2;
+		  unsafe
+		  {
+			  fixed( uint * _psrc2 = &src2[0] )
+			  fixed(uint* _pdest = &dest[0])
+			  {
+				  ushort* psrc2 = (ushort*)_psrc2;
+				  ushort* pdest = (ushort*)_pdest;
 
-                    tmp = 0;
-                    for (i = 0; i < len; i++)
-                    {
-                        tmp = mul * (*pn2) + (*pn1) + tmp;
-                        *pn1 = (ushort)tmp;
-                        pn1++;
-                        pn2++;
-                        tmp >>= 16;
-                    }
-                    *pn1 += (ushort)tmp;
-                }
-            }
-        }
+				  init_bignum(dest, 0, len * 2);
+				  for (i = 0; i < len * 2; i++)
+					  mul_bignum_word(pdest++, src1, *psrc2++, len * 2);
+			  }
+		  }
+		}
 
-        void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
-        {
-          uint i;
+		void not_bignum(uint[] n, uint len)
+		{
+		  uint i;
+		  for (i = 0; i < len; i++) n[i] = ~n[i];
+		}
 
-          unsafe
-          {
-              fixed( uint * _psrc2 = &src2[0] )
-              fixed(uint* _pdest = &dest[0])
-              {
-                  ushort* psrc2 = (ushort*)_psrc2;
-                  ushort* pdest = (ushort*)_pdest;
+		void neg_bignum(uint[] n, uint len)
+		{
+		  not_bignum(n, len);
+		  inc_bignum(n, len);
+		}
 
-                  init_bignum(dest, 0, len * 2);
-                  for (i = 0; i < len * 2; i++)
-                      mul_bignum_word(pdest++, src1, *psrc2++, len * 2);
-              }
-          }
-        }
+		unsafe uint get_mulword(uint* n)
+		{
+			ushort* wn = (ushort*)n;
+			uint i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
+				 + (((*(wn - 2) ^ 0xffff) * glob1_hi_inv_hi + glob1_hi_inv_hi) >> 1) + 1)
+				 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_hi) >> 1) +
+				 (((*wn ^ 0xffff) * glob1_hi_inv_lo) >> 1) + 1) >> 14) + glob1_hi_inv_hi
+				 * (*wn ^ 0xffff) * 2) >> (int)glob1_hi_bitlen);
+			if (i > 0xffff) i = 0xffff;
+			return i & 0xffff;
+		}
 
-        void not_bignum(uint[] n, uint len)
-        {
-          uint i;
-          for (i = 0; i < len; i++) n[i] = ~n[i];
-        }
+		void dec_bignum(uint[] n, uint len)
+		{
+			int i = 0;
+			while ((--n[i] == 0xffffffff) && (--len > 0))
+				i++;
+		}
 
-        void neg_bignum(uint[] n, uint len)
-        {
-          not_bignum(n, len);
-          inc_bignum(n, len);
-        }
+		void calc_a_bignum(uint[] n1, uint[] n2, uint[] n3, uint len)
+		{
+			uint g2_len_x2, len_diff;
+			unsafe
+			{
+				fixed( uint* g1 = &glob1[0])
+				fixed (uint* g2 = &glob2[0])
+				{
+					mul_bignum(glob2, n2, n3, len);
+					glob2[len * 2] = 0;
+					g2_len_x2 = len_bignum(glob2, len * 2 + 1) * 2;
+					if (g2_len_x2 >= glob1_len_x2)
+					{
+						inc_bignum(glob2, len * 2 + 1);
+						neg_bignum(glob2, len * 2 + 1);
+						len_diff = g2_len_x2 + 1 - glob1_len_x2;
+						ushort* esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
+						ushort* edi = ((ushort*)g2) + (g2_len_x2 + 1);
+						for (; len_diff != 0; len_diff--)
+						{
+							edi--;
+							uint tmp = get_mulword((uint*)edi);
+							esi--;
+							if (tmp > 0)
+							{
+								mul_bignum_word(esi, glob1, tmp, 2 * len);
+								if ((*edi & 0x8000) == 0)
+								{
+									if (0 != sub_bignum((uint*)esi, (uint*)esi, g1, 0, (int)len)) (*edi)--;
+								}
+							}
+						}
+						neg_bignum(glob2, len);
+						dec_bignum(glob2, len);
+					}
+					mov_bignum(n1, glob2, len);
+				}
+			}
+		}
 
-        unsafe uint get_mulword(uint* n)
-        {
-            ushort* wn = (ushort*)n;
-            uint i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
-                 + (((*(wn - 2) ^ 0xffff) * glob1_hi_inv_hi + glob1_hi_inv_hi) >> 1) + 1)
-                 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_hi) >> 1) +
-                 (((*wn ^ 0xffff) * glob1_hi_inv_lo) >> 1) + 1) >> 14) + glob1_hi_inv_hi
-                 * (*wn ^ 0xffff) * 2) >> (int)glob1_hi_bitlen);
-            if (i > 0xffff) i = 0xffff;
-            return i & 0xffff;
-        }
+		void clear_tmp_vars(uint len)
+		{
+			init_bignum(glob1, 0, len);
+			init_bignum(glob2, 0, len);
+			init_bignum(glob1_hi_inv, 0, 4);
+			init_bignum(glob1_hi, 0, 4);
+			glob1_bitlen = 0;
+			glob1_hi_bitlen = 0;
+			glob1_len_x2 = 0;
+			glob1_hi_inv_lo = 0;
+			glob1_hi_inv_hi = 0;
+		}
 
-        void dec_bignum(uint[] n, uint len)
-        {
-            int i = 0;
-            while ((--n[i] == 0xffffffff) && (--len > 0)) 
-                i++;
-        }
+		void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
+		{
+			uint[] n_tmp = new uint[64];
+			uint n3_len, n4_len;
+			int n3_bitlen;
+			uint bit_mask;
 
-        void calc_a_bignum(uint[] n1, uint[] n2, uint[] n3, uint len)
-        {
-            uint g2_len_x2, len_diff;
-            unsafe
-            {
-                fixed( uint* g1 = &glob1[0])
-                fixed (uint* g2 = &glob2[0])
-                {
-                    mul_bignum(glob2, n2, n3, len);
-                    glob2[len * 2] = 0;
-                    g2_len_x2 = len_bignum(glob2, len * 2 + 1) * 2;
-                    if (g2_len_x2 >= glob1_len_x2)
-                    {
-                        inc_bignum(glob2, len * 2 + 1);
-                        neg_bignum(glob2, len * 2 + 1);
-                        len_diff = g2_len_x2 + 1 - glob1_len_x2;
-                        ushort* esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
-                        ushort* edi = ((ushort*)g2) + (g2_len_x2 + 1);
-                        for (; len_diff != 0; len_diff--)
-                        {
-                            edi--;
-                            uint tmp = get_mulword((uint*)edi);
-                            esi--;
-                            if (tmp > 0)
-                            {
-                                mul_bignum_word(esi, glob1, tmp, 2 * len);
-                                if ((*edi & 0x8000) == 0)
-                                {
-                                    if (0 != sub_bignum((uint*)esi, (uint*)esi, g1, 0, (int)len)) (*edi)--;
-                                }
-                            }
-                        }
-                        neg_bignum(glob2, len);
-                        dec_bignum(glob2, len);
-                    }
-                    mov_bignum(n1, glob2, len);
-                }
-            }
-        }
+			unsafe
+			{
+				fixed (uint* _pn3 = &n3[0])
+				{
+					uint* pn3 = _pn3;
 
-        void clear_tmp_vars(uint len)
-        {
-            init_bignum(glob1, 0, len);
-            init_bignum(glob2, 0, len);
-            init_bignum(glob1_hi_inv, 0, 4);
-            init_bignum(glob1_hi, 0, 4);
-            glob1_bitlen = 0;
-            glob1_hi_bitlen = 0;
-            glob1_len_x2 = 0;
-            glob1_hi_inv_lo = 0;
-            glob1_hi_inv_hi = 0;
-        }
+					init_bignum(n1, 1, len);
+					n4_len = len_bignum(n4, len);
+					init_two_dw(n4, n4_len);
+					n3_bitlen = (int)bitlen_bignum(n3, n4_len);
+					n3_len = (uint)((n3_bitlen + 31) / 32);
+					bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
+					pn3 += n3_len - 1;
+					n3_bitlen--;
+					mov_bignum(n1, n2, n4_len);
+					while (--n3_bitlen != -1)
+					{
+						if (bit_mask == 0)
+						{
+							bit_mask = 0x80000000;
+							pn3--;
+						}
+						calc_a_bignum(n_tmp, n1, n1, n4_len);
+						if ((*pn3 & bit_mask) != 0)
+							calc_a_bignum(n1, n_tmp, n2, n4_len);
+						else
+							mov_bignum(n1, n_tmp, n4_len);
+						bit_mask >>= 1;
+					}
+					init_bignum(n_tmp, 0, n4_len);
+					clear_tmp_vars(len);
+				}
+			}
+		}
 
-        void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
-        {
-            uint[] n_tmp = new uint[64];
-            uint n3_len, n4_len;
-            int n3_bitlen;
-            uint bit_mask;
+		unsafe void memcpy(byte* dest, byte* src, int len)
+		{
+			while (len-- != 0) *dest++ = *src++;
+		}
 
-            unsafe
-            {
-                fixed (uint* _pn3 = &n3[0])
-                {
-                    uint* pn3 = _pn3;
+		unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
+		{
+			uint[] n2 = new uint[64];
+			uint[] n3 = new uint[64];
 
-                    init_bignum(n1, 1, len);
-                    n4_len = len_bignum(n4, len);
-                    init_two_dw(n4, n4_len);
-                    n3_bitlen = (int)bitlen_bignum(n3, n4_len);
-                    n3_len = (uint)((n3_bitlen + 31) / 32);
-                    bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
-                    pn3 += n3_len - 1;
-                    n3_bitlen--;
-                    mov_bignum(n1, n2, n4_len);
-                    while (--n3_bitlen != -1)
-                    {
-                        if (bit_mask == 0)
-                        {
-                            bit_mask = 0x80000000;
-                            pn3--;
-                        }
-                        calc_a_bignum(n_tmp, n1, n1, n4_len);
-                        if ((*pn3 & bit_mask) != 0)
-                            calc_a_bignum(n1, n_tmp, n2, n4_len);
-                        else
-                            mov_bignum(n1, n_tmp, n4_len);
-                        bit_mask >>= 1;
-                    }
-                    init_bignum(n_tmp, 0, n4_len);
-                    clear_tmp_vars(len);
-                }
-            }
-        }
+			uint a = (pubkey.len - 1) / 8;
+			while (a + 1 <= pre_len)
+			{
+				init_bignum(n2, 0, 64);
+				fixed( uint * pn2 = &n2[0] )
+					memcpy((byte *)pn2, pre, (int)a + 1);
+				calc_a_key(n3, n2, pubkey.key2, pubkey.key1, 64);
 
-        unsafe void memcpy(byte* dest, byte* src, int len)
-        {
-            while (len-- != 0) *dest++ = *src++;
-        }
+				fixed( uint * pn3 = &n3[0] )
+					memcpy(buf, (byte *)pn3, (int)a);
 
-        unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
-        {
-            uint[] n2 = new uint[64];
-            uint[] n3 = new uint[64];
+				pre_len -= a + 1;
+				pre += a + 1;
+				buf += a;
+			}
+		}
 
-            uint a = (pubkey.len - 1) / 8;
-            while (a + 1 <= pre_len) 
-            {
-                init_bignum(n2, 0, 64);
-                fixed( uint * pn2 = &n2[0] )
-                    memcpy((byte *)pn2, pre, (int)a + 1);
-                calc_a_key(n3, n2, pubkey.key2, pubkey.key1, 64);
+		public byte[] DecryptKey(byte[] src)
+		{
+			init_pubkey();
+			byte[] dest = new byte[256];
 
-                fixed( uint * pn3 = &n3[0] )
-                    memcpy(buf, (byte *)pn3, (int)a);
-
-                pre_len -= a + 1;
-                pre += a + 1;
-                buf += a;
-            }
-        }
-
-        public byte[] DecryptKey(byte[] src)
-        {
-            init_pubkey();
-            byte[] dest = new byte[256];
-
-            unsafe
-            {
-                fixed (byte* pdest = &dest[0])
-                fixed (byte* psrc = &src[0])
-                    process_predata(psrc, len_predata(), pdest);
-            }
-            return dest.Take(56).ToArray();
-        }
-    }
+			unsafe
+			{
+				fixed (byte* pdest = &dest[0])
+				fixed (byte* psrc = &src[0])
+					process_predata(psrc, len_predata(), pdest);
+			}
+			return dest.Take(56).ToArray();
+		}
+	}
 }

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.
@@ -14,20 +14,20 @@ namespace OpenRA.FileFormats
 	{
 		public static int DecodeInto( byte[] src, byte[] dest )
 		{
-            var ctx = new FastByteReader(src);
+			var ctx = new FastByteReader(src);
 			int destIndex = 0;
 
 			while( true )
 			{
-                byte i = ctx.ReadByte();
+				byte i = ctx.ReadByte();
 				if( ( i & 0x80 ) == 0 )
 				{
 					int count = i & 0x7F;
 					if( count == 0 )
 					{
 						// case 6
-                        count = ctx.ReadByte();
-                        byte value = ctx.ReadByte();
+						count = ctx.ReadByte();
+						byte value = ctx.ReadByte();
 						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
 							dest[ destIndex ] ^= value;
 					}
@@ -35,7 +35,7 @@ namespace OpenRA.FileFormats
 					{
 						// case 5
 						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-                            dest[destIndex] ^= ctx.ReadByte();
+							dest[destIndex] ^= ctx.ReadByte();
 					}
 				}
 				else
@@ -43,7 +43,7 @@ namespace OpenRA.FileFormats
 					int count = i & 0x7F;
 					if( count == 0 )
 					{
-                        count = ctx.ReadWord();
+						count = ctx.ReadWord();
 						if( count == 0 )
 							return destIndex;
 
@@ -56,12 +56,12 @@ namespace OpenRA.FileFormats
 						{
 							// case 3
 							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
-                                dest[destIndex] ^= ctx.ReadByte();
+								dest[destIndex] ^= ctx.ReadByte();
 						}
 						else
 						{
 							// case 4
-                            byte value = ctx.ReadByte();
+							byte value = ctx.ReadByte();
 							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
 								dest[ destIndex ] ^= value;
 						}

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.
@@ -13,39 +13,39 @@ using System.IO;
 
 namespace OpenRA.FileFormats
 {
-    class FastByteReader
-    {
-        readonly byte[] src;
-        int offset = 0;
+	class FastByteReader
+	{
+		readonly byte[] src;
+		int offset = 0;
 
-        public FastByteReader(byte[] src)
-        {
-            this.src = src;
-        }
+		public FastByteReader(byte[] src)
+		{
+			this.src = src;
+		}
 
-        public bool Done() { return offset >= src.Length; }
-        public byte ReadByte() { return src[offset++]; }
-        public int ReadWord()
-        {
-            int x = ReadByte();
-            return x | (ReadByte() << 8);
-        }
+		public bool Done() { return offset >= src.Length; }
+		public byte ReadByte() { return src[offset++]; }
+		public int ReadWord()
+		{
+			int x = ReadByte();
+			return x | (ReadByte() << 8);
+		}
 
-        public void CopyTo(byte[] dest, int offset, int count)
-        {
-            Array.Copy(src, this.offset, dest, offset, count);
-            this.offset += count;
-        }
+		public void CopyTo(byte[] dest, int offset, int count)
+		{
+			Array.Copy(src, this.offset, dest, offset, count);
+			this.offset += count;
+		}
 
 		public int Remaining() { return src.Length - offset; }
-    }
+	}
 
 	public static class Format80
 	{
 		static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count )
 		{
 			if( srcIndex > destIndex )
-				throw new NotImplementedException( string.Format( "srcIndex > destIndex  {0}  {1}", srcIndex, destIndex ) );
+				throw new NotImplementedException("srcIndex > destIndex {0} {1}".F(srcIndex, destIndex));
 
 			if( destIndex - srcIndex == 1 )
 			{
@@ -61,16 +61,16 @@ namespace OpenRA.FileFormats
 
 		public static int DecodeInto( byte[] src, byte[] dest )
 		{
-            var ctx = new FastByteReader(src);
+			var ctx = new FastByteReader(src);
 			int destIndex = 0;
 
 			while( true )
 			{
-                byte i = ctx.ReadByte();
+				byte i = ctx.ReadByte();
 				if( ( i & 0x80 ) == 0 )
 				{
 					// case 2
-                    byte secondByte = ctx.ReadByte();
+					byte secondByte = ctx.ReadByte();
 					int count = ( ( i & 0x70 ) >> 4 ) + 3;
 					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
 
@@ -93,8 +93,8 @@ namespace OpenRA.FileFormats
 					if( count3 == 0x3E )
 					{
 						// case 4
-                        int count = ctx.ReadWord();
-                        byte color = ctx.ReadByte();
+						int count = ctx.ReadWord();
+						byte color = ctx.ReadByte();
 
 						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
 							dest[ destIndex ] = color;
@@ -102,10 +102,10 @@ namespace OpenRA.FileFormats
 					else if( count3 == 0x3F )
 					{
 						// case 5
-                        int count = ctx.ReadWord();
-                        int srcIndex = ctx.ReadWord();
+						int count = ctx.ReadWord();
+						int srcIndex = ctx.ReadWord();
 						if( srcIndex >= destIndex )
-							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
 
 						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
 							dest[ destIndex ] = dest[ srcIndex++ ];
@@ -114,9 +114,9 @@ namespace OpenRA.FileFormats
 					{
 						// case 3
 						int count = count3 + 3;
-                        int srcIndex = ctx.ReadWord();
+						int srcIndex = ctx.ReadWord();
 						if( srcIndex >= destIndex )
-							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
 
 						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
 							dest[ destIndex ] = dest[ srcIndex++ ];
@@ -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.
@@ -19,7 +19,6 @@ 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>() );
 
@@ -39,46 +38,46 @@ namespace OpenRA.FileFormats
 
 		static IFolder OpenPackage(string filename)
 		{
-            return OpenPackage(filename, order++);
+			return OpenPackage(filename, order++);
 		}
 
 		public static IFolder CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
-        {
+		{
 			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-                return new MixFile(filename, order, content);
-            else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-                return new ZipFile(filename, order, content);
-            else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-                return new ZipFile(filename, order, content);
-            else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-                throw new NotImplementedException("Creating .Z archives is unsupported");
-            else
-                return new Folder(filename, order, content);
-        }
-		
-        public static IFolder OpenPackage(string filename, int order)
-        {
-            if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-                return new MixFile(filename, order);
-            else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-                return new ZipFile(filename, order);
-            else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-                return new ZipFile(filename, order);
-            else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-                return new InstallShieldPackage(filename, order);
-            else
-                return new Folder(filename, order);
-        }
+				return new MixFile(filename, order, content);
+			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(filename, order, content);
+			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(filename, order, content);
+			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("Creating .Z archives is unsupported");
+			else
+				return new Folder(filename, order, content);
+		}
+
+		public static IFolder OpenPackage(string filename, int order)
+		{
+			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
+				return new MixFile(filename, order);
+			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(filename, order);
+			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(filename, order);
+			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+				return new InstallShieldPackage(filename, order);
+			else
+				return new Folder(filename, order);
+		}
 
 		public static void Mount(string name)
 		{
 			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)
@@ -124,25 +123,7 @@ namespace OpenRA.FileFormats
 			return null;
 		}
 
-		public static Stream Open(string filename)
-		{
-			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
-			{
-				var ret = GetFromCache( allFiles, filename );
-				if( ret != null )
-					return ret;
-			}
-
-			var folder = mountedFolders
-				.Where(x => x.Exists(filename))
-				.OrderByDescending(x => x.Priority)
-				.FirstOrDefault();
-
-			if (folder != null)
-				return folder.GetContent(filename);
-
-			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
-		}
+		public static Stream Open(string filename) { return OpenWithExts(filename, ""); }
 
 		public static Stream OpenWithExts( string filename, params string[] exts )
 		{
@@ -158,48 +139,45 @@ namespace OpenRA.FileFormats
 
 			foreach( var ext in exts )
 			{
-				foreach( IFolder folder in mountedFolders )
-					if (folder.Exists(filename + ext))
-						return folder.GetContent( filename + ext );
+				var folder = mountedFolders
+					.Where(x => x.Exists(filename + ext))
+					.OrderByDescending(x => x.Priority)
+					.FirstOrDefault();
+
+				if (folder != null)
+					return folder.GetContent(filename + ext);
 			}
 
-			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+			throw new FileNotFoundException("File not found: {0}".F(filename), filename);
 		}
 
-		public static bool Exists(string filename)
-		{
-			foreach (var folder in mountedFolders)
-				if (folder.Exists(filename))
-				    return true;
-			return false;
-		}
+		public static bool Exists(string filename) { return mountedFolders.Any(f => f.Exists(filename)); }
 
 		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
 
 		public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
 		{
 			foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-			{
 				if (assembly.FullName == e.Name)
 					return assembly;
-			}
 
-			string[] frags = e.Name.Split(',');
+			var frags = e.Name.Split(',');
 			var filename = frags[0] + ".dll";
+
 			Assembly a;
 			if (assemblyCache.TryGetValue(filename, out a))
 				return a;
 
 			if (FileSystem.Exists(filename))
-				using (Stream s = FileSystem.Open(filename))
+				using (var s = FileSystem.Open(filename))
 				{
-					byte[] buf = new byte[s.Length];
+					var buf = new byte[s.Length];
 					s.Read(buf, 0, buf.Length);
 					a = Assembly.Load(buf);
 					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,7 +61,7 @@ namespace OpenRA.FileFormats
 		{
 			get { return priority; }
 		}
-		
+
 		public void Write(Dictionary<string, byte[]> contents)
 		{
 			if (!Directory.Exists(path))
@@ -70,7 +70,7 @@ namespace OpenRA.FileFormats
 			foreach (var file in contents)
 				using (var dataStream = File.Create(Path.Combine(path, file.Key)))
 					using (var writer = new BinaryWriter(dataStream))
-				       writer.Write(file.Value);
+					   writer.Write(file.Value);
 		}
 	}
 }

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);
 		}
@@ -58,7 +58,9 @@ namespace OpenRA.FileFormats
 				isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted);
 				if( isEncrypted )
 				{
-					index = ParseRaHeader( s, out dataStart ).ToDictionary(x => x.Hash);
+					index = ParseRaHeader(s, out dataStart).ToDictionaryWithConflictLog(x => x.Hash,
+						"MixFile.RaHeader", null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
+					);
 					return;
 				}
 			}
@@ -66,7 +68,9 @@ namespace OpenRA.FileFormats
 				s.Seek( 0, SeekOrigin.Begin );
 
 			isEncrypted = false;
-			index = ParseTdHeader(s, out dataStart).ToDictionary(x => x.Hash);
+			index = ParseTdHeader(s, out dataStart).ToDictionaryWithConflictLog(x => x.Hash,
+				"MixFile.TdHeader", null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
+			);
 		}
 
 		const long headerStart = 84;
@@ -137,7 +141,7 @@ namespace OpenRA.FileFormats
 			dataStart = s.Position;
 			return items;
 		}
-		
+
 		public Stream GetContent(uint hash)
 		{
 			PackageEntry e;
@@ -159,7 +163,7 @@ namespace OpenRA.FileFormats
 		{
 			return index.Keys;
 		}
-		
+
 		public bool Exists(string filename)
 		{
 			return index.ContainsKey(PackageEntry.HashFilename(filename));
@@ -170,17 +174,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,16 +21,20 @@ 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 );
@@ -38,12 +42,13 @@ namespace OpenRA.FileFormats.Graphics
 		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,12 +59,6 @@ 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 );
@@ -74,19 +73,20 @@ namespace OpenRA.FileFormats.Graphics
 		void SetData(byte[] colors, int width, int height);
 	}
 
-    public enum PrimitiveType
-    {
-        PointList, 
-        LineList, 
-        TriangleList,
-    }
+	public enum PrimitiveType
+	{
+		PointList,
+		LineList,
+		TriangleList,
+		QuadList,
+	}
 
 	public struct Range<T>
 	{
 		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;
 		}
 	}
 
@@ -68,5 +70,6 @@ namespace OpenRA
 		public string KeyName;
 		public Modifiers Modifiers;
 		public int VirtKey;
+		public int MultiTapCount;
 	}
 }

OpenRA.FileFormats/Graphics/PngLoader.cs

@@ -1,7 +1,7 @@
 #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 
+ * 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.
@@ -97,7 +97,7 @@ namespace OpenRA.FileFormats.Graphics
 
 							case "IEND":
 								{
-									var bits = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+									var bits = bitmap.LockBits(bitmap.Bounds(),
 										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
 									using (var ns = new MemoryStream(data.ToArray()))

OpenRA.FileFormats/Graphics/ShpReader.cs

@@ -1,17 +1,17 @@
 #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;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 
 namespace OpenRA.FileFormats
 {
@@ -30,9 +30,9 @@ namespace OpenRA.FileFormats
 
 		public ImageHeader( BinaryReader reader )
 		{
-			Offset = reader.ReadUInt32();
-			Format = (Format)( Offset >> 24 );
-			Offset &= 0xFFFFFF;
+			var data = reader.ReadUInt32();
+			Offset = data & 0xffffff;
+			Format = (Format)(data >> 24);
 
 			RefOffset = reader.ReadUInt16();
 			RefFormat = (Format)reader.ReadUInt16();
@@ -48,14 +48,9 @@ namespace OpenRA.FileFormats
 		}
 	}
 
-	public enum Format
-	{
-		Format20 = 0x20,
-		Format40 = 0x40,
-		Format80 = 0x80,
-	}
+	public enum Format { Format20 = 0x20, Format40 = 0x40, Format80 = 0x80 }
 
-	public class ShpReader : IEnumerable<ImageHeader>
+	public class ShpReader
 	{
 		public readonly int ImageCount;
 		public readonly ushort Width;
@@ -63,46 +58,43 @@ 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;
 
 		public ShpReader( Stream stream )
 		{
-			BinaryReader reader = new BinaryReader( stream );
-
-			ImageCount = reader.ReadUInt16();
-			reader.ReadUInt16();
-			reader.ReadUInt16();
-			Width = reader.ReadUInt16();
-			Height = reader.ReadUInt16();
-			reader.ReadUInt32();
-
-			for( int i = 0 ; i < ImageCount ; i++ )
-				headers.Add( new ImageHeader( reader ) );
-
-			new ImageHeader( reader ); // end-of-file header
-			new ImageHeader( reader ); // all-zeroes header
-
-			Dictionary<uint, ImageHeader> offsets = new Dictionary<uint, ImageHeader>();
-			foreach( ImageHeader h in headers )
-				offsets.Add( h.Offset, h );
-
-			for( int i = 0 ; i < ImageCount ; i++ )
+			using( var reader = new BinaryReader( stream ) )
 			{
-				ImageHeader h = headers[ i ];
-				if( h.Format == Format.Format20 )
-					h.RefImage = headers[ i - 1 ];
+				ImageCount = reader.ReadUInt16();
+				reader.ReadUInt16();
+				reader.ReadUInt16();
+				Width = reader.ReadUInt16();
+				Height = reader.ReadUInt16();
+				reader.ReadUInt32();
 
-				else if( h.Format == Format.Format40 )
+				for( int i = 0 ; i < ImageCount ; i++ )
+					headers.Add( new ImageHeader( reader ) );
+
+				new ImageHeader( reader ); // end-of-file header
+				new ImageHeader( reader ); // all-zeroes header
+
+				var offsets = headers.ToDictionary(h => h.Offset, h =>h);
+
+				for( int i = 0 ; i < ImageCount ; i++ )
 				{
-					if( !offsets.TryGetValue( h.RefOffset, out h.RefImage ) )
-						throw new InvalidDataException( string.Format( "Reference doesnt point to image data {0}->{1}", h.Offset, h.RefOffset ) );
-				}
-			}
+					var h = headers[ i ];
+					if( h.Format == Format.Format20 )
+						h.RefImage = headers[ i - 1 ];
 
-			foreach( ImageHeader h in headers )
-				Decompress( stream, h );
+					else if( h.Format == Format.Format40 )
+						if( !offsets.TryGetValue( h.RefOffset, out h.RefImage ) )
+							throw new InvalidDataException( "Reference doesnt point to image data {0}->{1}".F(h.Offset, h.RefOffset) );
+				}
+
+				foreach( ImageHeader h in headers )
+					Decompress( stream, h );
+			}
 		}
 
 		public ImageHeader this[ int index ]
@@ -133,7 +125,7 @@ namespace OpenRA.FileFormats
 					}
 				case Format.Format80:
 					{
-						byte[] imageBytes = new byte[ Width * Height ];
+						var imageBytes = new byte[ Width * Height ];
 						Format80.DecodeInto( ReadCompressedData( stream, h ), imageBytes );
 						h.Image = imageBytes;
 						break;
@@ -147,33 +139,24 @@ namespace OpenRA.FileFormats
 		{
 			stream.Position = h.Offset;
 			// Actually, far too big. There's no length field with the correct length though :(
-			int compressedLength = (int)( stream.Length - stream.Position );
+			var compressedLength = (int)( stream.Length - stream.Position );
 
-			byte[] compressedBytes = new byte[ compressedLength ];
+			var compressedBytes = new byte[ compressedLength ];
 			stream.Read( compressedBytes, 0, compressedLength );
 
-			//MemoryStream ms = new MemoryStream( compressedBytes );
 			return compressedBytes;
 		}
 
-		private byte[] CopyImageData( byte[] baseImage )
+		byte[] CopyImageData( byte[] baseImage )
 		{
-			byte[] imageData = new byte[ Width * Height ];
+			var imageData = new byte[ Width * Height ];
 			for( int i = 0 ; i < Width * Height ; i++ )
 				imageData[ i ] = baseImage[ i ];
 
 			return imageData;
 		}
 
-		public IEnumerator<ImageHeader> GetEnumerator()
-		{
-			return headers.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
+		public IEnumerable<ImageHeader> Frames { get { return headers; } }
 
 		public static ShpReader Load(string filename)
 		{

OpenRA.FileFormats/Graphics/ShpWriter.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/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,97 +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;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-
-namespace OpenRA.FileFormats
-{
-	public static class HttpUtil
-	{
-		public static byte[] DownloadData(string url, Action<int, int> f, int chunkSize)
-		{
-			var uri = new Uri(url);
-			var ip = Dns.GetHostEntry(uri.DnsSafeHost).AddressList[0];
-
-			using (var s = new TcpClient())
-			{
-				s.Connect(new IPEndPoint(ip, uri.Port));
-				var ns = s.GetStream();
-				var sw = new StreamWriter(ns);
-
-				sw.Write("GET {0} HTTP/1.0\r\nHost:{1}\r\n\r\n", uri.PathAndQuery, uri.Host);
-				sw.Flush();
-
-				var br = new BinaryReader(ns);
-				var contentLength = 0;
-				var offset = 0;
-				for (; ; )
-				{
-					var result = br.ReadLine();
-					var kv = result.Split(new string[] { ": " }, StringSplitOptions.RemoveEmptyEntries);
-
-					if (result == "")
-					{
-						/* data follows the blank line */
-
-						if (contentLength > 0)
-						{
-							if (f != null)
-								f(offset, contentLength);
-
-							var data = new byte[contentLength];
-							while (offset < contentLength)
-							{
-								var thisChunk = Math.Min(contentLength - offset, chunkSize);
-								br.Read(data, offset, thisChunk);
-								offset += thisChunk;
-								if (f != null)
-									f(offset, contentLength);
-							}
-							s.Close();
-							return data;
-						}
-						else
-						{
-							s.Close();
-							return new byte[] { };
-						}
-					}
-					else if (kv[0] == "Content-Length")
-						contentLength = int.Parse(kv[1]);
-				}
-			}
-		}
-
-		public static byte[] DownloadData(string url, Action<int, int> f)
-		{
-			return DownloadData(url, f, 4096);
-		}
-
-		public static byte[] DownloadData(string url)
-		{
-			return DownloadData(url, null);
-		}
-
-		static string ReadLine(this BinaryReader br)
-		{
-			var sb = new StringBuilder();
-			char c;
-			while ((c = br.ReadChar()) != '\n')
-				if (c != '\r' && c != '\n')
-					sb.Append(c);
-
-			return sb.ToString();
-		}
-	}
-}

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, Notifications, 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.MergeLiberal);
-			
+				.Aggregate(MiniYaml.MergeLiberal)).NodesDict;
+
 			// Todo: Use fieldloader
 			Folders = YamlList(yaml, "Folders");
 			Packages = YamlList(yaml, "Packages");
@@ -43,23 +44,27 @@ namespace OpenRA.FileFormats
 			ChromeLayout = YamlList(yaml, "ChromeLayout");
 			Weapons = YamlList(yaml, "Weapons");
 			Voices = YamlList(yaml, "Voices");
+			Notifications = YamlList(yaml, "Notifications");
 			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 )
-				return new string[ 0 ];
+			if (!yaml.ContainsKey(key))
+				return new string[] {};
 
-			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,23 +20,29 @@ 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 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(MiniYaml my) { FieldLoader.Load(this, my); }
+
+		public override string ToString() { return Name; }
 	}
 }

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.
@@ -15,17 +15,17 @@ namespace OpenRA.FileFormats
 		public readonly string Type;
 		public readonly int2 Location;
 		public readonly int Depth;
+
 		public SmudgeReference( string type, int2 location, int depth )
 		{
 			Type = type;
 			Location = location;
 			Depth = depth;
 		}
-		
-		public override string ToString ()
-		{
-			return string.Format("{0} {1},{2} {3}", Type, Location.X,Location.Y, Depth);
-		}
 
+		public override string ToString()
+		{
+			return "{0} {1},{2} {3}".F(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.
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -19,31 +20,30 @@ namespace OpenRA.FileFormats
 	public class TerrainTypeInfo
 	{
 		public string Type;
-		public bool Buildable = true;
-		public bool AcceptSmudge = true;
+		public string[] AcceptsSmudgeType = { };
 		public bool IsWater = false;
 		public Color Color;
+		public string CustomCursor;
 
 		public TerrainTypeInfo() {}
 		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;
+		public string Category;
 
 		[FieldLoader.LoadUsing( "LoadTiles" )]
 		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
-		
+
 		public TileTemplate() {}
-		public TileTemplate(MiniYaml my)
-		{
-			FieldLoader.Load( this, my );
-		}
+		public TileTemplate(MiniYaml my) { FieldLoader.Load( this, my ); }
 
 		static object LoadTiles( MiniYaml y )
 		{
@@ -51,11 +51,13 @@ namespace OpenRA.FileFormats
 				t => byte.Parse(t.Key),
 				t => t.Value.Value );
 		}
-		
+
+		static readonly string[] Fields = { "Id", "Image", "Size", "PickAny" };
+
 		public MiniYaml Save()
 		{
 			var root = new List<MiniYamlNode>();
-			foreach (var field in new string[] {"Id", "Image", "Size", "PickAny"})
+			foreach (var field in Fields)
 			{
 				FieldInfo f = this.GetType().GetField(field);
 				if (f.GetValue(this) == null) continue;
@@ -64,11 +66,13 @@ 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 Terrain Data;
 	}
-	
+
 	public class TileSet
 	{
 		public string Name;
@@ -77,15 +81,16 @@ namespace OpenRA.FileFormats
 		public int TileSize = 24;
 		public string[] Extensions;
 		public Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
-		public Dictionary<ushort, Terrain> Tiles = new Dictionary<ushort, Terrain>();
 		public Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
-		static List<string> fields = new List<string>() {"Name", "TileSize", "Id", "Palette", "Extensions"};
+
+		static readonly string[] fields = {"Name", "TileSize", "Id", "Palette", "Extensions"};
 
 		public TileSet() {}
+
 		public TileSet( string filepath )
 		{
 			var yaml = MiniYaml.DictFromFile( filepath );
-			
+
 			// General info
 			FieldLoader.Load(this, yaml["General"]);
 
@@ -97,30 +102,30 @@ 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)
-				using( Stream s = FileSystem.OpenWithExts(t.Value.Image, Extensions) )
-				{
-					if( !Tiles.ContainsKey( t.Key ) )
-						Tiles.Add( t.Key, new Terrain( s, TileSize ) );
-				}
+				if (t.Value.Data == null)
+					using( var s = FileSystem.OpenWithExts(t.Value.Image, Extensions) )
+						t.Value.Data = new Terrain(s, TileSize);
 		}
-		
+
 		public void Save(string filepath)
-		{			
+		{
 			var root = new List<MiniYamlNode>();
 			var gen = new List<MiniYamlNode>();
+
 			foreach (var field in fields)
 			{
 				FieldInfo f = this.GetType().GetField(field);
 				if (f.GetValue(this) == null) continue;
 				gen.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
 			}
+
 			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 +135,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 ];
-			
+			TileTemplate tile;
+			if( Templates.TryGetValue( r.type, out tile ) )
+				return tile.Data.TileBitmapBytes[ r.index ];
+
 			byte[] missingTile = new byte[ TileSize * TileSize ];
 			for( int i = 0 ; i < missingTile.Length ; i++ )
 				missingTile[ i ] = 0x36;
@@ -153,5 +158,43 @@ namespace OpenRA.FileFormats
 				return "Clear"; // Default walkable
 			return ret;
 		}
+
+		public Bitmap RenderTemplate(ushort n, Palette p)
+		{
+			var template = Templates[n];
+
+			var bitmap = new Bitmap(TileSize * template.Size.X, TileSize * template.Size.Y,
+				PixelFormat.Format8bppIndexed);
+
+			bitmap.Palette = p.AsSystemPalette();
+
+			var data = bitmap.LockBits(bitmap.Bounds(),
+				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+			unsafe
+			{
+				byte* q = (byte*)data.Scan0.ToPointer();
+				var stride = data.Stride;
+
+				for (var u = 0; u < template.Size.X; u++)
+					for (var v = 0; v < template.Size.Y; v++)
+						if (template.Data.TileBitmapBytes[u + v * template.Size.X] != null)
+						{
+							var rawImage = template.Data.TileBitmapBytes[u + v * template.Size.X];
+							for (var i = 0; i < TileSize; i++)
+								for (var j = 0; j < TileSize; j++)
+									q[(v * TileSize + j) * stride + u * TileSize + i] = rawImage[i + TileSize * j];
+						}
+						else
+						{
+							for (var i = 0; i < TileSize; i++)
+								for (var j = 0; j < TileSize; j++)
+									q[(v * TileSize + j) * stride + u * TileSize + i] = 0;
+						}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
 	}
 }

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,7 +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 override string ToString() { return "{0}:{1}".F(Filename, Line); }
 		}
 
 		public SourceLocation Location;
@@ -55,10 +55,10 @@ namespace OpenRA.FileFormats
 		{
 		}
 
-        public override string ToString()
-        {
-            return "{{YamlNode: {0} @ {1}}}".F(Key, Location);
-        }
+		public override string ToString()
+		{
+			return "{{YamlNode: {0} @ {1}}}".F(Key, Location);
+		}
 	}
 
 	public class MiniYaml
@@ -66,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 ) { }
 
@@ -85,30 +98,34 @@ 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>>();
 			levels.Add(new List<MiniYamlNode>());
 
 			var lineNo = 0;
-			foreach (var line in lines)
+			foreach (var ll in lines)
 			{
+				var line = ll;
 				++lineNo;
+				if (line.Contains('#'))
+					line = line.Substring(0, line.IndexOf('#')).TrimEnd(' ', '\t');
 				var t = line.TrimStart(' ', '\t');
-				if (t.Length == 0 || t[0] == '#')
+				if (t.Length == 0)
 					continue;
 				var level = line.Length - t.Length;
+				var location = new MiniYamlNode.SourceLocation { Filename = filename, Line = lineNo };
 
 				if (levels.Count <= level)
-					throw new YamlException("Bad indent in miniyaml");
+					throw new YamlException("Bad indent in miniyaml at {0}".F (location));
 				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[ level ].Add( new MiniYamlNode( t, rhs, d, location ) );
+
 				levels.Add(d);
 			}
 			return levels[ 0 ];
@@ -130,11 +147,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);
 		}
 
@@ -149,7 +166,7 @@ namespace OpenRA.FileFormats
 		}
 
 		public static List<MiniYamlNode> FromFile( string path )
-		{			
+		{
 			return FromLines(File.ReadAllLines( path ), path);
 		}
 
@@ -164,15 +181,15 @@ namespace OpenRA.FileFormats
 			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), "<no filename available>");
 		}
 
-        public static List<MiniYamlNode> MergeLiberal(List<MiniYamlNode> a, List<MiniYamlNode> b)
-        {
-            return Merge(a, b, false);
-        }
+		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);
-        }
+		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 )
 		{
@@ -187,8 +204,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] == '-')
-                .ToDictionary(x => x.Substring(1), x => false);
+			var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-')
+				.ToDictionary(x => x.Substring(1), x => false);
 
 			foreach( var key in keys )
 			{
@@ -198,11 +215,11 @@ namespace OpenRA.FileFormats
 
 				if( noInherit.ContainsKey( key ) )
 				{
-                    if (!throwErrors)
-                        if (aa != null)
-                            ret.Add(aa);
+					if (!throwErrors)
+						if (aa != null)
+							ret.Add(aa);
 
-                    noInherit[key] = true;
+					noInherit[key] = true;
 				}
 				else
 				{
@@ -212,23 +229,23 @@ namespace OpenRA.FileFormats
 				}
 			}
 
-            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())));
+			if (throwErrors)
+			if (noInherit.ContainsValue(false))
+				throw new YamlException("Bogus yaml removals: {0}".F(
+					noInherit.Where(x => !x.Value).JoinWith(", ")));
 
 			return ret;
 		}
 
-        public static MiniYaml MergeLiberal(MiniYaml a, MiniYaml b)
-        {
-            return Merge(a, b, false);
-        }
+		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);
-        }
+		public static MiniYaml MergeStrict(MiniYaml a, MiniYaml b)
+		{
+			return Merge(a, b, true);
+		}
 
 		static MiniYaml Merge( MiniYaml a, MiniYaml b, bool throwErrors )
 		{
@@ -258,9 +275,9 @@ namespace OpenRA.FileFormats
 
 		public static string WriteToString(this MiniYamlNodes y)
 		{
-			return string.Join("\n", y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
+			return y.ToLines(true).Select(x => x.TrimEnd()).JoinWith("\n");
 		}
-		
+
 		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
 		{
 			foreach (var kv in y)
@@ -273,8 +290,8 @@ namespace OpenRA.FileFormats
 		}
 	}
 
-    public class YamlException : Exception
-    {
-        public YamlException(string s) : base(s) { }
-    }
+	public class YamlException : Exception
+	{
+		public YamlException(string s) : base(s) { }
+	}
 }

OpenRA.FileFormats/Mod.cs

@@ -1,29 +1,27 @@
 #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;
+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 bool Standalone = false;
 
 		public static readonly Dictionary<string, Mod> AllMods = ValidateMods(Directory.GetDirectories("mods").Select(x => x.Substring(5)).ToArray());
 
@@ -32,16 +30,27 @@ namespace OpenRA.FileFormats
 			var ret = new Dictionary<string, Mod>();
 			foreach (var m in mods)
 			{
-				if (!File.Exists("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"))
+				var yamlPath = new[] { "mods", m, "mod.yaml" }.Aggregate( Path.Combine );
+				if (!File.Exists(yamlPath))
 					continue;
 
-				var yaml = new MiniYaml(null, MiniYaml.FromFile("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"));
+				var yaml = new MiniYaml(null, MiniYaml.FromFile(yamlPath));
 				if (!yaml.NodesDict.ContainsKey("Metadata"))
 					continue;
 
-				ret.Add(m, FieldLoader.Load<Mod>(yaml.NodesDict["Metadata"]));
+				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,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,10 +12,25 @@
     <AssemblyName>OpenRA.FileFormats</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -27,6 +42,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -37,6 +53,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -60,58 +77,78 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ColorHSLR.cs" />
+    <Compile Include="ColorRamp.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\Blast.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\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="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>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

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);
@@ -46,9 +46,9 @@ namespace OpenRA.FileFormats
 		{
 			string filename;
 			if (Names.TryGetValue(Hash, out filename))
-				return string.Format("{0} - offset 0x{1:x8} - length 0x{2:x8}", filename, Offset, Length);
+				return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(filename, Offset, Length);
 			else
-				return string.Format("0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}", Hash, Offset, Length);
+				return "0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}".F(Hash, Offset, Length);
 		}
 
 		public static uint HashFilename(string name)
@@ -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 
+ * Copyright 2007-2012 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.
@@ -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)
+		public Palette(Stream s, int[] remapShadow)
 		{
 			colors = new uint[256];
-			
+
 			using (BinaryReader reader = new BinaryReader(s))
 			{
 				for (int i = 0; i < 256; i++)
@@ -51,13 +54,9 @@ namespace OpenRA.FileFormats
 				}
 			}
 
-			colors[0] = 0;
-			if (remapTransparent)
-			{
-				colors[1] = 178u << 24; // Hack for d2k; may have side effects
-				colors[3] = 178u << 24;
-				colors[4] = 140u << 24;
-			}
+			colors[0] = 0; //convert black background to transparency
+			foreach (int i in remapShadow)
+				colors[i] = 140u << 24;
 		}
 
 		public Palette(Palette p, IPaletteRemap r)
@@ -66,12 +65,35 @@ 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, int[] remap)
+		{
+			using(var s = File.OpenRead(filename))
+				return new Palette(s, remap);
+		}
 	}
 
-	public interface IPaletteRemap { Color GetRemappedColor(Color original, int index);	}
+	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 = Lazy.New((Func<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.
@@ -14,39 +14,39 @@ using System.Linq;
 
 namespace OpenRA.FileFormats
 {
-	// TODO: ship this out of here.
-	public enum PaletteFormat { ra, cnc, d2k }
 
 	public class PlayerColorRemap : IPaletteRemap
 	{
 		Dictionary<int, Color> remapColors;
 
-		public PlayerColorRemap(ColorRamp c, PaletteFormat fmt)
+		public static int GetRemapIndex(int[] Ramp, int i)
 		{
-            var c1 = c.GetColor(0);
-            var c2 = c.GetColor(1); /* temptemp: this can be expressed better */
+			return Ramp[i];
+		}
 
-			var baseIndex = (fmt == PaletteFormat.cnc) ? 0xb0 : (fmt == PaletteFormat.d2k) ? 240 : 80;
-			var ramp = (fmt == PaletteFormat.cnc)
-				? new[] { 0, 2, 4, 6, 8, 10, 13, 15, 1, 3, 5, 7, 9, 11, 12, 14 }
-				: new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+		public PlayerColorRemap(int[] Ramp, ColorRamp c)
+		{
+			var c1 = c.GetColor(0);
+			var c2 = c.GetColor(1); // temptemp: this can be expressed better
 
-			remapColors = ramp.Select((x, i) => Pair.New(baseIndex + i, ColorLerp(x / 16f, c1, c2)))
+			var baseIndex = Ramp[0];
+			var RemapRamp = Ramp.Select(r => r - Ramp[0]).ToArray();
+
+			if (Ramp[0] > Ramp[15]) // reversed remapping
+                        {
+				baseIndex = Ramp[15];
+				for (int i=15; i>0; i--)
+					RemapRamp = Ramp.Select(r => r - Ramp[15]).ToArray();
+			}
+			
+			remapColors = RemapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / 16f, c1, c2)))
 				.ToDictionary(u => u.First, u => u.Second);
 		}
 
-		public static Color ColorLerp(float t, Color c1, Color c2)
-		{
-			return Color.FromArgb(255,
-				(int)(t * c2.R + (1 - t) * c1.R),
-				(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 Time.CompareTo(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 BitAllocator<T>.GetStrings(Value).JoinWith(",");
+		}
+
+		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.

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.
@@ -38,12 +38,7 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-        public void Force()
-        {
-            #pragma warning disable 0168
-			var ignored = Value;
-			#pragma warning restore 0168
-        }
+		public T Force() { return Value; }
 	}
 
 	public static class Lazy

OpenRA.FileFormats/Primitives/Pair.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.
@@ -71,10 +71,10 @@ namespace OpenRA.FileFormats
 		public static IEqualityComparer<Pair<T, U>> EqualityComparer { get { return new PairEqualityComparer(); } }
 	}
 
-    public static class Pair
-    {
+	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();
@@ -86,5 +86,5 @@ namespace OpenRA.FileFormats
 			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.
@@ -12,7 +12,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace OpenRA.Collections
+namespace OpenRA.FileFormats
 {
 	public class Set<T> : IEnumerable<T>
 	{
@@ -44,5 +44,13 @@ namespace OpenRA.Collections
 		{
 			return GetEnumerator();
 		}
+
+		public bool Contains( T obj ) { return data.ContainsKey(obj); }
+
+		public Set( params T[] ts )
+		{
+			foreach( var t in ts )
+				Add(t);
+		}
 	}
 }

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.
@@ -62,23 +62,23 @@ namespace OpenRA
 				Constrain(Y, min.Y, max.Y));
 		}
 
-        public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
-        public static float2 operator *(float2 b, float a) { return new float2(a * b.X, a * b.Y); }
+		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+		public static float2 operator *(float2 b, float a) { return new float2(a * b.X, a * b.Y); }
 		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
 		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
 
-        public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
-        public static bool operator !=(float2 me, float2 other) { return !(me == other); }
-        public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+		public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator !=(float2 me, float2 other) { return !(me == other); }
+		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
 
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-                return false;
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
 
-            float2 o = (float2)obj;
-            return o == this;
-        }
+			float2 o = (float2)obj;
+			return o == this;
+		}
 
 		public static readonly float2 Zero = new float2(0, 0);
 
@@ -92,7 +92,7 @@ namespace OpenRA
 		public static float Dot(float2 a, float2 b) { return a.X * b.X + a.Y * b.Y; }
 		public float2 Round() { return new float2((float)Math.Round(X), (float)Math.Round(Y)); }
 
-		public override string ToString() { return string.Format("({0},{1})", X, Y); }
+		public override string ToString() { return "({0},{1})".F(X, Y); }
 		public int2 ToInt2() { return new int2((int)X, (int)Y); }
 
 		public static float2 Max(float2 a, float2 b) { return new float2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }

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.
@@ -52,11 +52,11 @@ namespace OpenRA
 
 		public static readonly int2 Zero = new int2(0, 0);
 		public Point ToPoint() { return new Point(X, Y); }
-        public PointF ToPointF() { return new PointF(X, Y); }
+		public PointF ToPointF() { return new PointF(X, Y); }
 		public float2 ToFloat2() { return new float2(X, Y); }
 
-		public override string ToString() { return string.Format("{0},{1}", X, Y); }
-		
+		public override string ToString() { return "{0},{1}".F(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)));
+							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,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/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,39 +33,39 @@ namespace OpenRA
 			get { return LogPathPrefix; }
 			set
 			{
-				LogPathPrefix = value;				
+				LogPathPrefix = value;
 				Directory.CreateDirectory(LogPathPrefix);
 			}
 		}
 
-        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);
-        }
+		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;
+		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;
+			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
-                        });
+					channels.Add(channelName,
+						new ChannelInfo()
+						{
+							Filename = filename,
+							Writer = writer
+						});
 
-                    return;
-                }
-                catch (IOException) { }
-        }
+					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.
@@ -48,29 +48,34 @@ namespace OpenRA.FileFormats
 
 		public bool Contains<T>()
 		{
-			return dataSingular.ContainsKey( typeof( T ) ) || dataMultiple.ContainsKey( typeof( T ) );
+			return dataSingular.ContainsKey(typeof(T)) || dataMultiple.ContainsKey(typeof(T));
 		}
 
 		public T Get<T>()
 		{
-			if( dataMultiple.ContainsKey( typeof( T ) ) )
-				throw new InvalidOperationException( string.Format( "TypeDictionary contains multiple instance of type `{0}`", typeof( T ) ) );
+			if (dataMultiple.ContainsKey(typeof(T)))
+				throw new InvalidOperationException("TypeDictionary contains multiple instance of type `{0}`".F(typeof(T)));
 
 			object ret;
-			if( !dataSingular.TryGetValue( typeof( T ), out ret ) )
-				throw new InvalidOperationException(string.Format("TypeDictionary does not contain instance of type `{0}`", typeof(T)));
+			if (!dataSingular.TryGetValue(typeof(T), out ret))
+				throw new InvalidOperationException("TypeDictionary does not contain instance of type `{0}`".F(typeof(T)));
 			return (T)ret;
 		}
 
 		public T GetOrDefault<T>()
 		{
-			if( dataMultiple.ContainsKey( typeof( T ) ) )
-				throw new InvalidOperationException( string.Format( "TypeDictionary contains multiple instance of type `{0}`", typeof( T ) ) );
+			return (T)GetOrDefault(typeof(T));
+		}
+
+		public object GetOrDefault(Type t)
+		{
+			if (dataMultiple.ContainsKey(t))
+				throw new InvalidOperationException("TypeDictionary contains multiple instances of type `{0}`".F(t));
 
 			object ret;
-			if( !dataSingular.TryGetValue( typeof( T ), out ret ) )
-				return default( T );
-			return (T)ret;
+			if (!dataSingular.TryGetValue(t, out ret))
+				return null;
+			return ret;
 		}
 
 		public IEnumerable<T> WithInterface<T>()

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 CPos Location { get { return occupySpace.Value.TopLeft; } }
+
+		public PPos CenterLocation
+		{
+			get
+			{
+				if (HasLocation == null)
+					HasLocation = Trait<IHasLocation>();
+				return HasLocation.PxPosition;
+			}
+		}
+
 		[Sync]
 		public Player Owner;
 
-		private Activity 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);
 			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,7 +105,7 @@ namespace OpenRA
 			get { return currentActivity == null; }
 		}
 
-        OpenRA.FileFormats.Lazy<float2> Size;
+		OpenRA.FileFormats.Lazy<int2> Size;
 
 		// note: these delegates are cached to avoid massive allocation.
 		Func<IRender, IEnumerable<Renderable>> ApplyIRender;
@@ -94,29 +116,40 @@ namespace OpenRA
 			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 size = (PVecInt)(Size.Value);
+			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]);
+			{
+#if true
+				loc += new PVecInt(si.Bounds[2], si.Bounds[3]);
+#else
+				loc.X += si.Bounds[2];
+				loc.Y += si.Bounds[3];
+#endif
+			}
 
-			var move = TraitOrDefault<IMove>();
+			var move = Move.Value;
 			if (move != null)
 			{
-				loc -= new float2(0, move.Altitude);
+#if true
+				loc -= new PVecInt(0, move.Altitude);
+#else
+				loc.Y -= move.Altitude;
+#endif
 				if (useAltitude)
-					size = new float2(size.X, size.Y + move.Altitude);
+					size = new PVecInt(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; }

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,75 @@ 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>
+	public class LocationInit : IActorInit<CPos>
 	{
-		[FieldFromYamlKey]
-		public readonly int2 value = int2.Zero;
-
+		[FieldFromYamlKey] public readonly int2 value = int2.Zero;
 		public LocationInit() { }
+		public LocationInit( CPos init ) { value = init.ToInt2(); }
+		public CPos Value(World world) { return (CPos)value; }
+	}
 
-		public LocationInit( int2 init )
-		{
-			value = init;
-		}
+	public class SubCellInit : IActorInit<SubCell>
+	{
+		[FieldFromYamlKey] public readonly int value = 0;
+		public SubCellInit() { }
+		public SubCellInit(int init) { value = init; }
+		public SubCell Value(World world) { return (SubCell)value; }
+	}
 
-		public int2 Value( World world )
-		{
-			return value;
-		}
+	public class CenterLocationInit : IActorInit<PPos>
+	{
+		[FieldFromYamlKey] public readonly int2 value = int2.Zero;
+		public CenterLocationInit() { }
+		public CenterLocationInit(PPos init) { value = init.ToInt2(); }
+		public PPos Value(World world) { return (PPos)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 +103,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,20 +24,20 @@ 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 )
+		public IEnumerable<Actor> GetUnitsAt(CPos a)
 		{
 			if (!map.IsInMap(a)) yield break;
 
@@ -50,8 +45,8 @@ namespace OpenRA.Traits
 				if (!i.actor.Destroyed)
 					yield return i.actor;
 		}
-		
-		public IEnumerable<Actor> GetUnitsAt( int2 a, SubCell sub )
+
+		public IEnumerable<Actor> GetUnitsAt(CPos 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)
+
+		public bool HasFreeSubCell(CPos 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)
+		public bool AnyUnitsAt(CPos a)
 		{
 			return influence[ a.X, a.Y ] != null;
 		}
-		
-		public bool AnyUnitsAt(int2 a, SubCell sub)
-		{		
+
+		public bool AnyUnitsAt(CPos 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,14 +10,13 @@
 
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 
 namespace OpenRA.FileFormats
 {
 	public class ActorReference : IEnumerable
 	{
-		public readonly string Type;
-		public readonly TypeDictionary InitDict;
+		public string Type;
+		public TypeDictionary InitDict;
 
 		public ActorReference( string type ) : this( type, new Dictionary<string, MiniYaml>() ) { }
 

OpenRA.Game/CPos.cs

@@ -0,0 +1,71 @@
+#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.Drawing;
+
+namespace OpenRA
+{
+	/// <summary>
+	/// Cell coordinate position in the world (coarse).
+	/// </summary>
+	public struct CPos
+	{
+		public readonly int X, Y;
+
+		public CPos(int x, int y) { X = x; Y = y; }
+
+		public static readonly CPos Zero = new CPos(0, 0);
+
+		public static explicit operator CPos(int2 a) { return new CPos(a.X, a.Y); }
+
+		public static CPos operator +(CVec a, CPos b) { return new CPos(a.X + b.X, a.Y + b.Y); }
+		public static CPos operator +(CPos a, CVec b) { return new CPos(a.X + b.X, a.Y + b.Y); }
+		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y); }
+
+		public static CVec operator -(CPos a, CPos b) { return new CVec(a.X - b.X, a.Y - b.Y); }
+
+		public static bool operator ==(CPos me, CPos other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator !=(CPos me, CPos other) { return !(me == other); }
+
+		public static CPos Max(CPos a, CPos b) { return new CPos(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static CPos Min(CPos a, CPos b) { return new CPos(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public float2 ToFloat2() { return new float2(X, Y); }
+		public int2 ToInt2() { return new int2(X, Y); }
+		public PPos ToPPos() { return new PPos(Game.CellSize * X, Game.CellSize * Y); }
+
+		public CPos Clamp(Rectangle r)
+		{
+			return new CPos(Math.Min(r.Right, Math.Max(X, r.Left)),
+							Math.Min(r.Bottom, Math.Max(Y, r.Top)));
+		}
+
+		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
+
+			CPos o = (CPos)obj;
+			return o == this;
+		}
+
+		public override string ToString() { return "{0},{1}".F(X, Y); }
+
+	}
+
+	public static class RectangleExtensions
+	{
+		public static CPos TopLeftAsCPos(this Rectangle r) { return new CPos(r.Left, r.Top); }
+		public static CPos BottomRightAsCPos(this Rectangle r) { return new CPos(r.Right, r.Bottom); }
+	}
+}

OpenRA.Game/CVec.cs

@@ -0,0 +1,76 @@
+#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.Drawing;
+
+namespace OpenRA
+{
+	/// <summary>
+	/// Cell coordinate vector (coarse).
+	/// </summary>
+	public struct CVec
+	{
+		public readonly int X, Y;
+
+		public CVec(int x, int y) { X = x; Y = y; }
+		public CVec(Size p) { X = p.Width; Y = p.Height; }
+
+		public static readonly CVec Zero = new CVec(0, 0);
+
+		public static explicit operator CVec(int2 a) { return new CVec(a.X, a.Y); }
+		public static explicit operator CVec(float2 a) { return new CVec((int)a.X, (int)a.Y); }
+
+		public static CVec operator +(CVec a, CVec b) { return new CVec(a.X + b.X, a.Y + b.Y); }
+		public static CVec operator -(CVec a, CVec b) { return new CVec(a.X - b.X, a.Y - b.Y); }
+		public static CVec operator *(int a, CVec b) { return new CVec(a * b.X, a * b.Y); }
+		public static CVec operator *(CVec b, int a) { return new CVec(a * b.X, a * b.Y); }
+		public static CVec operator /(CVec a, int b) { return new CVec(a.X / b, a.Y / b); }
+
+		public static CVec operator -(CVec a) { return new CVec(-a.X, -a.Y); }
+
+		public static bool operator ==(CVec me, CVec other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator !=(CVec me, CVec other) { return !(me == other); }
+
+		public static CVec Max(CVec a, CVec b) { return new CVec(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static CVec Min(CVec a, CVec b) { return new CVec(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public static int Dot(CVec a, CVec b) { return a.X * b.X + a.Y * b.Y; }
+
+		public CVec Sign() { return new CVec(Math.Sign(X), Math.Sign(Y)); }
+		public CVec Abs() { return new CVec(Math.Abs(X), Math.Abs(Y)); }
+		public int LengthSquared { get { return X * X + Y * Y; } }
+		public int Length { get { return (int)Math.Sqrt(LengthSquared); } }
+
+		public float2 ToFloat2() { return new float2(X, Y); }
+		public int2 ToInt2() { return new int2(X, Y); }
+
+		public CVec Clamp(Rectangle r)
+		{
+			return new CVec(
+				Math.Min(r.Right, Math.Max(X, r.Left)),
+				Math.Min(r.Bottom, Math.Max(Y, r.Top))
+			);
+		}
+
+		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
+
+			CVec o = (CVec)obj;
+			return o == this;
+		}
+
+		public override string ToString() { return "{0},{1}".F(X, Y); }
+	}
+}