Set Allied units to defensive stance in Allies 01

typo leading to a crash when clicking a disabled tab

.gitignore

@@ -10,6 +10,9 @@ obj
 *.manifest
 mods/*/*.dll
 
+# ReSharper crap
+_ReSharper.*/
+
 # Red Alert binary files
 mods/*/packages/*.[mM][iI][xX]
 
@@ -22,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
@@ -32,8 +37,6 @@ cgGL.dll
 *.pidb
 *.userprefs
 
-packaging/windows/*.exe
-
 # osx crap
 .DS_Store
 
@@ -52,7 +55,6 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 *.config
 *.resources
 
-# other crap
-Logs/
-Replays/
-settings.yaml
+# KDE crap
+*.kate-swp
+*.directory

AUTHORS

@@ -1,32 +1,39 @@
 AUTHORS
 
 The OpenRA developers are:
-	* Alli Witheford
-	* Caleb Anderson
-	* Chris Forbes
-	* Curtis Shmyr
-	* Daniel Hernandez
-	* Matthew Bowra-Dean
-	* Mike Bundy
+	* 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
-	* Erasmus Schroder
-	* Jeff Harris
-	* Joakim Lindberg
-	* Katzsmile
+	* Christer Ulfsparre	(Holloweye)
+	* Erasmus Schroder	(rasco)
+	* Igor Popov		(ihptru)
+	* James Dunne		(jsd)
+	* Jeff Harris		(jeff_1amstudios)
+	* Joakim Lindberg	(booom3)
+	* Kenny Hoxworth	(hoxworth)
 	* Lawrence Wang
-	* Matthew Gatland
+	* Mark Olson		(markolson)
+	* Matthew Gatland	(mgatland)
+	* Matthias Mailänder	(Mailaender)
+	* Max Ugrumov		(katzsmile)
 	* Max621
 	* Nukem
-	* Paolo Chiodi
-	* Paul Dovydaitis
-	* Ragequit
-	* Tim Mylemans
+	* Paolo Chiodi		(paolochiodi)
+	* Paul Dovydaitis	(pdovy)
+	* Raymond Martineau	(mart0258)
 	* Riderr3
-	* Raymond Martineau
+	* Tim Mylemans		(gecko)
 
 Past developers included:
-	* Paul Chote
-	* Robert Pepperell
+	* Paul Chote		(pchote)
+	* Robert Pepperell	(ytinasni)

CHANGELOG

@@ -1,4 +1,44 @@
 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.
@@ -58,6 +98,7 @@ NEW:
 		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)
 

INSTALL

@@ -41,23 +41,19 @@ UBUNTU (substitute comparable packages for other linux distros):
 
 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
 

Makefile

@@ -5,10 +5,10 @@ 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
+core: game renderers mods utility tsbuild
 tools: editor ralint tsbuild
 package: core editor
-mods: mod_ra mod_cnc
+mods: mod_ra mod_cnc mod_d2k
 all: core tools
 clean: 
 	@-rm -f *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
@@ -97,6 +97,16 @@ mod_cnc_EXTRA_CMDS	= mono --debug RALint.exe cnc
 PROGRAMS 		+= mod_cnc
 mod_cnc: $(mod_cnc_TARGET)
 
+# 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
 #
@@ -127,15 +137,19 @@ ralint: $(ralint_TARGET)
 
 # Builds and exports tilesets from a bitmap
 tsbuild_SRCS		:= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET		= TilesetBuilder.exe
+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
@@ -180,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 rsdl rnull game editor utility
+CORE = fileformats rcg rgl rsdl rnull game editor utility tsbuild
 
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
@@ -196,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
@@ -205,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
@@ -215,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 \"$$""@\"" >> 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

@@ -0,0 +1,92 @@
+namespace OpenRA.Editor
+{
+	partial class ActorPropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+			this.SuspendLayout();
+			// 
+			// button1
+			// 
+			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 = 0;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			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 = 0;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// flowLayoutPanel1
+			// 
+			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.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.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ActorPropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Actor Properties";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		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

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

OpenRA.Editor/ActorTool.cs

@@ -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

@@ -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/Form1.Designer.cs

@@ -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();
@@ -74,12 +75,16 @@ namespace OpenRA.Editor
 			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.fixOpenAreasToolStripMenuItem = 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();
@@ -90,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();
@@ -97,44 +103,44 @@ namespace OpenRA.Editor
 			this.menuStrip1.SuspendLayout();
 			this.statusStrip1.SuspendLayout();
 			this.SuspendLayout();
-			//
+			// 
 			// 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.splitContainer2);
-			//
+			// 
 			// splitContainer1.Panel2
-			//
+			// 
 			this.splitContainer1.Panel2.Controls.Add(this.surface1);
 			this.splitContainer1.Size = new System.Drawing.Size(985, 744);
 			this.splitContainer1.SplitterDistance = 198;
 			this.splitContainer1.TabIndex = 0;
-			//
+			// 
 			// splitContainer2
-			//
+			// 
 			this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.splitContainer2.Location = new System.Drawing.Point(0, 0);
 			this.splitContainer2.Name = "splitContainer2";
 			this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			//
+			// 
 			// splitContainer2.Panel1
-			//
+			// 
 			this.splitContainer2.Panel1.Controls.Add(this.pmMiniMap);
-			//
+			// 
 			// splitContainer2.Panel2
-			//
+			// 
 			this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
 			this.splitContainer2.Size = new System.Drawing.Size(198, 744);
 			this.splitContainer2.SplitterDistance = 164;
 			this.splitContainer2.TabIndex = 1;
-			//
+			// 
 			// pmMiniMap
-			//
+			// 
 			this.pmMiniMap.BackColor = System.Drawing.Color.Black;
 			this.pmMiniMap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
 			this.pmMiniMap.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -144,9 +150,9 @@ namespace OpenRA.Editor
 			this.pmMiniMap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 			this.pmMiniMap.TabIndex = 1;
 			this.pmMiniMap.TabStop = false;
-			//
+			// 
 			// tabControl1
-			//
+			// 
 			this.tabControl1.Controls.Add(this.tabPage1);
 			this.tabControl1.Controls.Add(this.tabPage2);
 			this.tabControl1.Controls.Add(this.tabPage3);
@@ -159,9 +165,9 @@ namespace OpenRA.Editor
 			this.tabControl1.SelectedIndex = 0;
 			this.tabControl1.Size = new System.Drawing.Size(198, 576);
 			this.tabControl1.TabIndex = 0;
-			//
+			// 
 			// tabPage1
-			//
+			// 
 			this.tabPage1.Controls.Add(this.tilePalette);
 			this.tabPage1.Location = new System.Drawing.Point(4, 20);
 			this.tabPage1.Name = "tabPage1";
@@ -170,9 +176,9 @@ namespace OpenRA.Editor
 			this.tabPage1.TabIndex = 0;
 			this.tabPage1.Text = "Templates";
 			this.tabPage1.UseVisualStyleBackColor = true;
-			//
+			// 
 			// tilePalette
-			//
+			// 
 			this.tilePalette.AutoScroll = true;
 			this.tilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.tilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -180,10 +186,11 @@ namespace OpenRA.Editor
 			this.tilePalette.Name = "tilePalette";
 			this.tilePalette.Size = new System.Drawing.Size(184, 546);
 			this.tilePalette.TabIndex = 1;
-			//
+			// 
 			// 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);
@@ -191,19 +198,41 @@ namespace OpenRA.Editor
 			this.tabPage2.TabIndex = 1;
 			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
-			//
+			// 
 			this.tabPage3.Controls.Add(this.resourcePalette);
 			this.tabPage3.Location = new System.Drawing.Point(4, 20);
 			this.tabPage3.Name = "tabPage3";
@@ -211,9 +240,9 @@ namespace OpenRA.Editor
 			this.tabPage3.TabIndex = 2;
 			this.tabPage3.Text = "Resources";
 			this.tabPage3.UseVisualStyleBackColor = true;
-			//
+			// 
 			// resourcePalette
-			//
+			// 
 			this.resourcePalette.AutoScroll = true;
 			this.resourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.resourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -221,9 +250,9 @@ namespace OpenRA.Editor
 			this.resourcePalette.Name = "resourcePalette";
 			this.resourcePalette.Size = new System.Drawing.Size(190, 552);
 			this.resourcePalette.TabIndex = 3;
-			//
+			// 
 			// surface1
-			//
+			// 
 			this.surface1.BackColor = System.Drawing.Color.Black;
 			this.surface1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.surface1.Location = new System.Drawing.Point(0, 0);
@@ -231,39 +260,33 @@ namespace OpenRA.Editor
 			this.surface1.Size = new System.Drawing.Size(783, 744);
 			this.surface1.TabIndex = 5;
 			this.surface1.Text = "surface1";
-			//
+			// 
 			// tt
-			//
+			// 
 			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;
 			this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
 			this.splitContainer3.IsSplitterFixed = true;
 			this.splitContainer3.Location = new System.Drawing.Point(0, 0);
 			this.splitContainer3.Name = "splitContainer3";
 			this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			//
+			// 
 			// splitContainer3.Panel1
-			//
+			// 
 			this.splitContainer3.Panel1.Controls.Add(this.menuStrip1);
-			//
+			// 
 			// splitContainer3.Panel2
-			//
+			// 
 			this.splitContainer3.Panel2.Controls.Add(this.splitContainer1);
 			this.splitContainer3.Size = new System.Drawing.Size(985, 773);
 			this.splitContainer3.SplitterDistance = 25;
 			this.splitContainer3.TabIndex = 6;
-			//
+			// 
 			// menuStrip1
-			//
+			// 
 			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.mapToolStripMenuItem,
@@ -274,9 +297,9 @@ namespace OpenRA.Editor
 			this.menuStrip1.Size = new System.Drawing.Size(985, 27);
 			this.menuStrip1.TabIndex = 1;
 			this.menuStrip1.Text = "menuStrip1";
-			//
+			// 
 			// fileToolStripMenuItem
-			//
+			// 
 			this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newToolStripMenuItem,
             this.toolStripSeparator1,
@@ -291,165 +314,183 @@ namespace OpenRA.Editor
 			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
 			this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 23);
 			this.fileToolStripMenuItem.Text = "&File";
-			//
+			// 
 			// newToolStripMenuItem
-			//
+			// 
 			this.newToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripMenuItem.Image")));
 			this.newToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia;
 			this.newToolStripMenuItem.Name = "newToolStripMenuItem";
 			this.newToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.newToolStripMenuItem.Text = "&New...";
 			this.newToolStripMenuItem.Click += new System.EventHandler(this.NewClicked);
-			//
+			// 
 			// toolStripSeparator1
-			//
+			// 
 			this.toolStripSeparator1.Name = "toolStripSeparator1";
 			this.toolStripSeparator1.Size = new System.Drawing.Size(120, 6);
-			//
+			// 
 			// openToolStripMenuItem
-			//
+			// 
 			this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image")));
 			this.openToolStripMenuItem.Name = "openToolStripMenuItem";
 			this.openToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.openToolStripMenuItem.Text = "&Open...";
 			this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenClicked);
-			//
+			// 
 			// saveToolStripMenuItem
-			//
+			// 
 			this.saveToolStripMenuItem.Enabled = false;
 			this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
 			this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
 			this.saveToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.saveToolStripMenuItem.Text = "&Save";
 			this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveClicked);
-			//
+			// 
 			// saveAsToolStripMenuItem
-			//
+			// 
 			this.saveAsToolStripMenuItem.Enabled = false;
 			this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
 			this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.saveAsToolStripMenuItem.Text = "Save &As...";
 			this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsClicked);
-			//
+			// 
 			// toolStripSeparator2
-			//
+			// 
 			this.toolStripSeparator2.Name = "toolStripSeparator2";
 			this.toolStripSeparator2.Size = new System.Drawing.Size(120, 6);
-			//
+			// 
 			// toolStripMenuItem1
-			//
+			// 
 			this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.cCRedAlertMapToolStripMenuItem,
             this.bitmapToolStripMenuItem});
 			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
 			this.toolStripMenuItem1.Size = new System.Drawing.Size(123, 22);
 			this.toolStripMenuItem1.Text = "&Import";
-			//
+			// 
 			// cCRedAlertMapToolStripMenuItem
-			//
+			// 
 			this.cCRedAlertMapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cCRedAlertMapToolStripMenuItem.Image")));
 			this.cCRedAlertMapToolStripMenuItem.Name = "cCRedAlertMapToolStripMenuItem";
 			this.cCRedAlertMapToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
 			this.cCRedAlertMapToolStripMenuItem.Text = "&C&&C / Red Alert Map...";
 			this.cCRedAlertMapToolStripMenuItem.Click += new System.EventHandler(this.ImportLegacyMapClicked);
-			//
+			// 
 			// bitmapToolStripMenuItem
-			//
+			// 
 			this.bitmapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("bitmapToolStripMenuItem.Image")));
 			this.bitmapToolStripMenuItem.Name = "bitmapToolStripMenuItem";
 			this.bitmapToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
 			this.bitmapToolStripMenuItem.Text = "&Bitmap...";
 			this.bitmapToolStripMenuItem.Visible = false;
-			//
+			// 
 			// mnuExport
-			//
+			// 
 			this.mnuExport.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.mnuMinimapToPNG});
 			this.mnuExport.Name = "mnuExport";
 			this.mnuExport.Size = new System.Drawing.Size(123, 22);
 			this.mnuExport.Text = "&Export";
-			//
+			// 
 			// mnuMinimapToPNG
-			//
+			// 
 			this.mnuMinimapToPNG.Enabled = false;
 			this.mnuMinimapToPNG.Image = ((System.Drawing.Image)(resources.GetObject("mnuMinimapToPNG.Image")));
 			this.mnuMinimapToPNG.Name = "mnuMinimapToPNG";
 			this.mnuMinimapToPNG.Size = new System.Drawing.Size(163, 22);
 			this.mnuMinimapToPNG.Text = "Minimap to PNG";
 			this.mnuMinimapToPNG.Click += new System.EventHandler(this.ExportMinimap);
-			//
+			// 
 			// toolStripSeparator3
-			//
+			// 
 			this.toolStripSeparator3.Name = "toolStripSeparator3";
 			this.toolStripSeparator3.Size = new System.Drawing.Size(120, 6);
-			//
+			// 
 			// exitToolStripMenuItem
-			//
+			// 
 			this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
 			this.exitToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.exitToolStripMenuItem.Text = "E&xit";
 			this.exitToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked);
-			//
+			// 
 			// mapToolStripMenuItem
-			//
+			// 
 			this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.propertiesToolStripMenuItem,
             this.resizeToolStripMenuItem,
             this.showActorNamesToolStripMenuItem,
             this.showGridToolStripMenuItem,
-            this.fixOpenAreasToolStripMenuItem});
+            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";
-			//
+			// 
 			// propertiesToolStripMenuItem
-			//
+			// 
 			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);
-			//
+			// 
 			// resizeToolStripMenuItem
-			//
+			// 
 			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(175, 22);
+			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(175, 22);
+			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;
 			this.toolStripComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.toolStripComboBox1.Name = "toolStripComboBox1";
 			this.toolStripComboBox1.Size = new System.Drawing.Size(121, 23);
-			//
+			// 
 			// toolStripLabel1
-			//
+			// 
 			this.toolStripLabel1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
 			this.toolStripLabel1.Name = "toolStripLabel1";
 			this.toolStripLabel1.Size = new System.Drawing.Size(71, 20);
 			this.toolStripLabel1.Text = "Active Mod:";
-			//
+			// 
 			// statusStrip1
-			//
+			// 
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabelFiller,
             this.toolStripStatusLabelMousePosition});
@@ -458,29 +499,39 @@ namespace OpenRA.Editor
 			this.statusStrip1.Size = new System.Drawing.Size(985, 22);
 			this.statusStrip1.TabIndex = 7;
 			this.statusStrip1.Text = "statusStrip1";
-			//
+			// 
 			// toolStripStatusLabelFiller
-			//
+			// 
 			this.toolStripStatusLabelFiller.Name = "toolStripStatusLabelFiller";
 			this.toolStripStatusLabelFiller.Size = new System.Drawing.Size(948, 17);
 			this.toolStripStatusLabelFiller.Spring = true;
-			//
+			// 
 			// toolStripStatusLabelMousePosition
-			//
+			// 
 			this.toolStripStatusLabelMousePosition.Name = "toolStripStatusLabelMousePosition";
 			this.toolStripStatusLabelMousePosition.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
 			this.toolStripStatusLabelMousePosition.Size = new System.Drawing.Size(22, 17);
 			this.toolStripStatusLabelMousePosition.Text = "0,0";
-			//
-			// fixOpenAreasToolStripMenuItem
-			//
-			this.fixOpenAreasToolStripMenuItem.Name = "fixOpenAreasToolStripMenuItem";
-			this.fixOpenAreasToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.fixOpenAreasToolStripMenuItem.Text = "&Fix Open Areas";
-			this.fixOpenAreasToolStripMenuItem.Click += new System.EventHandler(this.FixOpenAreas);
-			//
+			// 
+			// copySelectionToolStripMenuItem
+			// 
+			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
-			//
+			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(985, 773);
@@ -492,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);
@@ -505,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();
@@ -527,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;
@@ -561,6 +611,13 @@ namespace OpenRA.Editor
 		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

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -56,6 +57,7 @@ namespace OpenRA.Editor
 
 			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;
@@ -112,38 +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 = tileset.RenderTemplate((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>();
@@ -157,9 +207,9 @@ namespace OpenRA.Editor
 
 					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
 					if (etf != null && etf.ExcludeTilesets != null
-					    && etf.ExcludeTilesets.Contains(tileset.Id)) continue;
+						&& etf.ExcludeTilesets.Contains(tileset.Id)) continue;
 					if (etf != null && etf.RequireTilesets != null
-					    && !etf.RequireTilesets.Contains(tileset.Id)) continue;
+						&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
 
 					var template = RenderUtils.RenderActor(info, tileset, palette);
 					var ibox = new PictureBox
@@ -233,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)
@@ -250,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)
 				{
@@ -408,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)
@@ -447,5 +511,45 @@ namespace OpenRA.Editor
 			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/LegacyMapImporter.cs

@@ -175,7 +175,7 @@ namespace OpenRA.Editor
 			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);
 			}
@@ -189,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);
@@ -219,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;
@@ -276,7 +276,7 @@ namespace OpenRA.Editor
 						Map.Actors.Value.Add("Actor" + ActorCount++,
 							new ActorReference(overlayActorMapping[raOverlayNames[o]])
 							{
-								new LocationInit( new int2(i, j) ),
+								new LocationInit( new CPos(i, j) ),
 								new OwnerInit( "Neutral" )
 							});
 				}
@@ -284,7 +284,7 @@ namespace OpenRA.Editor
 
 		void ReadRATrees(IniFile file)
 		{
-			IniSection terrain = file.GetSection("TERRAIN", true);
+			var terrain = file.GetSection("TERRAIN", true);
 			if (terrain == null)
 				return;
 
@@ -294,7 +294,7 @@ namespace OpenRA.Editor
 				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")
 					});
 			}
@@ -316,14 +316,14 @@ namespace OpenRA.Editor
 
 		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()))
@@ -343,7 +343,7 @@ namespace OpenRA.Editor
 
 		void ReadCncTrees(IniFile file)
 		{
-			IniSection terrain = file.GetSection("TERRAIN", true);
+			var terrain = file.GetSection("TERRAIN", true);
 			if (terrain == null)
 				return;
 
@@ -353,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")
 					});
 			}
@@ -375,13 +375,12 @@ namespace OpenRA.Editor
 					if (parts[0] == "")
 						parts[0] = "Neutral";
 
-
 					if (!Players.Contains(parts[0]))
 						Players.Add(parts[0]);
 
 					var actor = new ActorReference(parts[1].ToLowerInvariant())
 					{
-						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new 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])),
@@ -427,13 +426,13 @@ namespace OpenRA.Editor
 				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 [] {"Neutral"};
+			var neutral = new [] {"Neutral"};
 			foreach (var s in file.GetSection(section, true))
 			{
 				Console.WriteLine(s.Key);
@@ -443,8 +442,8 @@ 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;
 				}
 			}

OpenRA.Editor/MapSelect.Designer.cs

@@ -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();
@@ -75,7 +75,7 @@ namespace OpenRA.Editor
 			//
 			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;
@@ -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

@@ -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;
+		void MapSelect_Load(object sender, EventArgs e)
+		{
+			MapList.Items.Clear();
+			txtPathOut.Text = MapFolderPath;
 
-            foreach (var map in ModData.FindMapsIn(MapFolderPath))
-            {
-                ListViewItem map1 = new ListViewItem();
+			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

@@ -110,118 +110,118 @@ namespace OpenRA.Editor
 			//
 			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

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">
+<?xml version="1.0" encoding="utf-8"?>
+<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

@@ -44,15 +44,15 @@ namespace OpenRA.Editor
 				.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/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

@@ -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/RenderUtils.cs

@@ -26,7 +26,7 @@ namespace OpenRA.Editor
 
 			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
@@ -45,9 +45,9 @@ namespace OpenRA.Editor
 
 		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
 		{
-            var image = RenderSimple.GetImage(info);
+			var image = RenderSimple.GetImage(info);
 
-            using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
 			{
 				var shp = new ShpReader(s);
 				var bitmap = RenderShp(shp, p);
@@ -84,7 +84,7 @@ namespace OpenRA.Editor
 
 				var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
 				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

OpenRA.Editor/ResizeDialog.Designer.cs

@@ -60,16 +60,16 @@ namespace OpenRA.Editor
 			// 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;
@@ -96,10 +96,10 @@ namespace OpenRA.Editor
 			//
 			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;
@@ -108,10 +108,10 @@ namespace OpenRA.Editor
 			//
 			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;
@@ -120,10 +120,10 @@ namespace OpenRA.Editor
 			//
 			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;
@@ -132,10 +132,10 @@ namespace OpenRA.Editor
 			//
 			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;
@@ -172,16 +172,16 @@ namespace OpenRA.Editor
 			// 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;

OpenRA.Editor/Surface.cs

@@ -38,8 +38,17 @@ namespace OpenRA.Editor
 		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>();
@@ -56,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)
 		{
@@ -80,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;
 
@@ -89,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);
@@ -145,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();
@@ -170,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)
@@ -187,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();
@@ -200,7 +233,7 @@ namespace OpenRA.Editor
 
 			var bitmap = new Bitmap(ChunkSize * TileSet.TileSize, ChunkSize * TileSet.TileSize);
 
-			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+			var data = bitmap.LockBits(bitmap.Bounds(),
 				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
 
 			unsafe
@@ -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();
@@ -255,31 +288,39 @@ namespace OpenRA.Editor
 			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);
 
@@ -292,7 +333,7 @@ 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);
@@ -302,26 +343,31 @@ namespace OpenRA.Editor
 				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);
+			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)
@@ -350,6 +396,25 @@ 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))
@@ -378,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/ColorRamp.cs

@@ -12,36 +12,34 @@ using System.Drawing;
 
 namespace OpenRA.FileFormats
 {
-    public struct ColorRamp
-    {
-        public byte H,S,L,R;
+	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;
-        }
+		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 ) );
-        }
+		/* 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);
-        }
+		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)
+		// 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[] trgb = { hk + 1 / 3.0f, hk, hk - 1/3.0f };
 			float[] rgb = { 0, 0, 0 };
 
 			for (int k = 0; k < 3; k++)
@@ -60,5 +58,23 @@ namespace OpenRA.FileFormats
 
 			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/Exts.cs

@@ -113,10 +113,10 @@ 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)
 		{
@@ -125,36 +125,36 @@ namespace OpenRA
 					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 )
 		{
@@ -171,5 +171,95 @@ namespace OpenRA
 			++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

@@ -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 ) );
 		}
 
@@ -143,63 +148,63 @@ 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);
@@ -305,14 +310,13 @@ 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),
@@ -321,20 +325,29 @@ namespace OpenRA.FileFormats
 					((int)c.B).Clamp(0, 255));
 			}
 
-			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);
 			}
 
-			if (f.FieldType.IsArray)
+			if (t.IsArray)
 			{
 				var elems = ((Array)v).OfType<object>();
-				return string.Join(",", elems.Select(a => a.ToString()).ToArray());
+				return elems.JoinWith(",");
 			}
 
 			return v.ToString();
 		}
+
+		public static string FormatValue(object o, FieldInfo f)
+		{
+			return FormatValue(f.GetValue(o), f.FieldType);
+		}
 	}
 
 	public class FieldFromYamlKeyAttribute : Attribute { }

OpenRA.FileFormats/FileFormats/Blast.cs

@@ -182,13 +182,13 @@ 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)

OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs

@@ -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/Format40.cs

@@ -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

@@ -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++ ];

OpenRA.FileFormats/Filesystem/FileSystem.cs

@@ -38,36 +38,36 @@ 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);
-        }
+				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 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)
 		{
@@ -123,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 )
 		{
@@ -157,42 +139,39 @@ 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);

OpenRA.FileFormats/Filesystem/Folder.cs

@@ -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/MixFile.cs

@@ -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;

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -73,13 +73,13 @@ 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>
 	{

OpenRA.FileFormats/Graphics/PngLoader.cs

@@ -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

@@ -8,10 +8,10 @@
  */
 #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;
@@ -69,40 +64,37 @@ namespace OpenRA.FileFormats
 
 		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;
 		}
 
 		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/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/Manifest.cs

@@ -20,7 +20,7 @@ namespace OpenRA.FileFormats
 		public readonly string[]
 			Mods, Folders, Packages, Rules, ServerTraits,
 			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
-			Weapons, Voices, Music, Movies, TileSets, ChromeMetrics;
+			Weapons, Voices, Notifications, Music, Movies, TileSets, ChromeMetrics;
 		public readonly MiniYaml LoadScreen;
 		public readonly Dictionary<string, Pair<string,int>> Fonts;
 		public readonly int TileSize = 24;
@@ -44,14 +44,17 @@ 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["LoadScreen"];
-			Fonts = yaml["Fonts"].NodesDict.ToDictionary(x => x.Key, x => Pair.New(x.Value.NodesDict["Font"].Value,
-				                                                  int.Parse(x.Value.NodesDict["Size"].Value)));
+			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);
 		}
@@ -59,7 +62,7 @@ namespace OpenRA.FileFormats
 		static string[] YamlList(Dictionary<string, MiniYaml> yaml, string key)
 		{
 			if (!yaml.ContainsKey(key))
-				return new string[ 0 ];
+				return new string[] {};
 
 			return yaml[key].NodesDict.Keys.ToArray();
 		}

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -28,7 +28,7 @@ namespace OpenRA.FileFormats
 		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;
@@ -41,9 +41,8 @@ namespace OpenRA.FileFormats
 		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

@@ -15,6 +15,7 @@ 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;
@@ -22,10 +23,9 @@ namespace OpenRA.FileFormats
 			Depth = depth;
 		}
 
-		public override string ToString ()
+		public override string ToString()
 		{
-			return string.Format("{0} {1},{2} {3}", Type, Location.X,Location.Y, Depth);
+			return "{0} {1},{2} {3}".F(Type, Location.X, Location.Y, Depth);
 		}
-
 	}
 }

OpenRA.FileFormats/Map/TileSet.cs

@@ -20,9 +20,10 @@ namespace OpenRA.FileFormats
 	public class TerrainTypeInfo
 	{
 		public string Type;
-		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); }
@@ -36,6 +37,7 @@ namespace OpenRA.FileFormats
 		public string Image;
 		public int2 Size;
 		public bool PickAny;
+		public string Category;
 
 		[FieldLoader.LoadUsing( "LoadTiles" )]
 		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
@@ -166,7 +168,7 @@ namespace OpenRA.FileFormats
 
 			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

OpenRA.FileFormats/MiniYaml.cs

@@ -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
@@ -105,22 +105,26 @@ namespace OpenRA.FileFormats
 			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);
 			}
@@ -177,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 )
 		{
@@ -200,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 )
 			{
@@ -211,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
 				{
@@ -225,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 )
 		{
@@ -271,7 +275,7 @@ 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)
@@ -286,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/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" />
@@ -85,7 +102,6 @@
     <Compile Include="Graphics\ShpWriter.cs" />
     <Compile Include="Graphics\Vertex.cs" />
     <Compile Include="Graphics\VqaReader.cs" />
-    <Compile Include="HttpUtil.cs" />
     <Compile Include="InstallUtils.cs" />
     <Compile Include="Manifest.cs" />
     <Compile Include="Map\PlayerReference.cs" />
@@ -117,6 +133,23 @@
     <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. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -125,4 +158,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

OpenRA.FileFormats/PackageEntry.cs

@@ -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)

OpenRA.FileFormats/Palette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -39,7 +39,7 @@ namespace OpenRA.FileFormats
 			get { return colors; }
 		}
 
-		public Palette(Stream s, bool remapTransparent)
+		public Palette(Stream s, int[] remapShadow)
 		{
 			colors = new uint[256];
 
@@ -54,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)
@@ -92,12 +88,12 @@ namespace OpenRA.FileFormats
 			return pal;
 		}
 
-		public static Palette Load( string filename, bool remap )
+		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

@@ -21,7 +21,7 @@ namespace OpenRA
 	{
 		public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } }
 
-		static Lazy<PlatformType> currentPlatform = new Lazy<PlatformType>(GetCurrentPlatform);
+		static Lazy<PlatformType> currentPlatform = Lazy.New((Func<PlatformType>)GetCurrentPlatform);
 
 		static PlatformType GetCurrentPlatform()
 		{

OpenRA.FileFormats/PlayerColorRemap.cs

@@ -14,33 +14,33 @@ 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 */
-
-			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 };
-
-			remapColors = ramp.Select((x, i) => Pair.New(baseIndex + i, ColorLerp(x / 16f, c1, c2)))
-				.ToDictionary(u => u.First, u => u.Second);
+			return Ramp[i];
 		}
 
-		public static Color ColorLerp(float t, Color c1, Color c2)
+		public PlayerColorRemap(int[] Ramp, ColorRamp c)
 		{
-			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));
+			var c1 = c.GetColor(0);
+			var c2 = c.GetColor(1); // temptemp: this can be expressed better
+
+			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 Color GetRemappedColor(Color original, int index)

OpenRA.FileFormats/Primitives/ActionQueue.cs

@@ -56,7 +56,7 @@ namespace OpenRA.FileFormats
 
 		public int CompareTo(DelayedAction other)
 		{
-			return Math.Sign(Time - other.Time);
+			return Time.CompareTo(other.Time);
 		}
 	}
 }

OpenRA.FileFormats/Primitives/Bits.cs

@@ -57,7 +57,7 @@ namespace OpenRA.FileFormats
 
 		public override string ToString()
 		{
-			return string.Join(",", BitAllocator<T>.GetStrings(Value).ToArray());
+			return BitAllocator<T>.GetStrings(Value).JoinWith(",");
 		}
 
 		public override int GetHashCode() { return Value.GetHashCode(); }

OpenRA.FileFormats/Primitives/Pair.cs

@@ -71,8 +71,8 @@ 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()
@@ -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/Set.cs

@@ -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

@@ -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

@@ -52,10 +52,10 @@ 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)
@@ -76,7 +76,7 @@ namespace OpenRA
 		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/Support/Log.cs

@@ -38,34 +38,34 @@ namespace OpenRA
 			}
 		}
 
-        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/TypeDictionary.cs

@@ -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

@@ -32,9 +32,9 @@ namespace OpenRA
 
 		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
 
-		public int2 Location { get { return occupySpace.Value.TopLeft; } }
+		public CPos Location { get { return occupySpace.Value.TopLeft; } }
 
-		public int2 CenterLocation
+		public PPos CenterLocation
 		{
 			get
 			{
@@ -82,7 +82,7 @@ namespace OpenRA
 				// auto size from render
 				var firstSprite = TraitsImplementing<IRender>().SelectMany(ApplyIRender).FirstOrDefault();
 				if (firstSprite.Sprite == null) return int2.Zero;
-                return (firstSprite.Sprite.size * firstSprite.Scale).ToInt2();
+				return (firstSprite.Sprite.size * firstSprite.Scale).ToInt2();
 			});
 
 			ApplyIRender = x => x.Render(this);
@@ -105,7 +105,7 @@ namespace OpenRA
 			get { return currentActivity == null; }
 		}
 
-        OpenRA.FileFormats.Lazy<int2> Size;
+		OpenRA.FileFormats.Lazy<int2> Size;
 
 		// note: these delegates are cached to avoid massive allocation.
 		Func<IRender, IEnumerable<Renderable>> ApplyIRender;
@@ -123,22 +123,30 @@ namespace OpenRA
 		// at its current altitude
 		Rectangle CalculateBounds(bool useAltitude)
 		{
-			var size = Size.Value;
+			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)
 			{
+#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 = Move.Value;
 			if (move != null)
 			{
+#if true
+				loc -= new PVecInt(0, move.Altitude);
+#else
 				loc.Y -= move.Altitude;
+#endif
 				if (useAltitude)
-					size = new int2(size.X, size.Y + move.Altitude);
+					size = new PVecInt(size.X, size.Y + move.Altitude);
 			}
 
 			return new Rectangle(loc.X, loc.Y, size.X, size.Y);

OpenRA.Game/ActorInitializer.cs

@@ -62,20 +62,28 @@ namespace OpenRA
 		public int Value( World world ) { return value; }
 	}
 
-	public class LocationInit : IActorInit<int2>
+	public class LocationInit : IActorInit<CPos>
 	{
 		[FieldFromYamlKey] public readonly int2 value = int2.Zero;
 		public LocationInit() { }
-		public LocationInit( int2 init ) { value = init; }
-		public int2 Value( World world ) { return value; }
+		public LocationInit( CPos init ) { value = init.ToInt2(); }
+		public CPos Value(World world) { return (CPos)value; }
 	}
 
-	public class CenterLocationInit : IActorInit<int2>
+	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 class CenterLocationInit : IActorInit<PPos>
 	{
 		[FieldFromYamlKey] public readonly int2 value = int2.Zero;
 		public CenterLocationInit() { }
-		public CenterLocationInit( int2 init ) { value = init; }
-		public int2 Value( World world ) { return value; }
+		public CenterLocationInit(PPos init) { value = init.ToInt2(); }
+		public PPos Value(World world) { return (PPos)value; }
 	}
 
 	public class OwnerInit : IActorInit<Player>

OpenRA.Game/ActorMap.cs

@@ -37,7 +37,7 @@ namespace OpenRA
 			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;
 
@@ -46,7 +46,7 @@ namespace OpenRA
 					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;
 
@@ -55,7 +55,7 @@ namespace OpenRA
 					yield return i.actor;
 		}
 
-		public bool HasFreeSubCell(int2 a)
+		public bool HasFreeSubCell(CPos a)
 		{
 			if (!AnyUnitsAt(a))
 				return true;
@@ -64,12 +64,12 @@ namespace OpenRA
 				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)

OpenRA.Game/ActorReference.cs

@@ -15,8 +15,8 @@ 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); }
+	}
+}

OpenRA.Game/Game.cs

@@ -50,13 +50,8 @@ namespace OpenRA
 
 		public static void JoinServer(string host, int port)
 		{
-			var replayFilename = ChooseReplayFilename();
-			string path = Path.Combine( Platform.SupportDir, "Replays" );
-			if( !Directory.Exists( path ) ) Directory.CreateDirectory( path );
-			var replayFile = File.Create( Path.Combine( path, replayFilename ) );
-
 			JoinInner(new OrderManager(host, port,
-				new ReplayRecorderConnection(new NetworkConnection(host, port), replayFile)));
+				new ReplayRecorderConnection(new NetworkConnection(host, port), ChooseReplayFilename)));
 		}
 
 		static string ChooseReplayFilename()
@@ -95,14 +90,14 @@ namespace OpenRA
 		// Hacky workaround for orderManager visibility
 		public static Widget OpenWindow(World world, string widget)
 		{
-			return Widget.OpenWindow(widget, new WidgetArgs() {{ "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer }});
+			return Ui.OpenWindow(widget, new WidgetArgs() {{ "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer }});
 		}
 
 		// Who came up with the great idea of making these things
 		// impossible for the things that want them to access them directly?
 		public static Widget OpenWindow(string widget, WidgetArgs args)
 		{
-			return Widget.OpenWindow(widget, new WidgetArgs(args)
+			return Ui.OpenWindow(widget, new WidgetArgs(args)
 			{
 				{ "world", worldRenderer.world },
 				{ "orderManager", orderManager },
@@ -160,7 +155,7 @@ namespace OpenRA
 				using( new PerfSample( "tick_time" ) )
 				{
 					orderManager.LastTickTime += Settings.Game.Timestep;
-					Widget.DoTick();
+					Ui.Tick();
 					var world = orderManager.world;
 					if (orderManager.GameStarted)
 						++Viewport.TicksSinceLastMove;
@@ -171,7 +166,7 @@ namespace OpenRA
 					{
 						var isNetTick = LocalTick % NetTickScale == 0;
 
-						if (!isNetTick || orderManager.IsReadyForNextFrame)
+						if ((!isNetTick || orderManager.IsReadyForNextFrame) && !orderManager.GamePaused )
 						{
 							++orderManager.LocalFrameNumber;
 
@@ -193,6 +188,8 @@ namespace OpenRA
 						else
 							if (orderManager.NetFrameNumber == 0)
 								orderManager.LastTickTime = Environment.TickCount;
+					
+						viewport.Tick();
 					}
 				}
 		}
@@ -205,17 +202,17 @@ namespace OpenRA
 		}
 
 		public static event Action BeforeGameStart = () => {};
-		internal static void StartGame(string mapUID)
+		internal static void StartGame(string mapUID, bool isShellmap)
 		{
 			BeforeGameStart();
 
 			var map = modData.PrepareMap(mapUID);
 			viewport = new Viewport(new int2(Renderer.Resolution), map.Bounds, Renderer);
-			orderManager.world = new World(modData.Manifest, map, orderManager);
+			orderManager.world = new World(modData.Manifest, map, orderManager) { IsShellmap = isShellmap };
 			worldRenderer = new WorldRenderer(orderManager.world);
 
 			if (orderManager.GameStarted) return;
-			Widget.SelectedWidget = null;
+			Ui.SelectedWidget = null;
 
 			orderManager.LocalFrameNumber = 0;
 			orderManager.LastTickTime = Environment.TickCount;
@@ -225,7 +222,12 @@ namespace OpenRA
 
 		public static bool IsHost
 		{
-			get { return orderManager.Connection.LocalClientId == 0; }
+			get 
+			{
+				var client= orderManager.LobbyInfo.ClientWithIndex (
+					orderManager.Connection.LocalClientId);
+				return ((client!=null) && client.IsAdmin);
+			}
 		}
 
 		public static Dictionary<String, Mod> CurrentMods
@@ -244,7 +246,6 @@ namespace OpenRA
 			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
 
 			Settings = new Settings(Platform.SupportDir + "settings.yaml", args);
-			Settings.Save();
 
 			Log.LogPath = Platform.SupportDir + "Logs" + Path.DirectorySeparatorChar;
 			Log.AddChannel("perf", "perf.log");
@@ -259,7 +260,7 @@ namespace OpenRA
 			foreach(var mod in Mod.AllMods)
 				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
 
-			Sound.Create();
+			Sound.Create(Settings.Sound.Engine);
 			InitializeWithMods(Settings.Game.Mods);
 		}
 
@@ -270,7 +271,7 @@ namespace OpenRA
 			AddChatLine = (a,b,c) => {};
 			ConnectionStateChanged = om => {};
 			BeforeGameStart = () => {};
-			Widget.ResetAll();
+			Ui.ResetAll();
 
 			worldRenderer = null;
 			if (server != null)
@@ -278,11 +279,11 @@ namespace OpenRA
 			if (orderManager != null)
 				orderManager.Dispose();
 
-			// Discard any invalid mods
+			// Discard any invalid mods, set RA as default
 			var mm = mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
-			Console.WriteLine("Loading mods: {0}",string.Join(",",mm));
+			if (mm.Length == 0) mm = new[] { "ra" };
+			Console.WriteLine("Loading mods: {0}", mm.JoinWith(","));
 			Settings.Game.Mods = mm;
-			Settings.Save();
 
 			Sound.StopMusic();
 			Sound.StopVideo();
@@ -302,31 +303,45 @@ namespace OpenRA
 			viewport = new Viewport(new int2(Renderer.Resolution), Rectangle.Empty, Renderer);
 
 			modData.LoadScreen.StartGame();
+			Settings.Save();
 		}
 
 		public static void LoadShellMap()
 		{
-			StartGame(ChooseShellmap());
+			StartGame(ChooseShellmap(), true);
 		}
 
-        static string ChooseShellmap()
-        {
-            var shellmaps =  modData.AvailableMaps
-                .Where(m => m.Value.UseAsShellmap);
+		static string ChooseShellmap()
+		{
+			var shellmaps =  modData.AvailableMaps
+				.Where(m => m.Value.UseAsShellmap);
 
 			if (shellmaps.Count() == 0)
 				throw new InvalidDataException("No valid shellmaps available");
 
 			return shellmaps.Random(CosmeticRandom).Key;
-        }
+		}
 
 		static bool quit;
 		public static event Action OnQuit = () => {};
+
 		internal static void Run()
 		{
 			while (!quit)
+			{
+				var idealFrameTime = 1.0 / Settings.Graphics.MaxFramerate;
+				var sw = new Stopwatch();
+
 				Tick( orderManager, viewport );
 
+				if (Settings.Graphics.CapFramerate)
+				{
+					var waitTime = idealFrameTime - sw.ElapsedTime();
+					if (waitTime > 0)
+						System.Threading.Thread.Sleep( TimeSpan.FromSeconds(waitTime) );
+				}
+			}
+
 			OnQuit();
 		}
 
@@ -343,9 +358,10 @@ namespace OpenRA
 		{
 			if (orderManager.world != null)
 				orderManager.world.traitDict.PrintReport();
+
+			orderManager.Dispose();
 			CloseServer();
 			JoinLocal();
-			orderManager.Dispose();
 		}
 
 		public static void CloseServer()
@@ -376,6 +392,7 @@ namespace OpenRA
 			// Work around a miscompile in mono 2.6.7:
 			// booleans that default to true cannot be set false by an initializer
 			settings.AdvertiseOnline = false;
+			settings.AllowUPnP = false;
 
 			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0),
 				Game.Settings.Game.Mods, settings, modData);
@@ -387,5 +404,22 @@ namespace OpenRA
 		{
 			return orderManager != null && orderManager.world == world;
 		}
+
+		public static void JoinExternalGame()
+		{
+			var addressParts = Game.Settings.Game.ConnectTo.Split(
+				new [] { ':' }, StringSplitOptions.RemoveEmptyEntries);
+
+			if (addressParts.Length < 1 || addressParts.Length > 2)
+				return;
+
+			var host = addressParts[0];
+			var port = Exts.WithDefault(1234, () => int.Parse(addressParts[1]));
+
+			Game.Settings.Game.ConnectTo = "";
+			Game.Settings.Save();
+
+			Game.JoinServer(host, port);
+		}
 	}
 }

OpenRA.Game/GameRules/ActorInfo.cs

@@ -23,30 +23,21 @@ namespace OpenRA
 
 		public ActorInfo( string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
-            try
-            {
-                var mergedNode = MergeWithParent(node, allUnits).NodesDict;
+			try
+			{
+				var mergedNode = MergeWithParent(node, allUnits).NodesDict;
 
-                Name = name;
-                foreach (var t in mergedNode)
-                    if (t.Key != "Inherits" && !t.Key.StartsWith("-"))
-                        Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
-            }
-            catch (YamlException e)
-            {
-                throw new YamlException("Actor type {0}: {1}".F(name, e.Message));
-            }
+				Name = name;
+				foreach (var t in mergedNode)
+					if (t.Key != "Inherits" && !t.Key.StartsWith("-"))
+						Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+			}
+			catch (YamlException e)
+			{
+				throw new YamlException("Actor type {0}: {1}".F(name, e.Message));
+			}
 		}
 
-        static IEnumerable<MiniYaml> GetInheritanceChain(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
-        {
-            while (node != null)
-            {
-                yield return node;
-                node = GetParent(node, allUnits);
-            }
-        }
-
 		static MiniYaml GetParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
 			MiniYaml inherits;
@@ -56,9 +47,9 @@ namespace OpenRA
 
 			MiniYaml parent;
 			allUnits.TryGetValue( inherits.Value, out parent );
-            if (parent == null)
-                throw new InvalidOperationException(
-                    "Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
+			if (parent == null)
+				throw new InvalidOperationException(
+					"Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
 
 			return parent;
 		}
@@ -66,14 +57,14 @@ namespace OpenRA
 		static MiniYaml MergeWithParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
 			var parent = GetParent( node, allUnits );
-            if (parent != null)
-            {
-                var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
+			if (parent != null)
+			{
+				var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
 
-                // strip the '-'
-                result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
-                return result;
-            }
+				// strip the '-'
+				result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
+				return result;
+			}
 			return node;
 		}
 
@@ -102,14 +93,14 @@ namespace OpenRA
 				else if (++index >= t.Count)
 					throw new InvalidOperationException("Trait prerequisites not satisfied (or prerequisite loop) Actor={0} Unresolved={1} Missing={2}".F(
 						Name,
-						string.Join(",", t.Select(x => x.GetType().Name).ToArray()),
-						string.Join(",", unsatisfied.Select(x => x.Name).ToArray())));
+						t.Select(x => x.GetType().Name).JoinWith(","),
+						unsatisfied.Select(x => x.Name).JoinWith(",")));
 			}
 
 			return ret;
 		}
 
-		static List<Type> PrerequisitesOf( ITraitInfo info )
+		static List<Type> PrerequisitesOf(ITraitInfo info)
 		{
 			return info
 				.GetType()
@@ -118,5 +109,19 @@ namespace OpenRA
 				.Select( t => t.GetGenericArguments()[ 0 ] )
 				.ToList();
 		}
+
+		public IEnumerable<Pair<string, Type>> GetInitKeys()
+		{
+			var inits = Traits.WithInterface<ITraitInfo>().SelectMany(
+				t => t.GetType().GetInterfaces()
+					.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>))
+					.Select(i => i.GetGenericArguments()[0])).ToList();
+
+			inits.Add( typeof(OwnerInit) );		/* not exposed by a trait; this is used by the Actor itself */
+
+			return inits.Select(
+				i => Pair.New(
+					i.Name.Replace( "Init", "" ), i ));
+		}
 	}
 }

OpenRA.Game/GameRules/Rules.cs

@@ -20,7 +20,8 @@ namespace OpenRA
 	{
 		public static Dictionary<string, ActorInfo> Info;
 		public static Dictionary<string, WeaponInfo> Weapons;
-		public static Dictionary<string, VoiceInfo> Voices;
+		public static Dictionary<string, SoundInfo> Voices;
+		public static Dictionary<string, SoundInfo> Notifications;
 		public static Dictionary<string, MusicInfo> Music;
 		public static Dictionary<string, string> Movies;
 		public static Dictionary<string, TileSet> TileSets;
@@ -30,7 +31,8 @@ namespace OpenRA
 			// Added support to extend the list of rules (add it to m.LocalRules)
 			Info = LoadYamlRules(m.Rules, map.Rules, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
 			Weapons = LoadYamlRules(m.Weapons, map.Weapons, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
-			Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new VoiceInfo(k.Value));
+			Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new SoundInfo(k.Value));
+			Notifications = LoadYamlRules(m.Notifications, map.Notifications, (k, _) => new SoundInfo(k.Value));
 			Music = LoadYamlRules(m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
 			Movies = LoadYamlRules(m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
 

OpenRA.Game/GameRules/Settings.cs

@@ -19,6 +19,9 @@ using OpenRA.Server;
 
 namespace OpenRA.GameRules
 {
+	public enum MouseScrollType { Disabled, Standard, Inverted }
+	public enum SoundCashTicks { Disabled, Normal, Extreme }
+
 	public class ServerSettings
 	{
 		public string Name = "OpenRA Game";
@@ -26,8 +29,11 @@ namespace OpenRA.GameRules
 		public int ExternalPort = 1234;
 		public bool AdvertiseOnline = true;
 		public string MasterServer = "http://master.open-ra.org/";
+		public bool AllowUPnP = false;
 		public bool AllowCheats = false;
 		public string Map = null;
+		public string[] Ban = null;
+		public int TimeOut = 0;
 
 		public ServerSettings() { }
 
@@ -38,8 +44,11 @@ namespace OpenRA.GameRules
 			ExternalPort = other.ExternalPort;
 			AdvertiseOnline = other.AdvertiseOnline;
 			MasterServer = other.MasterServer;
+			AllowUPnP = other.AllowUPnP;
 			AllowCheats = other.AllowCheats;
 			Map = other.Map;
+			Ban = other.Ban;
+			TimeOut = other.TimeOut;
 		}
 	}
 
@@ -49,7 +58,7 @@ namespace OpenRA.GameRules
 		public bool PerfText = false;
 		public bool PerfGraph = false;
 		public float LongTickThreshold = 0.001f;
-        public bool SanityCheckUnsyncedCode = false;
+		public bool SanityCheckUnsyncedCode = false;
 		public int Samples = 25;
 	}
 
@@ -60,6 +69,8 @@ namespace OpenRA.GameRules
 		public int2 FullscreenSize = new int2(0,0);
 		public int2 WindowedSize = new int2(1024, 768);
 		public bool PixelDouble = false;
+		public bool CapFramerate = false;
+		public int MaxFramerate = 60;
 
 		public int BatchSize = 8192;
 		public int NumTempBuffers = 8;
@@ -74,29 +85,33 @@ namespace OpenRA.GameRules
 		public bool Shuffle = false;
 		public bool Repeat = false;
 		public bool ShellmapMusic = true;
+		public string Engine = "AL";
+		
+		public SoundCashTicks SoundCashTickType = SoundCashTicks.Extreme;
 	}
 
 	public class PlayerSettings
 	{
 		public string Name = "Newbie";
-        public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
+		public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
 		public string LastServer = "localhost:1234";
 	}
 
-	public enum MouseScrollType { Disabled, Standard, Inverted }
-
 	public class GameSettings
 	{
 		public string[] Mods = { "ra" };
 
 		public bool TeamChatToggle = false;
+		public bool ShowShellmap = true;
 
-        public bool ViewportEdgeScroll = true;
-        public MouseScrollType MouseScroll = MouseScrollType.Standard;
+		public bool ViewportEdgeScroll = true;
+		public MouseScrollType MouseScroll = MouseScrollType.Standard;
 		public float ViewportEdgeScrollStep = 10f;
 
 		// Internal game settings
 		public int Timestep = 40;
+
+		public string ConnectTo = "";
 	}
 
 	public class Settings
@@ -109,7 +124,9 @@ namespace OpenRA.GameRules
 		public GraphicSettings Graphics = new GraphicSettings();
 		public ServerSettings Server = new ServerSettings();
 		public DebugSettings Debug = new DebugSettings();
+
 		public Dictionary<string, object> Sections;
+
 		public Settings(string file, Arguments args)
 		{
 			SettingsFile = file;
@@ -123,7 +140,6 @@ namespace OpenRA.GameRules
 				{"Debug", Debug},
 			};
 
-
 			// Override fieldloader to ignore invalid entries
 			var err1 = FieldLoader.UnknownFieldAction;
 			var err2 = FieldLoader.InvalidValueAction;
@@ -135,7 +151,6 @@ namespace OpenRA.GameRules
 
 			if (File.Exists(SettingsFile))
 			{
-				//Console.WriteLine("Loading settings file {0}",SettingsFile);
 				var yaml = MiniYaml.DictFromFile(SettingsFile);
 
 				foreach (var kv in Sections)
@@ -164,11 +179,11 @@ namespace OpenRA.GameRules
 
 		void LoadSectionYaml(MiniYaml yaml, object section)
 		{
-			object defaults = Activator.CreateInstance(section.GetType());
+			var defaults = Activator.CreateInstance(section.GetType());
 			FieldLoader.InvalidValueAction = (s,t,f) =>
 			{
-				object ret = defaults.GetType().GetField(f).GetValue(defaults);
-				System.Console.WriteLine("FieldLoader: Cannot parse `{0}` into `{2}:{1}`; substituting default `{3}`".F(s,t.Name,f,ret) );
+				var ret = defaults.GetType().GetField(f).GetValue(defaults);
+				Console.WriteLine("FieldLoader: Cannot parse `{0}` into `{2}:{1}`; substituting default `{3}`".F(s,t.Name,f,ret) );
 				return ret;
 			};
 

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -15,12 +15,16 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.GameRules
 {
-	public class VoiceInfo
+	public class SoundInfo
 	{
 		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Variants;
+		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Prefixes;
 		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Voices;
+		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Notifications;
 		public readonly string DefaultVariant = ".aud" ;
+		public readonly string DefaultPrefix = "" ;
 		public readonly string[] DisableVariants = { };
+		public readonly string[] DisablePrefixes = { };
 
 		static Dictionary<string, string[]> Load( MiniYaml y, string name )
 		{
@@ -31,30 +35,28 @@ namespace OpenRA.GameRules
 				: new Dictionary<string, string[]>();
 		}
 
-		public readonly OpenRA.FileFormats.Lazy<Dictionary<string, VoicePool>> Pools;
+		public readonly OpenRA.FileFormats.Lazy<Dictionary<string, SoundPool>> VoicePools;
+		public readonly OpenRA.FileFormats.Lazy<Dictionary<string, SoundPool>> NotificationsPools;
 
-		public VoiceInfo( MiniYaml y )
+		public SoundInfo( MiniYaml y )
 		{
 			FieldLoader.Load( this, y );
 			Variants = Load(y, "Variants");
+			Prefixes = Load(y, "Prefixes");
 			Voices = Load(y, "Voices");
+			Notifications = Load(y, "Notifications");
 
-			if (!Voices.ContainsKey("Attack"))
-				Voices.Add("Attack", Voices["Move"]);
-
-			if (!Voices.ContainsKey("AttackMove"))
-				Voices.Add("AttackMove", Voices["Move"]);
-
-			Pools = Lazy.New(() => Voices.ToDictionary( a => a.Key, a => new VoicePool(a.Value) ));
+			VoicePools = Lazy.New(() => Voices.ToDictionary( a => a.Key, a => new SoundPool(a.Value) ));
+			NotificationsPools = Lazy.New(() => Notifications.ToDictionary( a => a.Key, a => new SoundPool(a.Value) ));
 		}
 	}
 
-	public class VoicePool
+	public class SoundPool
 	{
 		readonly string[] clips;
 		readonly List<string> liveclips = new List<string>();
 
-		public VoicePool(params string[] clips)
+		public SoundPool(params string[] clips)
 		{
 			this.clips = clips;
 		}

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -24,9 +24,9 @@ namespace OpenRA.GameRules
 		public readonly bool Ore = false;								// can this damage ore?
 		public readonly string Explosion = null;						// explosion effect to use
 		public readonly string WaterExplosion = null;					// explosion effect on hitting water (usually a splash)
-		public readonly string SmudgeType = null;						// type of smudge to apply
+		public readonly string[] SmudgeType = { };						// type of smudge to apply
 		public readonly int[] Size = { 0, 0 };							// size of the explosion. provide 2 values for a ring effect (outer/inner)
-		public readonly int InfDeath = 0;								// infantry death animation to use
+		public readonly int InfDeath = 1;								// infantry death animation to use
 		public readonly string ImpactSound = null;						// sound to play on impact
 		public readonly string WaterImpactSound = null;					// sound to play on impact with water
 		public readonly int Damage = 0;									// how much (raw) damage to deal
@@ -72,11 +72,11 @@ namespace OpenRA.GameRules
 	{
 		public WeaponInfo weapon;
 		public Actor firedBy;
-		public int2 src;
+		public PPos src;
 		public int srcAltitude;
 		public int facing;
 		public Target target;
-		public int2 dest;
+		public PPos dest;
 		public int destAltitude;
 		public float firepowerModifier = 1.0f;
 	}
@@ -91,7 +91,7 @@ namespace OpenRA.GameRules
 		public readonly int Burst = 1;
 		public readonly bool Charges = false;
 		public readonly bool Underwater = false;
-		public readonly string[] ValidTargets = { "Ground" };
+		public readonly string[] ValidTargets = { "Ground", "Water" };
 		public readonly int BurstDelay = 5;
 		public readonly float MinRange = 0;
 

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -35,7 +35,7 @@ namespace OpenRA.Graphics
 		public Renderable Image(Actor self, string pal)
 		{
 			var p = self.CenterLocation;
-			var loc = p - 0.5f * Animation.Image.size
+			var loc = p.ToFloat2() - 0.5f * Animation.Image.size
 				+ (OffsetFunc != null ? OffsetFunc() : float2.Zero);
 			var r = new Renderable(Animation.Image, loc, pal, p.Y);
 

OpenRA.Game/Graphics/CursorProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -25,9 +25,16 @@ namespace OpenRA.Graphics
 		{
 			cursors = new Dictionary<string, CursorSequence>();
 			var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal));
+			int[] ShadowIndex = { };
+
+			if (sequences.NodesDict.ContainsKey("ShadowIndex"))
+				{
+					Array.Resize(ref ShadowIndex, ShadowIndex.Length + 1);
+					ShadowIndex[ShadowIndex.Length - 1] = Convert.ToInt32(sequences.NodesDict["ShadowIndex"].Value);
+				}
 
 			foreach (var s in sequences.NodesDict["Palettes"].Nodes)
-				Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), false));
+				Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), ShadowIndex));
 
 			foreach (var s in sequences.NodesDict["Cursors"].Nodes)
 				LoadSequencesForCursor(s.Key, s.Value);

OpenRA.Game/Graphics/LineRenderer.cs

@@ -38,7 +38,7 @@ namespace OpenRA.Graphics
 				{
 					var vb = renderer.GetTempVertexBuffer();
 					vb.SetData( vertices, nv );
-					renderer.SetLineWidth(LineWidth);
+					renderer.SetLineWidth(LineWidth * Game.viewport.Zoom);
 					renderer.DrawBatch( vb,	0, nv, PrimitiveType.LineList );
 				} );
 

OpenRA.Game/Graphics/Minimap.cs

@@ -32,13 +32,11 @@ namespace OpenRA.Graphics
 			var height = map.Bounds.Height;
 
 			if (!actualSize)
-			{
 				width = height = Exts.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
-			}
 
 			var terrain = new Bitmap(width, height);
 
-			var bitmapData = terrain.LockBits(new Rectangle(0, 0, terrain.Width, terrain.Height),
+			var bitmapData = terrain.LockBits(terrain.Bounds(),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
 
 			unsafe
@@ -69,7 +67,7 @@ namespace OpenRA.Graphics
 			Bitmap terrain = new Bitmap(terrainBitmap);
 			var tileset = Rules.TileSets[map.Tileset];
 
-			var bitmapData = terrain.LockBits(new Rectangle(0, 0, terrain.Width, terrain.Height),
+			var bitmapData = terrain.LockBits(terrain.Bounds(),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
 
 			unsafe
@@ -104,7 +102,7 @@ namespace OpenRA.Graphics
 			var map = world.Map;
 			var size = Exts.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			var bitmap = new Bitmap(size, size);
-			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+			var bitmapData = bitmap.LockBits(bitmap.Bounds(),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
 
 			unsafe
@@ -132,7 +130,7 @@ namespace OpenRA.Graphics
 			var map = world.Map;
 			var size = Exts.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			var bitmap = new Bitmap(size, size);
-			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+			var bitmapData = bitmap.LockBits(bitmap.Bounds(),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
 
 			unsafe
@@ -163,7 +161,7 @@ namespace OpenRA.Graphics
 			if (world.LocalShroud.Disabled)
 				return bitmap;
 
-			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+			var bitmapData = bitmap.LockBits(bitmap.Bounds(),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
 
 			var shroud = Color.Black.ToArgb();

OpenRA.Game/Graphics/Renderer.cs

@@ -76,8 +76,6 @@ namespace OpenRA.Graphics
 		public void BeginFrame(float2 scroll, float zoom)
 		{
 			device.Clear();
-
-			WorldLineRenderer.LineWidth = zoom;
 			float2 r1 = new float2(2f/Resolution.Width, -2f/Resolution.Height);
 			float2 r2 = new float2(-1, 1);
 			var zr1 = zoom*r1;

OpenRA.Game/Graphics/Sequence.cs

@@ -8,9 +8,10 @@
  */
 #endregion
 
+using System;
 using System.Xml;
-using OpenRA.FileFormats;
 using System.Collections.Generic;
+using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
 {
@@ -26,14 +27,13 @@ namespace OpenRA.Graphics
 		public int Facings { get { return facings; } }
 		public int Tick { get { return tick; } }
 
-		string srcOverride;
 		public Sequence(string unit, string name, MiniYaml info)
 		{
-			srcOverride = info.Value;
+			var srcOverride = info.Value;
 			Name = name;
 			var d = info.NodesDict;
 
-			sprites = Game.modData.SpriteLoader.LoadAllSprites(string.IsNullOrEmpty(srcOverride) ? unit : srcOverride );
+			sprites = Game.modData.SpriteLoader.LoadAllSprites(srcOverride ?? unit);
 			start = int.Parse(d["Start"].Value);
 
 			if (!d.ContainsKey("Length"))
@@ -53,26 +53,12 @@ namespace OpenRA.Graphics
 				tick = int.Parse(d["Tick"].Value);
 			else
 				tick = 40;
-		}
 
-		public MiniYaml Save()
-		{
-			var root = new List<MiniYamlNode>();
-
-			root.Add(new MiniYamlNode("Start", start.ToString()));
-
-			if (length > 1 && (start != 0 || length != sprites.Length - start))
-				root.Add(new MiniYamlNode("Length", length.ToString()));
-			else if (length > 1 && length == sprites.Length - start)
-				root.Add(new MiniYamlNode("Length", "*"));
-
-			if (facings > 1)
-				root.Add(new MiniYamlNode("Facings", facings.ToString()));
-
-			if (tick != 40)
-				root.Add(new MiniYamlNode("Tick", tick.ToString()));
-
-			return new MiniYaml(srcOverride, root);
+			if (start < 0 || start + facings * length > sprites.Length)
+				throw new InvalidOperationException(
+					"{6}: Sequence {0}.{1} uses frames [{2}..{3}] of SHP `{4}`, but only 0..{5} actually exist"
+					.F(unit, name, start, start + facings * length - 1, srcOverride ?? unit, sprites.Length - 1,
+					info.Nodes[0].Location));
 		}
 
 		public Sprite GetSprite( int frame )

OpenRA.Game/Graphics/Sprite.cs

@@ -60,10 +60,10 @@ namespace OpenRA.Graphics
 			Game.Renderer.WorldSpriteRenderer.DrawSprite( this, location, paletteIndex, this.size );
 		}
 
-        public void DrawAt(float2 location, int paletteIndex, float scale)
-        {
-            Game.Renderer.WorldSpriteRenderer.DrawSprite(this, location, paletteIndex, this.size * scale);
-        }
+		public void DrawAt(float2 location, int paletteIndex, float scale)
+		{
+			Game.Renderer.WorldSpriteRenderer.DrawSprite(this, location, paletteIndex, this.size * scale);
+		}
 
 		public void DrawAt( float2 location, int paletteIndex, float2 size )
 		{

OpenRA.Game/Graphics/SpriteFont.cs

@@ -70,18 +70,18 @@ namespace OpenRA.Graphics
 			}
 		}
 
-        public void DrawTextWithContrast(string text, float2 location, Color fg, Color bg, int offset)
-        {
-            if (offset > 0)
-            {
-                DrawText(text, location + new float2(-offset, 0), bg);
-                DrawText(text, location + new float2(offset, 0), bg);
-                DrawText(text, location + new float2(0, -offset), bg);
-                DrawText(text, location + new float2(0, offset), bg);
-            }
+		public void DrawTextWithContrast(string text, float2 location, Color fg, Color bg, int offset)
+		{
+			if (offset > 0)
+			{
+				DrawText(text, location + new float2(-offset, 0), bg);
+				DrawText(text, location + new float2(offset, 0), bg);
+				DrawText(text, location + new float2(0, -offset), bg);
+				DrawText(text, location + new float2(0, offset), bg);
+			}
 
-            DrawText(text, location, fg);
-        }
+			DrawText(text, location, fg);
+		}
 
 		public int2 Measure(string text)
 		{

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -22,14 +22,14 @@ namespace OpenRA.Graphics
 			sprites = new Cache<string, Sprite[]>( LoadSprites );
 		}
 
-        readonly SheetBuilder SheetBuilder;
+		readonly SheetBuilder SheetBuilder;
 		readonly Cache<string, Sprite[]> sprites;
 		readonly string[] exts;
 
 		Sprite[] LoadSprites(string filename)
 		{
 			var shp = new ShpReader(FileSystem.OpenWithExts(filename, exts));
-			return shp.Select(a => SheetBuilder.Add(a.Image, shp.Size)).ToArray();
+			return shp.Frames.Select(a => SheetBuilder.Add(a.Image, shp.Size)).ToArray();
 		}
 
 		public Sprite[] LoadAllSprites(string filename) { return sprites[filename]; }

OpenRA.Game/Graphics/Util.cs

@@ -8,40 +8,12 @@
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
 using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Graphics
 {
 	public static class Util
 	{
-		public static string[] ReadAllLines(Stream s)
-		{
-			List<string> result = new List<string>();
-			using (StreamReader reader = new StreamReader(s))
-				while(!reader.EndOfStream)
-				{
-					var line = reader.ReadLine();
-					if( !string.IsNullOrEmpty( line ) && line[0] != '#' )
-						result.Add( line );
-				}
-
-			return result.ToArray();
-		}
-
-		public static T[] MakeArray<T>(int count, Converter<int, T> f)
-		{
-			T[] result = new T[count];
-			for (int i = 0; i < count; i++)
-				result[i] = f(i);
-
-			return result;
-		}
-
 		static float[] channelSelect = { 0.75f, 0.25f, -0.25f, -0.75f };
 
 		public static void FastCreateQuad(Vertex[] vertices, float2 o, Sprite r, int palette, int nv, float2 size)
@@ -59,6 +31,7 @@ namespace OpenRA.Graphics
 		}
 
 		static readonly int[] channelMasks = { 2, 1, 0, 3 };	// yes, our channel order is nuts.
+
 		public static void FastCopyIntoChannel(Sprite dest, byte[] src)
 		{
 			var data = dest.sheet.Data;
@@ -79,28 +52,5 @@ namespace OpenRA.Graphics
 				destOffset += destSkip;
 			}
 		}
-
-		public static Color Lerp(float t, Color a, Color b)
-		{
-			return Color.FromArgb(
-				LerpChannel(t, a.A, b.A),
-				LerpChannel(t, a.R, b.R),
-				LerpChannel(t, a.G, b.G),
-				LerpChannel(t, a.B, b.B));
-		}
-
-		public static int LerpARGBColor(float t, int c1, int c2)
-		{
-			int a = LerpChannel(t, (c1 >> 24) & 255, (c2 >> 24) & 255);
-			int r = LerpChannel(t, (c1 >> 16) & 255, (c2 >> 16) & 255);
-			int g = LerpChannel(t, (c1 >> 8) & 255, (c2 >> 8) & 255);
-			int b = LerpChannel(t, c1 & 255, c2 & 255);
-			return (a << 24) | (r << 16) | (g << 8) | b;
-		}
-
-		public static int LerpChannel(float t, int a, int b)
-		{
-			return (int)((1 - t) * a + t * b);
-		}
 	}
 }

OpenRA.Game/Graphics/Viewport.cs

@@ -18,14 +18,7 @@ using OpenRA.Support;
 namespace OpenRA.Graphics
 {
 	[Flags]
-	public enum ScrollDirection
-	{
-		None = 0,
-		Up = 1,
-		Left = 2,
-		Down = 4,
-		Right = 8
-	}
+	public enum ScrollDirection { None = 0, Up = 1, Left = 2, Down = 4, Right = 8 }
 
 	public class Viewport
 	{
@@ -44,9 +37,9 @@ namespace OpenRA.Graphics
 			get
 			{
 				return new Rectangle(scrollPosition.X / Game.CellSize,
-				                     scrollPosition.Y / Game.CellSize,
-				                     (int)(screenSize.X / Zoom / Game.CellSize),
-				                     (int)(screenSize.Y / Zoom / Game.CellSize));
+									 scrollPosition.Y / Game.CellSize,
+									 (int)(screenSize.X / Zoom / Game.CellSize),
+									 (int)(screenSize.Y / Zoom / Game.CellSize));
 			}
 		}
 
@@ -70,9 +63,9 @@ namespace OpenRA.Graphics
 				var viewBR = (Game.CellSize*new float2(mapBounds.Right, mapBounds.Bottom)).ToInt2();
 				var border = (.5f/Zoom * screenSize.ToFloat2()).ToInt2();
 				scrollLimits = Rectangle.FromLTRB(viewTL.X - border.X,
-			                                  viewTL.Y - border.Y,
-			                                  viewBR.X - border.X,
-			                                  viewBR.Y - border.Y);
+											  viewTL.Y - border.Y,
+											  viewBR.X - border.X,
+											  viewBR.Y - border.Y);
 				// Re-center viewport
 				scrollPosition = NormalizeScrollPosition((oldCenter - 0.5f / Zoom * screenSize.ToFloat2()).ToInt2());
 			}
@@ -133,15 +126,15 @@ namespace OpenRA.Graphics
 
 			using( new PerfSample("render_widgets") )
 			{
-				Widget.DoDraw();
-				var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-	            var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
+				Ui.Draw();
+				var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
+				var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
 				var cursorSprite = cursorSequence.GetSprite((int)cursorFrame);
 
 				renderer.SpriteRenderer.DrawSprite(cursorSprite,
-				                                   Viewport.LastMousePos - cursorSequence.Hotspot,
-				                                   Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette),
-				                                   cursorSprite.size);
+					Viewport.LastMousePos - cursorSequence.Hotspot,
+					Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette),
+					cursorSprite.size);
 			}
 
 			using( new PerfSample("render_flip") )
@@ -156,18 +149,18 @@ namespace OpenRA.Graphics
 		}
 
 		// Convert from viewport coords to cell coords (not px)
-		public float2 ViewToWorld(MouseInput mi) { return ViewToWorld(mi.Location); }
-		public float2 ViewToWorld(int2 loc)
+		public CPos ViewToWorld(MouseInput mi) { return ViewToWorld(mi.Location); }
+		public CPos ViewToWorld(int2 loc)
 		{
-			return (1f / Game.CellSize) * (1f/Zoom*loc.ToFloat2() + Location);
+			return (CPos)( (1f / Game.CellSize) * (1f/Zoom*loc.ToFloat2() + Location) ).ToInt2();
 		}
 
-		public int2 ViewToWorldPx(int2 loc) { return (1f/Zoom*loc.ToFloat2() + Location).ToInt2(); }
-		public int2 ViewToWorldPx(MouseInput mi) { return ViewToWorldPx(mi.Location); }
+		public PPos ViewToWorldPx(int2 loc) { return (PPos)(1f/Zoom*loc.ToFloat2() + Location).ToInt2(); }
+		public PPos ViewToWorldPx(MouseInput mi) { return ViewToWorldPx(mi.Location); }
 
 		public void Center(float2 loc)
 		{
-			scrollPosition = NormalizeScrollPosition((Game.CellSize*loc - 1f/(2*Zoom)*screenSize.ToFloat2()).ToInt2());
+			scrollPosition = NormalizeScrollPosition((Game.CellSize * loc - 1f/(2*Zoom)*screenSize.ToFloat2()).ToInt2());
 		}
 
 		public void Center(IEnumerable<Actor> actors)
@@ -175,9 +168,9 @@ namespace OpenRA.Graphics
 			if (!actors.Any()) return;
 
 			var avgPos = actors
-				.Select(a => a.CenterLocation)
+				.Select(a => (PVecInt)a.CenterLocation)
 				.Aggregate((a, b) => a + b) / actors.Count();
-			scrollPosition = NormalizeScrollPosition((avgPos - 1f/(2*Zoom)*screenSize.ToFloat2()).ToInt2());
+			scrollPosition = NormalizeScrollPosition(((PVecFloat)avgPos - (PVecFloat)(1f / (2 * Zoom) * screenSize.ToFloat2())).ToInt2());
 		}
 
 		// Rectangle (in viewport coords) that contains things to be drawn
@@ -201,7 +194,7 @@ namespace OpenRA.Graphics
 		{
 			if (cachedScroll != scrollPosition)
 			{
-				int2 boundary = new int2(1,1); // Add a curtain of cells around the viewport to account for rounding errors
+				var boundary = new int2(1,1); // Add a curtain of cells around the viewport to account for rounding errors
 				var tl = ViewToWorld(int2.Zero).ToInt2() - boundary;
 				var br = ViewToWorld(new int2(Width, Height)).ToInt2() + boundary;
 

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -53,8 +53,9 @@ namespace OpenRA.Graphics
 			var comparer = new SpriteComparer();
 
 			var actors = world.FindUnits(
-				new int2(Game.CellSize*bounds.Left, Game.CellSize*bounds.Top),
-				new int2(Game.CellSize*bounds.Right, Game.CellSize*bounds.Bottom));
+				bounds.TopLeftAsCPos().ToPPos(),
+				bounds.BottomRightAsCPos().ToPPos()
+			);
 
 			var renderables = actors.SelectMany(a => a.Render())
 				.OrderBy(r => r, comparer);
@@ -67,6 +68,10 @@ namespace OpenRA.Graphics
 		public void Draw()
 		{
 			RefreshPalette();
+
+			if (world.IsShellmap && !Game.Settings.Game.ShowShellmap)
+				return;
+
 			var bounds = Game.viewport.ViewBounds(world);
 			Game.Renderer.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
 
@@ -85,8 +90,8 @@ namespace OpenRA.Graphics
 			if (world.OrderGenerator != null)
 				world.OrderGenerator.RenderBeforeWorld(this, world);
 
-            foreach (var image in SpritesToRender() )
-                image.Sprite.DrawAt(image.Pos, this.GetPaletteIndex(image.Palette), image.Scale);
+			foreach (var image in SpritesToRender())
+				image.Sprite.DrawAt(image.Pos, this.GetPaletteIndex(image.Palette), image.Scale);
 
 			// added for contrails
 			foreach (var a in world.ActorsWithTrait<IPostRender>())
@@ -99,10 +104,11 @@ namespace OpenRA.Graphics
 			shroudRenderer.Draw( this );
 			Game.Renderer.DisableScissor();
 
-			foreach (var a in world.Selection.Actors)
-				if (!a.Destroyed)
-					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
-						t.RenderAfterWorld(this, a);
+			foreach (var g in world.Selection.Actors.Where(a => !a.Destroyed)
+				.SelectMany(a => a.TraitsImplementing<IPostRenderSelection>())
+				.GroupBy(prs => prs.GetType()))
+				foreach (var t in g)
+					t.RenderAfterWorld(this);
 
 			Game.Renderer.Flush();
 		}
@@ -135,25 +141,21 @@ namespace OpenRA.Graphics
 				selectable.DrawRollover(this, unit);
 		}
 
-		public void DrawLocus(Color c, int2[] cells)
+		public void DrawLocus(Color c, CPos[] cells)
 		{
 			var dict = cells.ToDictionary(a => a, a => 0);
 			var wlr = Game.Renderer.WorldLineRenderer;
 
 			foreach (var t in dict.Keys)
 			{
-				if (!dict.ContainsKey(t + new int2(-1, 0)))
-					wlr.DrawLine(Game.CellSize * t, Game.CellSize * (t + new int2(0, 1)),
-						c, c);
-				if (!dict.ContainsKey(t + new int2(1, 0)))
-					wlr.DrawLine(Game.CellSize * (t + new int2(1, 0)), Game.CellSize * (t + new int2(1, 1)),
-						c, c);
-				if (!dict.ContainsKey(t + new int2(0, -1)))
-					wlr.DrawLine(Game.CellSize * t, Game.CellSize * (t + new int2(1, 0)),
-						c, c);
-				if (!dict.ContainsKey(t + new int2(0, 1)))
-					wlr.DrawLine(Game.CellSize * (t + new int2(0, 1)), Game.CellSize * (t + new int2(1, 1)),
-						c, c);
+				if (!dict.ContainsKey(t + new CVec(-1, 0)))
+					wlr.DrawLine(t.ToPPos().ToFloat2(), (t + new CVec(0, 1)).ToPPos().ToFloat2(), c, c);
+				if (!dict.ContainsKey(t + new CVec(1, 0)))
+					wlr.DrawLine((t + new CVec(1, 0)).ToPPos().ToFloat2(), (t + new CVec(1, 1)).ToPPos().ToFloat2(), c, c);
+				if (!dict.ContainsKey(t + new CVec(0, -1)))
+					wlr.DrawLine(t.ToPPos().ToFloat2(), (t + new CVec(1, 0)).ToPPos().ToFloat2(), c, c);
+				if (!dict.ContainsKey(t + new CVec(0, 1)))
+					wlr.DrawLine((t + new CVec(0, 1)).ToPPos().ToFloat2(), (t + new CVec(1, 1)).ToPPos().ToFloat2(), c, c);
 			}
 		}
 

OpenRA.Game/Group.cs

@@ -36,7 +36,7 @@ namespace OpenRA
 		{
 			/* debug crap */
 			Game.Debug("Group #{0}: {1}".F(
-				id, string.Join(",", actors.Select(a => "#{0} {1}".F(a.ActorID, a.Info.Name)).ToArray())));
+				id, actors.Select(a => "#{0} {1}".F(a.ActorID, a.Info.Name)).JoinWith(",")));
 		}
 
 		/* todo: add lazy group path crap, groupleader, pruning, etc */

OpenRA.Game/InputHandler.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -35,18 +35,12 @@ namespace OpenRA
 
 		public void OnKeyInput( KeyInput input )
 		{
-			Sync.CheckSyncUnchanged( world, () =>
-			{
-				Widget.DoHandleKeyPress( input );
-			} );
+			Sync.CheckSyncUnchanged(world, () => Ui.HandleKeyPress(input));
 		}
 
 		public void OnMouseInput( MouseInput input )
 		{
-			Sync.CheckSyncUnchanged( world, () =>
-			{
-				Widget.DoHandleInput( input );
-			} );
+			Sync.CheckSyncUnchanged(world, () => Ui.HandleInput(input));
 		}
 	}
 }

OpenRA.Game/Map.cs

@@ -22,14 +22,14 @@ namespace OpenRA
 {
 	public class Map
 	{
-		[FieldLoader.Ignore] protected IFolder Container;
-		public string Path {get; protected set;}
+		[FieldLoader.Ignore] IFolder Container;
+		public string Path { get; private set; }
 
 		// Yaml map data
-		public string Uid { get; protected set; }
+		public string Uid { get; private set; }
 		public int MapFormat;
 		public bool Selectable;
-        public bool UseAsShellmap;
+		public bool UseAsShellmap;
 		public string RequiresMod;
 
 		public string Title;
@@ -41,7 +41,14 @@ namespace OpenRA
 		[FieldLoader.Ignore] public Lazy<Dictionary<string, ActorReference>> Actors;
 
 		public int PlayerCount { get { return Players.Count(p => p.Value.Playable); } }
-		public IEnumerable<int2> SpawnPoints { get { return Actors.Value.Values.Where(a => a.Type == "mpspawn").Select(a => a.InitDict.Get<LocationInit>().value); } }
+
+		public int2[] GetSpawnPoints()
+		{
+			return Actors.Value.Values
+				.Where(a => a.Type == "mpspawn")
+				.Select(a => a.InitDict.Get<LocationInit>().value)
+				.ToArray();
+		}
 
 		public Rectangle Bounds;
 
@@ -49,17 +56,11 @@ namespace OpenRA
 		[FieldLoader.Ignore] public Dictionary<string, PlayerReference> Players = new Dictionary<string, PlayerReference>();
 		[FieldLoader.Ignore] public Lazy<List<SmudgeReference>> Smudges;
 
-		// Rules overrides
 		[FieldLoader.Ignore] public List<MiniYamlNode> Rules = new List<MiniYamlNode>();
-
-		// Sequences overrides
 		[FieldLoader.Ignore] public List<MiniYamlNode> Sequences = new List<MiniYamlNode>();
-
-		// Weapon overrides
 		[FieldLoader.Ignore] public List<MiniYamlNode> Weapons = new List<MiniYamlNode>();
-
-		// Voices overrides
 		[FieldLoader.Ignore] public List<MiniYamlNode> Voices = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public List<MiniYamlNode> Notifications = new List<MiniYamlNode>();
 
 		// Binary map data
 		[FieldLoader.Ignore] public byte TileFormat = 1;
@@ -69,10 +70,7 @@ namespace OpenRA
 		[FieldLoader.Ignore] public Lazy<TileReference<byte, byte>[,]> MapResources;
 		[FieldLoader.Ignore] public string [,] CustomTerrain;
 
-		public Map()
-		{
-			// Do nothing; not a valid map (editor hack)
-		}
+		public Map() {}	/* doesn't really produce a valid map, but enough for loading a mod */
 
 		public static Map FromTileset(string tileset)
 		{
@@ -95,14 +93,6 @@ namespace OpenRA
 			return map;
 		}
 
-		class Format2ActorReference
-		{
-			public string Id = null;
-			public string Type = null;
-			public int2 Location = int2.Zero;
-			public string Owner = null;
-		}
-
 		void AssertExists(string filename)
 		{
 			using(var s = Container.GetContent(filename))
@@ -120,10 +110,7 @@ namespace OpenRA
 
 			var yaml = new MiniYaml( null, MiniYaml.FromStream(Container.GetContent("map.yaml")) );
 			FieldLoader.Load(this, yaml);
-            Uid = ComputeHash();
-
-			// 'Simple' metadata
-			FieldLoader.Load( this, yaml );
+			Uid = ComputeHash();
 
 			// Support for formats 1-3 dropped 2011-02-11.
 			// Use release-20110207 to convert older maps to format 4
@@ -141,11 +128,8 @@ namespace OpenRA
 			Actors = Lazy.New(() =>
 			{
 				var ret =  new Dictionary<string, ActorReference>();
-				// Load actors
 				foreach (var kv in yaml.NodesDict["Actors"].NodesDict)
 					ret.Add(kv.Key, new ActorReference(kv.Value.Value, kv.Value.NodesDict));
-
-				// Add waypoint actors
 				return ret;
 			});
 
@@ -155,26 +139,19 @@ namespace OpenRA
 				var ret = new List<SmudgeReference>();
 				foreach (var kv in yaml.NodesDict["Smudges"].NodesDict)
 				{
-					string[] vals = kv.Key.Split(' ');
-					string[] loc = vals[1].Split(',');
+					var vals = kv.Key.Split(' ');
+					var loc = vals[1].Split(',');
 					ret.Add(new SmudgeReference(vals[0], new int2(int.Parse(loc[0]), int.Parse(loc[1])), int.Parse(vals[2])));
 				}
 
 				return ret;
 			});
 
-
-			// Rules
-			Rules = yaml.NodesDict["Rules"].Nodes;
-
-			// Sequences
-			Sequences = (yaml.NodesDict.ContainsKey("Sequences")) ? yaml.NodesDict["Sequences"].Nodes : new List<MiniYamlNode>();
-
-			// Weapons
-			Weapons = (yaml.NodesDict.ContainsKey("Weapons")) ? yaml.NodesDict["Weapons"].Nodes : new List<MiniYamlNode>();
-
-			// Voices
-			Voices = (yaml.NodesDict.ContainsKey("Voices")) ? yaml.NodesDict["Voices"].Nodes : new List<MiniYamlNode>();
+			Rules = NodesOrEmpty(yaml, "Rules");
+			Sequences = NodesOrEmpty(yaml, "Sequences");
+			Weapons = NodesOrEmpty(yaml, "Weapons");
+			Voices = NodesOrEmpty(yaml, "Voices");
+			Notifications = NodesOrEmpty(yaml, "Notifications");
 
 			CustomTerrain = new string[MapSize.X, MapSize.Y];
 
@@ -182,12 +159,17 @@ namespace OpenRA
 			MapResources = Lazy.New(() => LoadResourceTiles());
 		}
 
+		static List<MiniYamlNode> NodesOrEmpty(MiniYaml y, string s)
+		{
+			return y.NodesDict.ContainsKey(s) ? y.NodesDict[s].Nodes : new List<MiniYamlNode>();
+		}
+
 		public void Save(string toPath)
 		{
 			MapFormat = 5;
 
 			var root = new List<MiniYamlNode>();
-			var fields = new string[]
+			var fields = new []
 			{
 				"Selectable",
 				"MapFormat",
@@ -224,8 +206,9 @@ namespace OpenRA
 			root.Add(new MiniYamlNode("Sequences", null, Sequences));
 			root.Add(new MiniYamlNode("Weapons", null, Weapons));
 			root.Add(new MiniYamlNode("Voices", null, Voices));
+			root.Add(new MiniYamlNode("Notifications", null, Notifications));
 
-			Dictionary<string, byte[]> entries = new Dictionary<string, byte[]>();
+			var entries = new Dictionary<string, byte[]>();
 			entries.Add("map.bin", SaveBinaryData());
 			var s = root.WriteToString();
 			entries.Add("map.yaml", Encoding.UTF8.GetBytes(s));
@@ -236,7 +219,7 @@ namespace OpenRA
 				Path = toPath;
 
 				// Create a new map package
-				// TODO: Add other files (resources, rules) to the entries list
+				// TODO: Add other files (custom assets) to the entries list
 				Container = FileSystem.CreatePackage(Path, int.MaxValue, entries);
 			}
 
@@ -312,8 +295,8 @@ namespace OpenRA
 					ReadByte(dataStream);
 
 				// Load resource data
-				for (int i = 0; i < MapSize.X; i++)
-					for (int j = 0; j < MapSize.Y; j++)
+				for (var i = 0; i < MapSize.X; i++)
+					for (var j = 0; j < MapSize.Y; j++)
 				{
 					byte type = ReadByte(dataStream);
 					byte index = ReadByte(dataStream);
@@ -325,7 +308,7 @@ namespace OpenRA
 
 		public byte[] SaveBinaryData()
 		{
-			MemoryStream dataStream = new MemoryStream();
+			var dataStream = new MemoryStream();
 			using (var writer = new BinaryWriter(dataStream))
 			{
 				// File header consists of a version byte, followed by 2 ushorts for width and height
@@ -336,11 +319,11 @@ namespace OpenRA
 				if (!OpenRA.Rules.TileSets.ContainsKey(Tileset))
 					throw new InvalidOperationException(
 						"Tileset used by the map ({0}) does not exist in this mod. Valid tilesets are: {1}"
-						.F(Tileset, string.Join(",", OpenRA.Rules.TileSets.Keys.ToArray())));
+						.F(Tileset, OpenRA.Rules.TileSets.Keys.JoinWith(",")));
 
 				// Tile data
-				for (int i = 0; i < MapSize.X; i++)
-					for (int j = 0; j < MapSize.Y; j++)
+				for (var i = 0; i < MapSize.X; i++)
+					for (var j = 0; j < MapSize.Y; j++)
 					{
 						writer.Write(MapTiles.Value[i, j].type);
 						var PickAny = OpenRA.Rules.TileSets[Tileset].Templates[MapTiles.Value[i, j].type].PickAny;
@@ -348,8 +331,8 @@ namespace OpenRA
 					}
 
 				// Resource data
-				for (int i = 0; i < MapSize.X; i++)
-					for (int j = 0; j < MapSize.Y; j++)
+				for (var i = 0; i < MapSize.X; i++)
+					for (var j = 0; j < MapSize.Y; j++)
 					{
 						writer.Write(MapResources.Value[i, j].type);
 						writer.Write(MapResources.Value[i, j].index);
@@ -358,15 +341,8 @@ namespace OpenRA
 			return dataStream.ToArray();
 		}
 
-		public bool IsInMap(int2 xy)
-		{
-			return IsInMap(xy.X, xy.Y);
-		}
-
-		public bool IsInMap(int x, int y)
-		{
-			return Bounds.Contains(x,y);
-		}
+		public bool IsInMap(CPos xy) { return IsInMap(xy.X, xy.Y); }
+		public bool IsInMap(int x, int y) { return Bounds.Contains(x,y); }
 
 		static T[,] ResizeArray<T>(T[,] ts, T t, int width, int height)
 		{
@@ -394,23 +370,23 @@ namespace OpenRA
 		}
 
 		string ComputeHash()
-        {
-            // UID is calculated by taking an SHA1 of the yaml and binary data
-            // Read the relevant data into a buffer
-            var data = Container.GetContent("map.yaml").ReadAllBytes()
-                .Concat(Container.GetContent("map.bin").ReadAllBytes()).ToArray();
+		{
+			// UID is calculated by taking an SHA1 of the yaml and binary data
+			// Read the relevant data into a buffer
+			var data = Container.GetContent("map.yaml").ReadAllBytes()
+				.Concat(Container.GetContent("map.bin").ReadAllBytes()).ToArray();
 
-            // Take the SHA1
-            using (var csp = SHA1.Create())
-                return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
-        }
+			// Take the SHA1
+			using (var csp = SHA1.Create())
+				return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
+		}
 
 		public void MakeDefaultPlayers()
 		{
 			Players.Clear();
 
 			var firstRace = OpenRA.Rules.Info["world"].Traits
-				.WithInterface<CountryInfo>().First().Race;
+				.WithInterface<CountryInfo>().First(c => c.Selectable).Race;
 
 			Players.Add("Neutral", new PlayerReference
 			{
@@ -420,7 +396,8 @@ namespace OpenRA
 				NonCombatant = true
 			});
 
-			for (int index = 0; index < SpawnPoints.Count(); index++)
+			var numSpawns = GetSpawnPoints().Length;
+			for (var index = 0; index < numSpawns; index++)
 			{
 				var p = new PlayerReference
 				{

OpenRA.Game/ModData.cs

@@ -82,24 +82,25 @@ namespace OpenRA
 			return map;
 		}
 
-        public static IEnumerable<string> FindMapsIn(string dir)
-        {
-            string[] NoMaps = { };
+		public static IEnumerable<string> FindMapsIn(string dir)
+		{
+			string[] NoMaps = { };
 
-            if (!Directory.Exists(dir))
-                return NoMaps;
+			if (!Directory.Exists(dir))
+				return NoMaps;
 
-            return Directory.GetDirectories(dir)
-                .Concat(Directory.GetFiles(dir, "*.zip"))
-                .Concat(Directory.GetFiles(dir, "*.oramap"));
-        }
+			return Directory.GetDirectories(dir)
+				.Concat(Directory.GetFiles(dir, "*.zip"))
+				.Concat(Directory.GetFiles(dir, "*.oramap"));
+		}
 
 		Dictionary<string, Map> FindMaps(string[] mods)
 		{
-            var paths = mods.SelectMany(p => FindMapsIn("mods{0}{1}{0}maps{0}".F(Path.DirectorySeparatorChar, p)))
+			var paths = mods.SelectMany(p => FindMapsIn("mods{0}{1}{0}maps{0}".F(Path.DirectorySeparatorChar, p)))
 				.Concat(mods.SelectMany(p => FindMapsIn("{1}maps{0}{2}{0}".F(Path.DirectorySeparatorChar, Platform.SupportDir, p))));
 
 			var ret = new Dictionary<string, Map>();
+
 			foreach (var path in paths)
 			{
 				try
@@ -113,6 +114,7 @@ namespace OpenRA
 					Console.WriteLine("Details: {0}", e.ToString());
 				}
 			}
+
 			return ret;
 		}
 

OpenRA.Game/Network/Connection.cs

@@ -18,7 +18,7 @@ using OpenRA.Support;
 
 namespace OpenRA.Network
 {
-    public enum ConnectionState
+	public enum ConnectionState
 	{
 		PreConnecting,
 		NotConnected,
@@ -26,7 +26,7 @@ namespace OpenRA.Network
 		Connected,
 	}
 
-    public interface IConnection : IDisposable
+	public interface IConnection : IDisposable
 	{
 		int LocalClientId { get; }
 		ConnectionState ConnectionState { get; }
@@ -202,7 +202,10 @@ namespace OpenRA.Network
 			if (socket != null)
 				socket.Client.Close();
 			using( new PerfSample( "Thread.Join" ))
-				t.Join();
+			{
+				if (!t.Join(1000))
+					return;
+			}
 		}
 
 		~NetworkConnection() { Dispose(); }

OpenRA.Game/Network/FrameData.cs

@@ -44,17 +44,17 @@ namespace OpenRA.Network
 			frameData.Add( clientId, orders );
 		}
 
-        public bool IsReadyForFrame(int frame)
-        {
-            return !ClientsNotReadyForFrame(frame).Any();
-        }
+		public bool IsReadyForFrame(int frame)
+		{
+			return !ClientsNotReadyForFrame(frame).Any();
+		}
 
-        public IEnumerable<int> ClientsNotReadyForFrame(int frame)
-        {
-            var frameData = framePackets.GetOrAdd(frame);
-            return ClientsPlayingInFrame(frame)
-                .Where(client => !frameData.ContainsKey(client));
-        }
+		public IEnumerable<int> ClientsNotReadyForFrame(int frame)
+		{
+			var frameData = framePackets.GetOrAdd(frame);
+			return ClientsPlayingInFrame(frame)
+				.Where(client => !frameData.ContainsKey(client));
+		}
 
 		public IEnumerable<ClientOrder> OrdersForFrame( World world, int frame )
 		{

OpenRA.Game/Network/GameServer.cs

@@ -52,6 +52,15 @@ namespace OpenRA.Network
 			if (Game.CurrentMods.Count != Mods.Count())
 				return false;
 
+			// Don't have the map locally
+			if (!Game.modData.AvailableMaps.ContainsKey(Map))
+				return false;
+
+			return CompatibleVersion();
+		}
+
+		public bool CompatibleVersion()
+		{
 			return UsefulMods.All(m => Game.CurrentMods.ContainsKey(m.Key)
 				&& AreVersionsCompatible(m.Value, Game.CurrentMods[m.Key].Version));
 		}

OpenRA.Game/Network/Order.cs

@@ -39,15 +39,15 @@ namespace OpenRA
 		public readonly Actor Subject;
 		public readonly bool Queued;
 		public Actor TargetActor;
-		public int2 TargetLocation;
+		public CPos TargetLocation;
 		public string TargetString;
-		public int2 ExtraLocation;
+		public CPos ExtraLocation;
 		public bool IsImmediate;
 
 		public Player Player { get { return Subject.Owner; } }
 
 		Order(string orderString, Actor subject,
-			Actor targetActor, int2 targetLocation, string targetString, bool queued, int2 extraLocation)
+			Actor targetActor, CPos targetLocation, string targetString, bool queued, CPos extraLocation)
 		{
 			this.OrderString = orderString;
 			this.Subject = subject;
@@ -60,14 +60,14 @@ namespace OpenRA
 
 		// For scripting special powers
 		public Order()
-			: this(null, null, null, int2.Zero, null, false, int2.Zero) { }
+			: this(null, null, null, CPos.Zero, null, false, CPos.Zero) { }
 
 		public Order(string orderString, Actor subject, bool queued)
-			: this(orderString, subject, null, int2.Zero, null, queued, int2.Zero) { }
+			: this(orderString, subject, null, CPos.Zero, null, queued, CPos.Zero) { }
 
 		public Order(string orderstring, Order order)
 			: this(orderstring, order.Subject, order.TargetActor, order.TargetLocation,
-			       order.TargetString, order.Queued, order.ExtraLocation) {}
+				   order.TargetString, order.Queued, order.ExtraLocation) {}
 
 		public byte[] Serialize()
 		{
@@ -85,7 +85,7 @@ namespace OpenRA
 			{
 				// Format:
 				//		u8    : orderID.
-				//		            0xFF: Full serialized order.
+				//					0xFF: Full serialized order.
 				//		varies: rest of order.
 				default:
 					// TODO: specific serializers for specific orders.
@@ -98,21 +98,21 @@ namespace OpenRA
 
 						OrderFields fields = 0;
 						if (TargetActor != null) fields |= OrderFields.TargetActor;
-						if (TargetLocation != int2.Zero) fields |= OrderFields.TargetLocation;
+						if (TargetLocation != CPos.Zero) fields |= OrderFields.TargetLocation;
 						if (TargetString != null) fields |= OrderFields.TargetString;
 						if (Queued) fields |= OrderFields.Queued;
-						if (ExtraLocation != int2.Zero) fields |= OrderFields.ExtraLocation;
+						if (ExtraLocation != CPos.Zero) fields |= OrderFields.ExtraLocation;
 
 						w.Write((byte)fields);
 
 						if (TargetActor != null)
 							w.Write(UIntFromActor(TargetActor));
-						if (TargetLocation != int2.Zero)
-							w.Write(TargetLocation);
+						if (TargetLocation != CPos.Zero)
+							w.Write(TargetLocation.ToInt2());
 						if (TargetString != null)
 							w.Write(TargetString);
-						if (ExtraLocation != int2.Zero)
-							w.Write(ExtraLocation);
+						if (ExtraLocation != CPos.Zero)
+							w.Write(ExtraLocation.ToInt2());
 
 						return ret.ToArray();
 					}
@@ -130,10 +130,10 @@ namespace OpenRA
 						var flags = (OrderFields)r.ReadByte();
 
 						var targetActorId = flags.HasField(OrderFields.TargetActor) ?  r.ReadUInt32() : 0xffffffff;
-						var targetLocation = flags.HasField(OrderFields.TargetLocation) ? r.ReadInt2() : int2.Zero;
+						var targetLocation = (CPos)( flags.HasField(OrderFields.TargetLocation) ? r.ReadInt2() : int2.Zero );
 						var targetString = flags.HasField(OrderFields.TargetString) ? r.ReadString() : null;
 						var queued = flags.HasField(OrderFields.Queued);
-						var extraLocation = flags.HasField(OrderFields.ExtraLocation) ? r.ReadInt2() : int2.Zero;
+						var extraLocation = (CPos)(flags.HasField(OrderFields.ExtraLocation) ? r.ReadInt2() : int2.Zero);
 
 						Actor subject, targetActor;
 						if( !TryGetActorFromUInt( world, subjectId, out subject ) || !TryGetActorFromUInt( world, targetActorId, out targetActor ) )
@@ -199,7 +199,18 @@ namespace OpenRA
 		{
 			return new Order("HandshakeResponse", null, false) { IsImmediate = true, TargetString = text };
 		}
+		
+		public static Order PauseRequest()
+		{
+			return new Order("PauseRequest", null, false) { IsImmediate = true, TargetString="" }; //TODO: targetbool?
+		}
+                
+		public static Order PauseGame()
+		{
+			return new Order("PauseGame", null, false) { IsImmediate = true, TargetString=""}; //TODO: targetbool?
+		}
 
+		
 		public static Order Command(string text)
 		{
 			return new Order("Command", null, false) { IsImmediate = true, TargetString = text };
@@ -207,17 +218,17 @@ namespace OpenRA
 
 		public static Order StartProduction(Actor subject, string item, int count)
 		{
-			return new Order("StartProduction", subject, false) { TargetLocation = new int2(count, 0), TargetString = item };
+			return new Order("StartProduction", subject, false) { TargetLocation = new CPos(count, 0), TargetString = item };
 		}
 
 		public static Order PauseProduction(Actor subject, string item, bool pause)
 		{
-			return new Order("PauseProduction", subject, false) { TargetLocation = new int2(pause ? 1 : 0, 0), TargetString = item };
+			return new Order("PauseProduction", subject, false) { TargetLocation = new CPos(pause ? 1 : 0, 0), TargetString = item };
 		}
 
 		public static Order CancelProduction(Actor subject, string item, int count)
 		{
-			return new Order("CancelProduction", subject, false) { TargetLocation = new int2(count, 0), TargetString = item };
+			return new Order("CancelProduction", subject, false) { TargetLocation = new CPos(count, 0), TargetString = item };
 		}
 	}
 }

OpenRA.Game/Network/OrderManager.cs

@@ -16,7 +16,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Network
 {
-    public class OrderManager : IDisposable
+	public class OrderManager : IDisposable
 	{
 		readonly SyncReport syncReport;
 		readonly FrameData frameData = new FrameData();
@@ -36,6 +36,7 @@ namespace OpenRA.Network
 		public int LastTickTime = Environment.TickCount;
 
 		public bool GameStarted { get { return NetFrameNumber != 0; } }
+		public bool GamePaused {get; set;}
 		public IConnection Connection { get; private set; }
 
 		public readonly int SyncHeaderSize = 9;
@@ -157,17 +158,17 @@ namespace OpenRA.Network
 			get { return NetFrameNumber >= 1 && frameData.IsReadyForFrame( NetFrameNumber ); }
 		}
 
-        static readonly IEnumerable<Session.Client> NoClients = new Session.Client[] {};
-        public IEnumerable<Session.Client> GetClientsNotReadyForNextFrame
-        {
-            get
-            {
-                return NetFrameNumber >= 1
-                    ? frameData.ClientsNotReadyForFrame(NetFrameNumber)
-                        .Select(a => LobbyInfo.ClientWithIndex(a))
-                    : NoClients;
-            }
-        }
+		static readonly IEnumerable<Session.Client> NoClients = new Session.Client[] {};
+		public IEnumerable<Session.Client> GetClientsNotReadyForNextFrame
+		{
+			get
+			{
+				return NetFrameNumber >= 1
+					? frameData.ClientsNotReadyForFrame(NetFrameNumber)
+						.Select(a => LobbyInfo.ClientWithIndex(a))
+					: NoClients;
+			}
+		}
 
 		public void Tick()
 		{

OpenRA.Game/Network/Replay.cs

@@ -0,0 +1,69 @@
+#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 OpenRA.Network;
+
+namespace OpenRA.Network
+{
+	/* a maze of twisty little hacks,... */
+	public class Replay
+	{
+		public readonly string Filename;
+		public readonly int Duration;
+		public readonly Session LobbyInfo;
+
+		public Replay(string filename)
+		{
+			Filename = filename;
+			var lastFrame = 0;
+			var hasSeenGameStart = false;
+			var lobbyInfo = null as Session;
+
+			using (var conn = new ReplayConnection(filename))
+				conn.Receive((client, packet) =>
+					{
+						var frame = BitConverter.ToInt32(packet, 0);
+						if (packet.Length == 5 && packet[4] == 0xBF)
+							return;	// disconnect
+						else if (packet.Length >= 5 && packet[4] == 0x65)
+							return;	// sync
+						else if (frame == 0)
+						{
+							/* decode this to recover lobbyinfo, etc */
+							var orders = packet.ToOrderList(null);
+							foreach (var o in orders)
+								if (o.OrderString == "StartGame")
+									hasSeenGameStart = true;
+								else if (o.OrderString == "SyncInfo" && !hasSeenGameStart)
+									lobbyInfo = Session.Deserialize(o.TargetString);
+						}
+						else
+							lastFrame = Math.Max(lastFrame, frame);
+					});
+
+			Duration = lastFrame;
+			LobbyInfo = lobbyInfo;
+		}
+
+		public Map Map()
+		{
+			if (LobbyInfo == null)
+				return null;
+
+			var map = LobbyInfo.GlobalSettings.Map;
+			if (!Game.modData.AvailableMaps.ContainsKey(map))
+				return null;
+
+			return Game.modData.AvailableMaps[map];
+		}
+	}
+}
+

OpenRA.Game/Network/ReplayConnection.cs

@@ -10,35 +10,26 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
-using System.IO;
 
 namespace OpenRA.Network
 {
 	public class ReplayConnection : IConnection
 	{
-		//uint nextFrame = 1;
 		FileStream replayStream;
+		List<byte[]> sync = new List<byte[]>();
 
-		public ReplayConnection( string replayFilename )
-		{
-			replayStream = File.OpenRead( replayFilename );
-		}
+		public ReplayConnection( string replayFilename ) { replayStream = File.OpenRead( replayFilename ); }
 
-		public int LocalClientId
-		{
-			get { return 0; }
-		}
-
-		public ConnectionState ConnectionState
-		{
-			get { return ConnectionState.Connected; }
-		}
+		public int LocalClientId { get { return 0; } }
+		public ConnectionState ConnectionState { get { return ConnectionState.Connected; } }
 
 		// do nothing; ignore locally generated orders
 		public void Send( int frame, List<byte[]> orders ) { }
 		public void SendImmediate( List<byte[]> orders ) { }
+
 		public void SendSync( int frame, byte[] syncData )
 		{
 			var ms = new MemoryStream();
@@ -47,8 +38,6 @@ namespace OpenRA.Network
 			sync.Add( ms.ToArray() );
 		}
 
-		List<byte[]> sync = new List<byte[]>();
-
 		public void Receive( Action<int, byte[]> packetFn )
 		{
 			while( sync.Count != 0 )
@@ -56,9 +45,11 @@ namespace OpenRA.Network
 				packetFn( LocalClientId, sync[ 0 ] );
 				sync.RemoveAt( 0 );
 			}
+
 			if( replayStream == null ) return;
 
 			var reader = new BinaryReader( replayStream );
+
 			while( replayStream.Position < replayStream.Length )
 			{
 				var client = reader.ReadInt32();
@@ -66,55 +57,10 @@ namespace OpenRA.Network
 				var packet = reader.ReadBytes( packetLen );
 				packetFn( client, packet );
 			}
+
 			replayStream = null;
 		}
 
 		public void Dispose() { }
 	}
-
-	class ReplayRecorderConnection : IConnection
-	{
-		IConnection inner;
-		BinaryWriter writer;
-
-		public ReplayRecorderConnection( IConnection inner, FileStream replayFile )
-		{
-			this.inner = inner;
-			this.writer = new BinaryWriter( replayFile );
-		}
-
-		public int LocalClientId { get { return inner.LocalClientId; } }
-		public ConnectionState ConnectionState { get { return inner.ConnectionState; } }
-
-		public void Send( int frame, List<byte[]> orders ) { inner.Send( frame, orders ); }
-		public void SendImmediate( List<byte[]> orders ) { inner.SendImmediate( orders ); }
-		public void SendSync( int frame, byte[] syncData ) { inner.SendSync( frame, syncData ); }
-
-		public void Receive( Action<int, byte[]> packetFn )
-		{
-			inner.Receive( ( client, data ) =>
-				{
-					writer.Write( client );
-					writer.Write( data.Length );
-					writer.Write( data );
-					packetFn( client, data );
-				} );
-		}
-
-		bool disposed;
-
-		public void Dispose()
-		{
-			if( disposed )
-				return;
-
-			writer.Close();
-			disposed = true;
-		}
-
-		~ReplayRecorderConnection()
-		{
-			Dispose();
-		}
-	}
 }

OpenRA.Game/Network/ReplayRecorderConnection.cs

@@ -0,0 +1,103 @@
+#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 System.Text;
+
+namespace OpenRA.Network
+{
+	class ReplayRecorderConnection : IConnection
+	{
+		IConnection inner;
+		BinaryWriter writer;
+		Func<string> chooseFilename;
+		MemoryStream preStartBuffer = new MemoryStream();
+
+		public ReplayRecorderConnection( IConnection inner, Func<string> chooseFilename )
+		{
+			this.chooseFilename = chooseFilename;
+			this.inner = inner;
+
+			writer = new BinaryWriter(preStartBuffer);
+		}
+
+		void StartSavingReplay(byte[] initialContent)
+		{
+			var filename = chooseFilename();
+			var replayPath = Path.Combine(Platform.SupportDir, "Replays");
+
+			if (!Directory.Exists(replayPath))
+				Directory.CreateDirectory(replayPath);
+
+			var file = File.Create(Path.Combine(replayPath, filename));
+			file.Write(initialContent);
+			this.writer = new BinaryWriter(file);
+		}
+
+		public int LocalClientId { get { return inner.LocalClientId; } }
+		public ConnectionState ConnectionState { get { return inner.ConnectionState; } }
+
+		public void Send( int frame, List<byte[]> orders ) { inner.Send( frame, orders ); }
+		public void SendImmediate( List<byte[]> orders ) { inner.SendImmediate( orders ); }
+		public void SendSync( int frame, byte[] syncData ) { inner.SendSync( frame, syncData ); }
+
+		public void Receive( Action<int, byte[]> packetFn )
+		{
+			inner.Receive((client, data) =>
+				{
+					if (preStartBuffer != null && IsGameStart(data))
+					{
+						writer.Flush();
+						var preStartData = preStartBuffer.ToArray();
+						preStartBuffer = null;
+						StartSavingReplay(preStartData);
+					}
+
+					writer.Write(client);
+					writer.Write(data.Length);
+					writer.Write(data);
+					packetFn(client, data);
+				} );
+		}
+
+		bool IsGameStart(byte[] data)
+		{
+			if (data.Length == 5 && data[4] == 0xbf)
+				return false;
+			if (data.Length >= 5 && data[4] == 0x65)
+				return false;
+
+			var frame = BitConverter.ToInt32(data, 0);
+			return frame == 0 && data.ToOrderList(null).Any(
+				o => o.OrderString == "StartGame");
+		}
+
+		bool disposed;
+
+		public void Dispose()
+		{
+			if( disposed )
+				return;
+
+			writer.Close();
+			inner.Dispose();
+			disposed = true;
+		}
+
+		~ReplayRecorderConnection()
+		{
+			Dispose();
+		}
+	}
+}
+

OpenRA.Game/Network/Session.cs

@@ -37,17 +37,12 @@ namespace OpenRA.Network
 			return Slots.FirstOrDefault(s => !s.Value.Closed && ClientInSlot(s.Key) == null).Key;
 		}
 
-		public enum ClientState
-		{
-			NotReady,
-			Ready,
-			Disconnected = 1000
-		}
+		public enum ClientState { NotReady, Ready, Disconnected = 1000 }
 
 		public class Client
 		{
 			public int Index;
-            public ColorRamp ColorRamp;
+			public ColorRamp ColorRamp;
 			public string Country;
 			public int SpawnPoint;
 			public string Name;
@@ -55,6 +50,8 @@ namespace OpenRA.Network
 			public int Team;
 			public string Slot;	// slot ID, or null for observer
 			public string Bot; // Bot type, null for real clients
+			public bool IsAdmin;
+			public bool IsReady { get { return State == ClientState.Ready; } }
 		}
 
 		public class Slot
@@ -73,6 +70,7 @@ namespace OpenRA.Network
 		{
 			public string ServerName;
 			public string Map;
+			public string[] Ban;
 			public string[] Mods = { "ra" };	// mod names
 			public int OrderLatency = 3;
 			public int RandomSeed = 0;

OpenRA.Game/Network/SyncReport.cs

@@ -65,8 +65,8 @@ namespace OpenRA.Network
 							a.ActorID,
 							a.Type,
 							a.Owner,
-					        a.Trait,
-					        a.Hash
+							a.Trait,
+							a.Hash
 						));
 					return;
 				}

OpenRA.Game/Network/UnitOrders.cs

@@ -50,6 +50,7 @@ namespace OpenRA.Network
 							Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString);
 						break;
 					}
+
 				case "Disconnected": /* reports that the target player disconnected */
 					{
 						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
@@ -59,6 +60,7 @@ namespace OpenRA.Network
 						}
 						break;
 					}
+
 				case "TeamChat":
 					{
 						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
@@ -68,68 +70,78 @@ namespace OpenRA.Network
 							if (world == null)
 							{
 								if (client.Team == orderManager.LocalClient.Team)
-                                    Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + " (Team)",
-													 order.TargetString);
+									Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + " (Team)",
+										order.TargetString);
 							}
 							else
 							{
 								var player = world.FindPlayerByClient(client);
-								var display = player != null
-											  &&
-											  (world.LocalPlayer != null &&
-											   player.Stances[world.LocalPlayer] == Stance.Ally
-											   || player.WinState == WinState.Lost);
+								if (player == null) return;
 
-								if (display)
+								if (world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally || player.WinState == WinState.Lost)
 								{
-									var suffix = (player != null && player.WinState == WinState.Lost)
-													 ? " (Dead)"
-													 : " (Team)";
-                                    Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + suffix, order.TargetString);
+									var suffix = player.WinState == WinState.Lost ? " (Dead)" : " (Team)";
+									Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + suffix, order.TargetString);
 								}
 							}
 						}
 						break;
 					}
+
 				case "StartGame":
 					{
 						Game.AddChatLine(Color.White, "Server", "The game has started.");
-						Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map);
+						Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map, false);
+						break;
+					}
+				
+				case "PauseGame":
+					{	
+						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
+				
+						if(client != null)
+						{
+							orderManager.GamePaused = !orderManager.GamePaused;
+							var pausetext = "The game is {0} by {1}".F( orderManager.GamePaused ? "paused" : "un-paused", client.Name );
+							Game.AddChatLine(Color.White, "", pausetext);
+						}
 						break;
 					}
 
 				case "HandshakeRequest":
-				{
-					var request = HandshakeRequest.Deserialize(order.TargetString);
-
-					// Check that the map exists on the client
-					if (!Game.modData.AvailableMaps.ContainsKey(request.Map))
-						throw new InvalidOperationException("Missing map {0}".F(request.Map));
-
-					var info = new Session.Client()
 					{
-						Name = Game.Settings.Player.Name,
-						ColorRamp = Game.Settings.Player.ColorRamp,
-						Country = "random",
-						SpawnPoint = 0,
-						Team = 0,
-						State = Session.ClientState.NotReady
-					};
+						var request = HandshakeRequest.Deserialize(order.TargetString);
 
-					var localMods = orderManager.LobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m,Mod.AllMods[m].Version)).ToArray();
-					var response = new HandshakeResponse()
-					{
-						Client = info,
-						Mods = localMods,
-						Password = "Foo"
-					};
+						// Check that the map exists on the client
+						if (!Game.modData.AvailableMaps.ContainsKey(request.Map))
+							throw new InvalidOperationException("Missing map {0}".F(request.Map));
+
+						var info = new Session.Client()
+						{
+							Name = Game.Settings.Player.Name,
+							ColorRamp = Game.Settings.Player.ColorRamp,
+							Country = "random",
+							SpawnPoint = 0,
+							Team = 0,
+							State = Session.ClientState.NotReady
+						};
+
+						var localMods = orderManager.LobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m,Mod.AllMods[m].Version)).ToArray();
+						var response = new HandshakeResponse()
+						{
+							Client = info,
+							Mods = localMods,
+							Password = "Foo"
+						};
+
+						orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize()));
+						break;
+					}
 
-					orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize()));
-					break;
-				}
 				case "ServerError":
 					orderManager.ServerError = order.TargetString;
-				break;
+					break;
+
 				case "SyncInfo":
 					{
 						orderManager.LobbyInfo = Session.Deserialize(order.TargetString);

OpenRA.Game/ObjectCreator.cs

@@ -52,7 +52,10 @@ namespace OpenRA
 			{
 				var type = mod.First.GetType( mod.Second + "." + className, false );
 				if( type == null ) continue;
-				var ctors = type.GetConstructors( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance ).Where( x => x.HasAttribute<UseCtorAttribute>() ).ToList();
+				var flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance;
+				var ctors = type.GetConstructors( flags )
+					.Where( x => x.HasAttribute<UseCtorAttribute>() ).ToList();
+
 				if( ctors.Count == 0 )
 					return (T)CreateBasic( type );
 				else if( ctors.Count == 1 )
@@ -75,9 +78,7 @@ namespace OpenRA
 			var a = new object[ p.Length ];
 			for( int i = 0 ; i < p.Length ; i++ )
 			{
-				var attrs = p[ i ].GetCustomAttributes<ParamAttribute>();
-				if( attrs.Length != 1 ) throw new InvalidOperationException( "ObjectCreator: argument in [UseCtor] doesn't have [Param]" );
-				var key = attrs[ 0 ].ParamName ?? p[i].Name;
+				var key = p[i].Name;
 				if ( !args.ContainsKey(key) ) throw new InvalidOperationException("ObjectCreator: key `{0}' not found".F(key));
 				a[ i ] = args[ key ];
 			}
@@ -92,22 +93,7 @@ namespace OpenRA
 				.Where(t => t != it && it.IsAssignableFrom(t)));
 		}
 
-		[AttributeUsage( AttributeTargets.Parameter )]
-		public class ParamAttribute : Attribute
-		{
-			public string ParamName { get; private set; }
-
-			public ParamAttribute() { }
-
-			public ParamAttribute( string paramName )
-			{
-				ParamName = paramName;
-			}
-		}
-
 		[AttributeUsage( AttributeTargets.Constructor )]
-		public class UseCtorAttribute : Attribute
-		{
-		}
+		public class UseCtorAttribute : Attribute {}
 	}
 }

OpenRA.Game/OpenRA.Game.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)' == '' ">x86</Platform>
@@ -12,9 +12,12 @@
     <AssemblyName>OpenRA.Game</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <ApplicationIcon>OpenRA.ico</ApplicationIcon>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -27,11 +30,8 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <ApplicationIcon>OpenRA.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +44,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -55,11 +56,11 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -79,6 +80,11 @@
     <Compile Include="ActorInitializer.cs" />
     <Compile Include="ActorMap.cs" />
     <Compile Include="ActorReference.cs" />
+    <Compile Include="PSubVec.cs" />
+    <Compile Include="PSubPos.cs" />
+    <Compile Include="PVecInt.cs" />
+    <Compile Include="PVecFloat.cs" />
+    <Compile Include="PPos.cs" />
     <Compile Include="Download.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
     <Compile Include="Effects\FlashTarget.cs" />
@@ -88,7 +94,7 @@
     <Compile Include="GameRules\MusicInfo.cs" />
     <Compile Include="GameRules\Rules.cs" />
     <Compile Include="GameRules\Settings.cs" />
-    <Compile Include="GameRules\VoiceInfo.cs" />
+    <Compile Include="GameRules\SoundInfo.cs" />
     <Compile Include="GameRules\WeaponInfo.cs" />
     <Compile Include="Graphics\Animation.cs" />
     <Compile Include="Graphics\AnimationWithOffset.cs" />
@@ -115,6 +121,8 @@
     <Compile Include="Graphics\WorldRenderer.cs" />
     <Compile Include="Group.cs" />
     <Compile Include="InputHandler.cs" />
+    <Compile Include="CVec.cs" />
+    <Compile Include="CPos.cs" />
     <Compile Include="Map.cs" />
     <Compile Include="ModData.cs" />
     <Compile Include="Network\Connection.cs" />
@@ -124,6 +132,7 @@
     <Compile Include="Network\Order.cs" />
     <Compile Include="Network\OrderIO.cs" />
     <Compile Include="Network\OrderManager.cs" />
+    <Compile Include="Network\Replay.cs" />
     <Compile Include="Network\ReplayConnection.cs" />
     <Compile Include="Network\ServerList.cs" />
     <Compile Include="Network\Session.cs" />
@@ -142,6 +151,7 @@
     <Compile Include="Server\Server.cs" />
     <Compile Include="Server\ServerOrder.cs" />
     <Compile Include="Server\TraitInterfaces.cs" />
+    <Compile Include="Server\UPnP.cs" />
     <Compile Include="Sound.cs" />
     <Compile Include="Support\Arguments.cs" />
     <Compile Include="Support\PerfHistory.cs" />
@@ -150,18 +160,18 @@
     <Compile Include="TraitDictionary.cs" />
     <Compile Include="Traits\Activity.cs" />
     <Compile Include="Traits\Armor.cs" />
+    <Compile Include="Traits\CreatesShroud.cs" />
     <Compile Include="Traits\DrawLineToTarget.cs" />
     <Compile Include="Traits\EditorAppearance.cs" />
     <Compile Include="Traits\EditorTilesetFilter.cs" />
     <Compile Include="Traits\Health.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
     <Compile Include="Traits\Player\DeveloperMode.cs" />
-    <Compile Include="Traits\Player\EvaAlerts.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\RevealsShroud.cs" />
     <Compile Include="Traits\Selectable.cs" />
-    <Compile Include="Traits\SubcellInit.cs" />
+    <Compile Include="Traits\SelectionDecorations.cs" />
     <Compile Include="Traits\Target.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
     <Compile Include="Traits\Util.cs" />
@@ -182,12 +192,15 @@
     <Compile Include="Widgets\ChromeMetrics.cs" />
     <Compile Include="Widgets\ColorBlockWidget.cs" />
     <Compile Include="Widgets\DropDownButtonWidget.cs" />
+    <Compile Include="Widgets\GridLayout.cs" />
     <Compile Include="Widgets\ImageWidget.cs" />
     <Compile Include="Widgets\LabelWidget.cs" />
+    <Compile Include="Widgets\ListLayout.cs" />
     <Compile Include="Widgets\MapPreviewWidget.cs" />
     <Compile Include="Widgets\PasswordFieldWidget.cs" />
     <Compile Include="Widgets\PerfGraphWidget.cs" />
     <Compile Include="Widgets\ProgressBarWidget.cs" />
+    <Compile Include="Widgets\ScrollItemWidget.cs" />
     <Compile Include="Widgets\ScrollPanelWidget.cs" />
     <Compile Include="Widgets\ShpImageWidget.cs" />
     <Compile Include="Widgets\SliderWidget.cs" />
@@ -201,9 +214,7 @@
     <Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
     <Compile Include="World.cs" />
     <Compile Include="WorldUtils.cs" />
-    <Compile Include="Widgets\ScrollItemWidget.cs" />
-    <Compile Include="Widgets\ListLayout.cs" />
-    <Compile Include="Widgets\GridLayout.cs" />
+    <Compile Include="Network\ReplayRecorderConnection.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
@@ -212,6 +223,11 @@
     </ProjectReference>
   </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.2.0">
       <Visible>False</Visible>
       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -227,6 +243,11 @@
       <ProductName>.NET Framework 3.5</ProductName>
       <Install>false</Install>
     </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
     <Content Include="OpenRA.ico" />
@@ -239,4 +260,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -48,14 +48,14 @@ namespace OpenRA.Orders
 
 		}
 
-		public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
+		public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
 		{
 			if (mi.Button != expectedButton)
 				world.CancelInputMode();
 			return OrderInner(world, xy, mi);
 		}
 
-		IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
+		IEnumerable<Order> OrderInner(World world, CPos xy, MouseInput mi)
 		{
 			if (mi.Button == expectedButton && world.Map.IsInMap(xy))
 			{
@@ -68,6 +68,6 @@ namespace OpenRA.Orders
 		public virtual void Tick(World world) { }
 		public void RenderBeforeWorld(WorldRenderer wr, World world) { }
 		public void RenderAfterWorld(WorldRenderer wr, World world) { }
-		public string GetCursor(World world, int2 xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
+		public string GetCursor(World world, CPos xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
 	}
 }