motd failure avoidance

AUTHORS

@@ -6,4 +6,5 @@ The OpenRA developers are:
 	* Matthew Bowra-Dean
 	* Paul Chote
 	* Alli Witheford
-	* Joakim Lindberg
+	* Joakim Lindberg
+	* Andrew Riedi

Makefile

@@ -1,7 +1,7 @@
 CSC     = gmcs
 CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
 DEFINE  = DEBUG;TRACE
-PROGRAMS	=fileformats gl game ra cnc seqed editor ralint filex tsbuild
+PROGRAMS	=fileformats gl game ra cnc seqed editor ralint filex tsbuild utility
 prefix = /usr/local
 datarootdir = $(prefix)/share
 datadir = $(datarootdir)
@@ -62,13 +62,13 @@ editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.
 
 ralint_SRCS		= $(shell find RALint/ -iname '*.cs')
 ralint_TARGET	= RALint.exe
-ralint_KIND		= winexe
+ralint_KIND		= exe
 ralint_DEPS		= $(fileformats_TARGET) $(game_TARGET)
 ralint_LIBS		= $(COMMON_LIBS) $(ralint_DEPS)
 
 filex_SRCS		= $(shell find FileExtractor/ -iname '*.cs')
 filex_TARGET	= FileExtractor.exe
-filex_KIND		= winexe
+filex_KIND		= exe
 filex_DEPS		= $(fileformats_TARGET)
 filex_LIBS		= $(COMMON_LIBS) $(filex_DEPS)
 
@@ -79,19 +79,26 @@ tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
 tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
 tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
 
+utility_SRCS		= $(shell find OpenRA.Utility/ -iname '*.cs')
+utility_TARGET		= OpenRA.Utility.exe
+utility_KIND		= exe
+utility_DEPS        = $(fileformats_TARGET) thirdparty/ICSharpCode.SharpZipLib.dll
+utility_LIBS        = $(COMMON_LIBS) $(utility_DEPS)
+
+
 # -platform:x86
 
 .SUFFIXES:
-.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex
+.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex utility
 
-game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
+game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(utility_TARGET)
 
 clean: 
 	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 
 distclean: clean
 
-CORE = fileformats gl game editor
+CORE = fileformats gl game editor utility
 
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
@@ -123,6 +130,7 @@ install: all
 	@cp *.ttf $(INSTALL_DIR)
 	@cp --parents -r thirdparty/Tao $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) thirdparty/WindowsBase.dll $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
 	@-$(INSTALL_PROGRAM) VERSION $(INSTALL_DIR)
 	
 	@echo "#!/bin/sh" > openra
@@ -132,8 +140,8 @@ install: all
 	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
 		
 	@echo "OpenRA is now installed. You will now want to download"
-	@echo "http://open-ra.org/get-dependency.php?ra-packages and"
-	@echo "http://open-ra.org/get-dependency.php?cnc-packages"
+	@echo "http://open-ra.org/get-dependency.php?file=ra-packages and"
+	@echo "http://open-ra.org/get-dependency.php?file=cnc-packages"
 	@echo "and extract their contents to"
 	@echo "$(INSTALL_DIR)/mods/ra/packages and "
 	@echo "$(INSTALL_DIR)/mods/cnc/packages respectively."

OpenRA.Editor/Form1.Designer.cs

@@ -28,221 +28,200 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
-            this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.pmMiniMap = new System.Windows.Forms.PictureBox();
-            this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.tilePalette = new System.Windows.Forms.FlowLayoutPanel();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.actorPalette = new System.Windows.Forms.FlowLayoutPanel();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel();
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.cCRedAlertMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.bitmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnuExport = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnuMinimapToPNG = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.exotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.spawnpointsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.layersFloaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.tt = new System.Windows.Forms.ToolTip(this.components);
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.surface1 = new OpenRA.Editor.Surface();
-            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
-            this.toolStripContainer1.ContentPanel.SuspendLayout();
-            this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
-            this.toolStripContainer1.SuspendLayout();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.splitContainer2.Panel1.SuspendLayout();
-            this.splitContainer2.Panel2.SuspendLayout();
-            this.splitContainer2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pmMiniMap)).BeginInit();
-            this.tabControl1.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            this.tabPage2.SuspendLayout();
-            this.tabPage3.SuspendLayout();
-            this.menuStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // toolStripContainer1
-            // 
-            // 
-            // toolStripContainer1.ContentPanel
-            // 
-            this.toolStripContainer1.ContentPanel.Controls.Add(this.splitContainer1);
-            this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(985, 727);
-            this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.toolStripContainer1.Location = new System.Drawing.Point(0, 0);
-            this.toolStripContainer1.Name = "toolStripContainer1";
-            this.toolStripContainer1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 22);
-            this.toolStripContainer1.Size = new System.Drawing.Size(985, 773);
-            this.toolStripContainer1.TabIndex = 1;
-            this.toolStripContainer1.Text = "toolStripContainer1";
-            // 
-            // toolStripContainer1.TopToolStripPanel
-            // 
-            this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.menuStrip1);
-            // 
-            // 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, 727);
-            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, 727);
-            this.splitContainer2.SplitterDistance = 160;
-            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;
-            this.pmMiniMap.Location = new System.Drawing.Point(0, 0);
-            this.pmMiniMap.Name = "pmMiniMap";
-            this.pmMiniMap.Size = new System.Drawing.Size(198, 160);
-            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);
-            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(0, 0);
-            this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
-            this.tabControl1.Multiline = true;
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.Padding = new System.Drawing.Point(6, 0);
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(198, 563);
-            this.tabControl1.TabIndex = 0;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.tilePalette);
-            this.tabPage1.Location = new System.Drawing.Point(4, 20);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(190, 539);
-            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;
-            this.tilePalette.Location = new System.Drawing.Point(3, 3);
-            this.tilePalette.Name = "tilePalette";
-            this.tilePalette.Size = new System.Drawing.Size(184, 533);
-            this.tilePalette.TabIndex = 1;
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Controls.Add(this.actorPalette);
-            this.tabPage2.Location = new System.Drawing.Point(4, 20);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(190, 539);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "Actors";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // 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.Name = "actorPalette";
-            this.actorPalette.Size = new System.Drawing.Size(184, 533);
-            this.actorPalette.TabIndex = 2;
-            // 
-            // tabPage3
-            // 
-            this.tabPage3.Controls.Add(this.resourcePalette);
-            this.tabPage3.Location = new System.Drawing.Point(4, 20);
-            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(190, 539);
-            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;
-            this.resourcePalette.Location = new System.Drawing.Point(0, 0);
-            this.resourcePalette.Name = "resourcePalette";
-            this.resourcePalette.Size = new System.Drawing.Size(190, 539);
-            this.resourcePalette.TabIndex = 3;
-            // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None;
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+			this.pmMiniMap = new System.Windows.Forms.PictureBox();
+			this.tabControl1 = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.tilePalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.actorPalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.tabPage3 = new System.Windows.Forms.TabPage();
+			this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.cCRedAlertMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.bitmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.mnuExport = new System.Windows.Forms.ToolStripMenuItem();
+			this.mnuMinimapToPNG = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.exotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.spawnpointsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.layersFloaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.tt = new System.Windows.Forms.ToolTip(this.components);
+			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+			this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+			this.surface1 = new OpenRA.Editor.Surface();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			this.splitContainer2.Panel1.SuspendLayout();
+			this.splitContainer2.Panel2.SuspendLayout();
+			this.splitContainer2.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pmMiniMap)).BeginInit();
+			this.tabControl1.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			this.tabPage2.SuspendLayout();
+			this.tabPage3.SuspendLayout();
+			this.menuStrip1.SuspendLayout();
+			this.splitContainer3.Panel1.SuspendLayout();
+			this.splitContainer3.Panel2.SuspendLayout();
+			this.splitContainer3.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 = 182;
+			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;
+			this.pmMiniMap.Location = new System.Drawing.Point(0, 0);
+			this.pmMiniMap.Name = "pmMiniMap";
+			this.pmMiniMap.Size = new System.Drawing.Size(198, 182);
+			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);
+			this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tabControl1.Location = new System.Drawing.Point(0, 0);
+			this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
+			this.tabControl1.Multiline = true;
+			this.tabControl1.Name = "tabControl1";
+			this.tabControl1.Padding = new System.Drawing.Point(6, 0);
+			this.tabControl1.SelectedIndex = 0;
+			this.tabControl1.Size = new System.Drawing.Size(198, 558);
+			this.tabControl1.TabIndex = 0;
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(this.tilePalette);
+			this.tabPage1.Location = new System.Drawing.Point(4, 20);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage1.Size = new System.Drawing.Size(190, 534);
+			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;
+			this.tilePalette.Location = new System.Drawing.Point(3, 3);
+			this.tilePalette.Name = "tilePalette";
+			this.tilePalette.Size = new System.Drawing.Size(184, 528);
+			this.tilePalette.TabIndex = 1;
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(this.actorPalette);
+			this.tabPage2.Location = new System.Drawing.Point(4, 20);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage2.Size = new System.Drawing.Size(190, 534);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "Actors";
+			this.tabPage2.UseVisualStyleBackColor = true;
+			// 
+			// 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.Name = "actorPalette";
+			this.actorPalette.Size = new System.Drawing.Size(184, 528);
+			this.actorPalette.TabIndex = 2;
+			// 
+			// tabPage3
+			// 
+			this.tabPage3.Controls.Add(this.resourcePalette);
+			this.tabPage3.Location = new System.Drawing.Point(4, 20);
+			this.tabPage3.Name = "tabPage3";
+			this.tabPage3.Size = new System.Drawing.Size(190, 534);
+			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;
+			this.resourcePalette.Location = new System.Drawing.Point(0, 0);
+			this.resourcePalette.Name = "resourcePalette";
+			this.resourcePalette.Size = new System.Drawing.Size(190, 534);
+			this.resourcePalette.TabIndex = 3;
+			// 
+			// menuStrip1
+			// 
+			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.mapToolStripMenuItem,
             this.toolsToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(985, 24);
-            this.menuStrip1.TabIndex = 1;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
-            // fileToolStripMenuItem
-            // 
-            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip1.Name = "menuStrip1";
+			this.menuStrip1.Size = new System.Drawing.Size(985, 24);
+			this.menuStrip1.TabIndex = 1;
+			this.menuStrip1.Text = "menuStrip1";
+			// 
+			// fileToolStripMenuItem
+			// 
+			this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newToolStripMenuItem,
             this.toolStripSeparator1,
             this.openToolStripMenuItem,
@@ -253,232 +232,239 @@
             this.mnuExport,
             this.toolStripSeparator3,
             this.exotToolStripMenuItem});
-            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
-            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(152, 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(122, 6);
-            // 
-            // openToolStripMenuItem
-            // 
-            this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image")));
-            this.openToolStripMenuItem.Name = "openToolStripMenuItem";
-            this.openToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.openToolStripMenuItem.Text = "&Open...";
-            this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenClicked);
-            // 
-            // saveToolStripMenuItem
-            // 
-            this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
-            this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            this.saveToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.saveToolStripMenuItem.Text = "&Save";
-            this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveClicked);
-            // 
-            // saveAsToolStripMenuItem
-            // 
-            this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
-            this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(125, 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(122, 6);
-            // 
-            // toolStripMenuItem1
-            // 
-            this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+			this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+			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.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.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(125, 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(185, 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(185, 22);
-            this.bitmapToolStripMenuItem.Text = "&Bitmap...";
-            this.bitmapToolStripMenuItem.Visible = false;
-            // 
-            // mnuExport
-            // 
-            this.mnuExport.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			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(152, 22);
-            this.mnuExport.Text = "&Export";
-            // 
-            // mnuMinimapToPNG
-            // 
-            this.mnuMinimapToPNG.Image = ((System.Drawing.Image)(resources.GetObject("mnuMinimapToPNG.Image")));
-            this.mnuMinimapToPNG.Name = "mnuMinimapToPNG";
-            this.mnuMinimapToPNG.Size = new System.Drawing.Size(152, 22);
-            this.mnuMinimapToPNG.Text = "Minimap to PNG";
-            this.mnuMinimapToPNG.Click += new System.EventHandler(this.mnuMinimapToPNG_Click);
-            // 
-            // toolStripSeparator3
-            // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(122, 6);
-            // 
-            // exotToolStripMenuItem
-            // 
-            this.exotToolStripMenuItem.Name = "exotToolStripMenuItem";
-            this.exotToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.exotToolStripMenuItem.Text = "E&xit";
-            this.exotToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked);
-            // 
-            // mapToolStripMenuItem
-            // 
-            this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.mnuExport.Name = "mnuExport";
+			this.mnuExport.Size = new System.Drawing.Size(123, 22);
+			this.mnuExport.Text = "&Export";
+			// 
+			// mnuMinimapToPNG
+			// 
+			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.mnuMinimapToPNG_Click);
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(120, 6);
+			// 
+			// exotToolStripMenuItem
+			// 
+			this.exotToolStripMenuItem.Name = "exotToolStripMenuItem";
+			this.exotToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+			this.exotToolStripMenuItem.Text = "E&xit";
+			this.exotToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked);
+			// 
+			// mapToolStripMenuItem
+			// 
+			this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.propertiesToolStripMenuItem,
             this.resizeToolStripMenuItem,
             this.toolStripSeparator4,
             this.spawnpointsToolStripMenuItem});
-            this.mapToolStripMenuItem.Name = "mapToolStripMenuItem";
-            this.mapToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
-            this.mapToolStripMenuItem.Text = "&Map";
-            // 
-            // propertiesToolStripMenuItem
-            // 
-            this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image")));
-            this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
-            this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(135, 22);
-            this.propertiesToolStripMenuItem.Text = "&Properties...";
-            this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked);
-            // 
-            // resizeToolStripMenuItem
-            // 
-            this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image")));
-            this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem";
-            this.resizeToolStripMenuItem.Size = new System.Drawing.Size(135, 22);
-            this.resizeToolStripMenuItem.Text = "&Resize...";
-            this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked);
-            // 
-            // toolStripSeparator4
-            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(132, 6);
-            // 
-            // spawnpointsToolStripMenuItem
-            // 
-            this.spawnpointsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("spawnpointsToolStripMenuItem.Image")));
-            this.spawnpointsToolStripMenuItem.Name = "spawnpointsToolStripMenuItem";
-            this.spawnpointsToolStripMenuItem.Size = new System.Drawing.Size(135, 22);
-            this.spawnpointsToolStripMenuItem.Text = "&Spawnpoints";
-            this.spawnpointsToolStripMenuItem.Click += new System.EventHandler(this.SpawnPointsClicked);
-            // 
-            // toolsToolStripMenuItem
-            // 
-            this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.mapToolStripMenuItem.Name = "mapToolStripMenuItem";
+			this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+			this.mapToolStripMenuItem.Text = "&Map";
+			// 
+			// propertiesToolStripMenuItem
+			// 
+			this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image")));
+			this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
+			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.propertiesToolStripMenuItem.Text = "&Properties...";
+			this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked);
+			// 
+			// resizeToolStripMenuItem
+			// 
+			this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image")));
+			this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem";
+			this.resizeToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.resizeToolStripMenuItem.Text = "&Resize...";
+			this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked);
+			// 
+			// toolStripSeparator4
+			// 
+			this.toolStripSeparator4.Name = "toolStripSeparator4";
+			this.toolStripSeparator4.Size = new System.Drawing.Size(139, 6);
+			// 
+			// spawnpointsToolStripMenuItem
+			// 
+			this.spawnpointsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("spawnpointsToolStripMenuItem.Image")));
+			this.spawnpointsToolStripMenuItem.Name = "spawnpointsToolStripMenuItem";
+			this.spawnpointsToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
+			this.spawnpointsToolStripMenuItem.Text = "&Spawnpoints";
+			this.spawnpointsToolStripMenuItem.Click += new System.EventHandler(this.SpawnPointsClicked);
+			// 
+			// toolsToolStripMenuItem
+			// 
+			this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.layersFloaterToolStripMenuItem});
-            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-            this.toolsToolStripMenuItem.Text = "Tools";
-            this.toolsToolStripMenuItem.Visible = false;
-            // 
-            // layersFloaterToolStripMenuItem
-            // 
-            this.layersFloaterToolStripMenuItem.Name = "layersFloaterToolStripMenuItem";
-            this.layersFloaterToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
-            this.layersFloaterToolStripMenuItem.Text = "Layers floater";
-            this.layersFloaterToolStripMenuItem.Click += new System.EventHandler(this.layersFloaterToolStripMenuItem_Click);
-            // 
-            // tt
-            // 
-            this.tt.ShowAlways = true;
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Location = new System.Drawing.Point(0, 751);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(985, 22);
-            this.statusStrip1.TabIndex = 2;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // 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);
-            this.surface1.Name = "surface1";
-            this.surface1.Size = new System.Drawing.Size(783, 727);
-            this.surface1.TabIndex = 5;
-            this.surface1.Text = "surface1";
-            this.surface1.Click += new System.EventHandler(this.OnSurfaceClicked);
-            // 
-            // saveFileDialog
-            // 
-            this.saveFileDialog.DefaultExt = "*.png";
-            this.saveFileDialog.Filter = "PNG Image (*.png)|";
-            this.saveFileDialog.Title = "Export minimap to PNG";
-            // 
-            // Form1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(985, 773);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.toolStripContainer1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.KeyPreview = true;
-            this.MainMenuStrip = this.menuStrip1;
-            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.toolStripContainer1.ContentPanel.ResumeLayout(false);
-            this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false);
-            this.toolStripContainer1.TopToolStripPanel.PerformLayout();
-            this.toolStripContainer1.ResumeLayout(false);
-            this.toolStripContainer1.PerformLayout();
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            this.splitContainer1.ResumeLayout(false);
-            this.splitContainer2.Panel1.ResumeLayout(false);
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            this.splitContainer2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.pmMiniMap)).EndInit();
-            this.tabControl1.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.tabPage2.ResumeLayout(false);
-            this.tabPage3.ResumeLayout(false);
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
+			this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+			this.toolsToolStripMenuItem.Text = "Tools";
+			this.toolsToolStripMenuItem.Visible = false;
+			// 
+			// layersFloaterToolStripMenuItem
+			// 
+			this.layersFloaterToolStripMenuItem.Name = "layersFloaterToolStripMenuItem";
+			this.layersFloaterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+			this.layersFloaterToolStripMenuItem.Text = "Layers floater";
+			this.layersFloaterToolStripMenuItem.Click += new System.EventHandler(this.layersFloaterToolStripMenuItem_Click);
+			// 
+			// 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;
+			// 
+			// 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);
+			this.surface1.Name = "surface1";
+			this.surface1.Size = new System.Drawing.Size(783, 744);
+			this.surface1.TabIndex = 5;
+			this.surface1.Text = "surface1";
+			// 
+			// Form1
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(985, 773);
+			this.Controls.Add(this.splitContainer3);
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.KeyPreview = true;
+			this.MainMenuStrip = this.menuStrip1;
+			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.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			this.splitContainer1.ResumeLayout(false);
+			this.splitContainer2.Panel1.ResumeLayout(false);
+			this.splitContainer2.Panel2.ResumeLayout(false);
+			this.splitContainer2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.pmMiniMap)).EndInit();
+			this.tabControl1.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage2.ResumeLayout(false);
+			this.tabPage3.ResumeLayout(false);
+			this.menuStrip1.ResumeLayout(false);
+			this.menuStrip1.PerformLayout();
+			this.splitContainer3.Panel1.ResumeLayout(false);
+			this.splitContainer3.Panel1.PerformLayout();
+			this.splitContainer3.Panel2.ResumeLayout(false);
+			this.splitContainer3.ResumeLayout(false);
+			this.ResumeLayout(false);
 
 		}
 
 		#endregion
 
-		private System.Windows.Forms.ToolStripContainer toolStripContainer1;
 		private System.Windows.Forms.SplitContainer splitContainer1;
 		private System.Windows.Forms.ToolTip tt;
 		private System.Windows.Forms.TabControl tabControl1;
@@ -506,15 +492,15 @@
 		private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem resizeToolStripMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-        private System.Windows.Forms.ToolStripMenuItem spawnpointsToolStripMenuItem;
-        private System.Windows.Forms.StatusStrip statusStrip1;
+		private System.Windows.Forms.ToolStripMenuItem spawnpointsToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem layersFloaterToolStripMenuItem;
         private System.Windows.Forms.PictureBox pmMiniMap;
         private System.Windows.Forms.SplitContainer splitContainer2;
         private System.Windows.Forms.ToolStripMenuItem mnuExport;
         private System.Windows.Forms.ToolStripMenuItem mnuMinimapToPNG;
-        private System.Windows.Forms.SaveFileDialog saveFileDialog;
+		private System.Windows.Forms.SaveFileDialog saveFileDialog;
+		private System.Windows.Forms.SplitContainer splitContainer3;
 
 	}
 }

OpenRA.Editor/Form1.cs

@@ -35,7 +35,13 @@ namespace OpenRA.Editor
 
 			Rules.LoadRules(Game.modData.Manifest, new Map());
 
-			surface1.AfterChange += MakeDirty;
+			surface1.AfterChange += OnMapChanged;
+		}
+
+		void OnMapChanged()
+		{
+			MakeDirty();
+			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
 		}
 
 		void MakeDirty() { dirty = true; }
@@ -234,7 +240,6 @@ namespace OpenRA.Editor
 			else
 			{
 				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
-				surface1.Map.Package = new Folder(loadedMapName);
 				surface1.Map.Save(loadedMapName);
 				dirty = false;
 			}
@@ -358,7 +363,6 @@ namespace OpenRA.Editor
 					Directory.CreateDirectory(savePath);
 
 					var map = LegacyMapImporter.Import(ofd.FileName);
-					map.Package = new Folder(savePath);
 					map.Players.Add("Neutral", new PlayerReference("Neutral",
 						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
 
@@ -390,11 +394,6 @@ namespace OpenRA.Editor
 			pb.Show();
 		}
 
-		private void OnSurfaceClicked(object sender, EventArgs e)
-		{
-			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
-		}
-
         private void mnuMinimapToPNG_Click(object sender, EventArgs e)
         {
             try

OpenRA.Editor/Form1.resx

@@ -308,9 +308,6 @@
   <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="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>307, 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>

OpenRA.Editor/Surface.cs

@@ -87,6 +87,8 @@ namespace OpenRA.Editor
 		{
 			base.OnMouseWheel(e);
 
+			if (Map == null) return;
+
 			Zoom *= e.Delta > 0 ? 4.0f / 3.0f : .75f;
 
 			Invalidate();
@@ -114,6 +116,8 @@ namespace OpenRA.Editor
 		{
 			base.OnMouseMove(e);
 
+			if (Map == null) return;
+
 			var oldMousePos = MousePos;
 			MousePos = new int2(e.Location);
 
@@ -332,6 +336,8 @@ namespace OpenRA.Editor
 		{
 			base.OnMouseDown(e);
 
+			if (Map == null) return;
+
 			if (!IsPanning)
 			{
 				if (e.Button == MouseButtons.Right) Erase();

OpenRA.FileFormats/CompressedPackage.cs

@@ -41,5 +41,11 @@ namespace OpenRA.FileFormats
 		{
 			return hashes.Contains(PackageEntry.HashFilename(filename));
 		}
+
+
+		public int Priority
+		{
+			get { return 1; }
+		}
 	}
 }

OpenRA.FileFormats/FileSystem.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Linq;
 
 namespace OpenRA.FileFormats
 {
@@ -73,9 +74,14 @@ namespace OpenRA.FileFormats
 
 		static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
 		{
-			foreach( var folder in index[ PackageEntry.HashFilename( filename ) ] )
-				if (folder.Exists(filename))
-					return folder.GetContent(filename);
+			var folder = index[PackageEntry.HashFilename(filename)]
+				.Where(x => x.Exists(filename))
+				.OrderByDescending(x => x.Priority)
+				.FirstOrDefault();
+
+			if (folder != null)
+				return folder.GetContent(filename);
+
 			return null;
 		}
 
@@ -88,11 +94,13 @@ namespace OpenRA.FileFormats
 					return ret;
 			}
 
-			foreach( IFolder folder in mountedFolders )
-			{
-				if (folder.Exists(filename))
-					return folder.GetContent(filename);
-			}
+			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 );
 		}

OpenRA.FileFormats/Folder.cs

@@ -28,12 +28,18 @@ namespace OpenRA.FileFormats
 		public IEnumerable<uint> AllFileHashes()
 		{
 			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
-				yield return PackageEntry.HashFilename( filename );
+				yield return PackageEntry.HashFilename( Path.GetFileName(filename) );
 		}
 		
 		public bool Exists(string filename)
 		{
 			return File.Exists(Path.Combine(path,filename));
 		}
+
+
+		public int Priority
+		{
+			get { return 100; }
+		}
 	}
 }

OpenRA.FileFormats/Manifest.cs

@@ -18,7 +18,7 @@ namespace OpenRA.FileFormats
 	public class Manifest
 	{
 		public readonly string[]
-			Folders, Packages, Rules,
+			Mods, Folders, Packages, Rules,
 			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
 			Weapons, Voices, Music, Movies, TileSets;
 
@@ -27,6 +27,7 @@ namespace OpenRA.FileFormats
 
 		public Manifest(string[] mods)
 		{
+			Mods = mods;
 			var yaml = mods
 				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
 				.Aggregate(MiniYaml.Merge);

OpenRA.FileFormats/Map/MapStub.cs

@@ -17,10 +17,10 @@ namespace OpenRA.FileFormats
 {
 	public class MapStub
 	{
-		public readonly IFolder Package;
+		public IFolder Package { get; protected set; }
 		
 		// Yaml map data
-		public readonly string Uid;
+		public string Uid { get; protected set; }
 		[FieldLoader.Load] public bool Selectable;
 
 		[FieldLoader.Load] public string Title;
@@ -37,7 +37,8 @@ namespace OpenRA.FileFormats
 		[FieldLoader.Load] public int2 BottomRight;
 		public int Width { get { return BottomRight.X - TopLeft.X; } }
 		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
-	
+		
+		public MapStub() {} // Hack for the editor - not used for anything important
 		public MapStub(IFolder package)
 		{
 			Package = package;

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -16,11 +16,16 @@ namespace OpenRA.FileFormats
 	{
 		public string Name;
 		public string Palette;
-		public string Race;
 		public bool OwnsWorld = false;
 		public bool NonCombatant = false;
 		public bool Playable = false;
 		public bool DefaultStartingUnits = false;
+		public bool AllowBots = true;
+		
+		public bool LockRace = false;
+		public string Race;
+		
+		public bool LockColor = false;
 		public Color Color = Color.FromArgb(238,238,238);
 		public Color Color2 = Color.FromArgb(44,28,24);
 		

OpenRA.FileFormats/Mod.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class Mod
+	{
+		public string Title;
+		public string Description;
+		public string Version;
+		public string Author;
+		public string[] RequiresMods;
+		public bool Standalone = false;
+
+		public static readonly Dictionary<string, Mod> AllMods = ValidateMods(Directory.GetDirectories("mods").Select(x => x.Substring(5)).ToArray());
+
+		public static Dictionary<string, Mod> ValidateMods(string[] mods)
+		{
+			var ret = new Dictionary<string, Mod>();
+			foreach (var m in mods)
+			{
+				if (!File.Exists("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"))
+					continue;
+
+				var yaml = new MiniYaml(null, MiniYaml.FromFile("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"));
+				if (!yaml.NodesDict.ContainsKey("Metadata"))
+				{
+					continue;
+				}
+
+				ret.Add(m, FieldLoader.Load<Mod>(yaml.NodesDict["Metadata"]));
+			}
+			return ret;
+		}
+	}
+}

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -64,6 +64,7 @@
     <Compile Include="Graphics\Vertex.cs" />
     <Compile Include="Manifest.cs" />
     <Compile Include="MiniYaml.cs" />
+    <Compile Include="Mod.cs" />
     <Compile Include="PackageEntry.cs" />
     <Compile Include="Package.cs" />
     <Compile Include="PackageWriter.cs" />

OpenRA.FileFormats/Package.cs

@@ -20,6 +20,7 @@ namespace OpenRA.FileFormats
 		Stream GetContent(string filename);
 		bool Exists(string filename);
 		IEnumerable<uint> AllFileHashes();
+		int Priority { get; }
 	}
 
 	public class Package : IFolder
@@ -149,6 +150,12 @@ namespace OpenRA.FileFormats
 		{
 			return index.ContainsKey(PackageEntry.HashFilename(filename));
 		}
+
+
+		public int Priority
+		{
+			get { return 0; }
+		}
 	}
 
 	[Flags]

OpenRA.FileFormats/Palette.cs

@@ -8,11 +8,8 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System;
 
 namespace OpenRA.FileFormats
 {

OpenRA.FileFormats/PlayerColorRemap.cs

@@ -46,5 +46,34 @@ namespace OpenRA.FileFormats
 			return remapColors.TryGetValue(index, out c) 
 				? c : original;
 		}
+
+		// hk is hue in the range [0,1] instead of [0,360]
+		public static Color ColorFromHSL(float hk, float s, float l)
+		{
+			// Convert from HSL to RGB
+			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
+			var p = 2 * l - q;
+
+			float[] trgb = { hk + 1 / 3.0f,
+							  hk,
+							  hk - 1/3.0f };
+			float[] rgb = { 0, 0, 0 };
+
+			for (int k = 0; k < 3; k++)
+			{
+				while (trgb[k] < 0) trgb[k] += 1.0f;
+				while (trgb[k] > 1) trgb[k] -= 1.0f;
+			}
+
+			for (int k = 0; k < 3; k++)
+			{
+				if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
+				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
+				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
+				else { rgb[k] = p; }
+			}
+
+			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
+		}
 	}
 }

OpenRA.FileFormats/Primitives/int2.cs

@@ -25,6 +25,7 @@ namespace OpenRA
 		public static int2 operator -(int2 a, int2 b) { return new int2(a.X - b.X, a.Y - b.Y); }
 		public static int2 operator *(int a, int2 b) { return new int2(a * b.X, a * b.Y); }
 		public static int2 operator *(int2 b, int a) { return new int2(a * b.X, a * b.Y); }
+		public static int2 operator /(int2 a, int b) { return new int2(a.X / b, a.Y / b); }
 
 		public static bool operator ==(int2 me, int2 other) { return (me.X == other.X && me.Y == other.Y); }
 		public static bool operator !=(int2 me, int2 other) { return !(me == other); }
@@ -59,5 +60,15 @@ namespace OpenRA
 		{
 			return (uint)((orig & 0xff000000) >> 24) | ((orig & 0x00ff0000) >> 8) | ((orig & 0x0000ff00) << 8) | ((orig & 0x000000ff) << 24);
 		}
+
+		public static int Lerp( int a, int b, int mul, int div )
+		{
+			return a + ( b - a ) * mul / div;
+		}
+
+		public static int2 Lerp( int2 a, int2 b, int mul, int div )
+		{
+			return a + ( b - a ) * mul / div;
+		}
 	}
 }

OpenRA.Game/Actor.cs

@@ -26,7 +26,8 @@ namespace OpenRA
 		public readonly World World;
 		public readonly uint ActorID;
 
-		public int2 Location { get { return Trait<IOccupySpace>().TopLeft; } }
+		public int2 Location { get { return Trait<IOccupySpace>().TopLeft; } }
+		public float2 CenterLocation { get { return Trait<IHasLocation>().PxPosition; } }
 		[Sync]
 		public Player Owner;
 
@@ -52,9 +53,6 @@ namespace OpenRA
 					AddTrait(trait.Create(init));
 			}
 
-			if( CenterLocation == float2.Zero && HasTrait<IOccupySpace>() )
-				CenterLocation = Traits.Util.CenterOfCell(Location);
-
 			Size = Lazy.New(() =>
 			{
 				var si = Info.Traits.GetOrDefault<SelectableInfo>();
@@ -99,8 +97,6 @@ namespace OpenRA
 			get { return currentActivity == null || currentActivity is Idle; }
 		}
 
-		public float2 CenterLocation;
-
         OpenRA.FileFormats.Lazy<float2> Size;
 
 		public IEnumerable<Renderable> Render()
@@ -198,6 +194,8 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask( w =>
 			{
+				if (Destroyed || !IsInWorld) return;
+
 				World.Remove( this );
 				World.traitDict.RemoveActor( this );
 				Destroyed = true;

OpenRA.Game/Cursor.cs

@@ -20,9 +20,9 @@ namespace OpenRA
 			sequence = CursorProvider.GetCursorSequence(cursor);
 		}
 		
-		public void Draw(int frame, float2 pos)
+		public void Draw(WorldRenderer wr, int frame, float2 pos)
 		{
-			sequence.GetSprite(frame).DrawAt(pos - sequence.Hotspot, sequence.Palette);
+			sequence.GetSprite(frame).DrawAt(wr, pos - sequence.Hotspot, sequence.Palette);
 		}
 	}
 }

OpenRA.Game/Game.cs

@@ -6,18 +6,19 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
+#endregion
+
 using System;
-using System.Drawing;
-using System.IO;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
 using System.Linq;
-using System.Windows.Forms;
+using System.Windows.Forms;
 using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Graphics;
-using OpenRA.Network;
-using OpenRA.Server;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Network;
+using OpenRA.Server;
 using OpenRA.Support;
 using OpenRA.Widgets;
 
@@ -30,7 +31,8 @@ namespace OpenRA
 		public static int CellSize { get { return modData.Manifest.TileSize; } }
 
 		public static ModData modData;
-		public static World world;
+		private static WorldRenderer worldRenderer;
+
 		public static Viewport viewport;
 		public static Settings Settings;
 
@@ -39,36 +41,25 @@ namespace OpenRA
 		public static XRandom CosmeticRandom = new XRandom();	// not synced
 
 		public static Renderer Renderer;
-		public static Session LobbyInfo = new Session();
 		public static bool HasInputFocus = false;
 		
-		static void LoadMap(string uid)
-		{
-			var map = modData.PrepareMap(uid);
-			
-			viewport = new Viewport(new float2(Renderer.Resolution), map.TopLeft, map.BottomRight, Renderer);
-			world = new World(modData.Manifest, map);
-		}
-
 		public static void MoveViewport(int2 loc)
 		{
 			viewport.Center(loc);
 		}
 
-		internal static string CurrentHost = "";
-		internal static int CurrentPort = 0;
-
 		internal static void JoinServer(string host, int port)
 		{
 			if (orderManager != null) orderManager.Dispose();
 
-			CurrentHost = host;
-			CurrentPort = port;
+			var replayFilename = ChooseReplayFilename();
+			string path = Path.Combine( Game.SupportDir, "Replays" );
+			if( !Directory.Exists( path ) ) Directory.CreateDirectory( path );
+			var replayFile = File.Create( Path.Combine( path, replayFilename ) );
 
+			orderManager = new OrderManager( host, port, new ReplayRecorderConnection( new NetworkConnection( host, port ), replayFile ) );
 			lastConnectionState = ConnectionState.PreConnecting;
-			ConnectionStateChanged();
-
-			orderManager = new OrderManager(new NetworkConnection(host, port), ChooseReplayFilename());
+			ConnectionStateChanged(orderManager);
 		}
 
 		static string ChooseReplayFilename()
@@ -78,73 +69,36 @@ namespace OpenRA
 
 		static void JoinLocal()
 		{
-			lastConnectionState = ConnectionState.PreConnecting;
-			ConnectionStateChanged();
-
 			if (orderManager != null) orderManager.Dispose();
-			orderManager = new OrderManager(new EchoConnection());
-		}
-
-		static int lastTime = Environment.TickCount;
-
-		static void ResetTimer()
-		{
-			lastTime = Environment.TickCount;
+			orderManager = new OrderManager("<no server>", -1, new EchoConnection());
+			lastConnectionState = ConnectionState.PreConnecting;
+			ConnectionStateChanged( orderManager );
 		}
 
 		internal static int RenderFrame = 0;
-		internal static int LocalTick = 0;
+		internal static int LocalTick { get { return orderManager.LocalFrameNumber; } }
 		const int NetTickScale = 3;		// 120ms net tick for 40ms local tick
-
-		public static event Action ConnectionStateChanged = () => { };
-		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
+
+		internal static event Action<OrderManager> ConnectionStateChanged = _ => { };
+		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
 		public static int LocalClientId { get { return orderManager.Connection.LocalClientId; } }
 
-		static void Tick( World world, OrderManager orderManager, Viewport viewPort )
+		static void Tick( OrderManager orderManager, Viewport viewPort )
 		{
-			if (orderManager.Connection.ConnectionState != lastConnectionState)
-			{
-				lastConnectionState = orderManager.Connection.ConnectionState;
-				ConnectionStateChanged();
-			}
-
-			int t = Environment.TickCount;
-			int dt = t - lastTime;
-			if (dt >= Settings.Game.Timestep)
+			if (orderManager.Connection.ConnectionState != lastConnectionState)
 			{
-				using (new PerfSample("tick_time"))
-				{
-					lastTime += Settings.Game.Timestep;
-					Widget.DoTick(world);
-					Sound.Tick();
-					orderManager.TickImmediate(world);
-
-					var isNetTick = LocalTick % NetTickScale == 0;
-
-					if (!isNetTick || orderManager.IsReadyForNextFrame)
-					{
-						++LocalTick;
-
-						Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
-
-						if (isNetTick) orderManager.Tick(world);
-
-						world.OrderGenerator.Tick(world);
-						world.Selection.Tick(world);
-						world.Tick();
-
-						PerfHistory.Tick();
-					}
-					else
-						if (orderManager.FrameNumber == 0)
-							lastTime = Environment.TickCount;
-				}
+				lastConnectionState = orderManager.Connection.ConnectionState;
+				ConnectionStateChanged( orderManager );
 			}
 
+			Tick( orderManager );
+			if( orderManager.world != worldRenderer.world )
+				Tick( worldRenderer.world.orderManager );
+
 			using (new PerfSample("render"))
 			{
 				++RenderFrame;
-				viewport.DrawRegions(world);
+				viewport.DrawRegions(worldRenderer);
 				Sound.SetListenerPosition(viewport.Location + .5f * new float2(viewport.Width, viewport.Height));
 			}
 
@@ -156,54 +110,79 @@ namespace OpenRA
 			MasterServerQuery.Tick();
 		}
 
+		private static void Tick( OrderManager orderManager )
+		{
+			int t = Environment.TickCount;
+			int dt = t - orderManager.LastTickTime;
+			if (dt >= Settings.Game.Timestep)
+				using( new PerfSample( "tick_time" ) )
+				{
+					orderManager.LastTickTime += Settings.Game.Timestep;
+					Widget.DoTick();
+					var world = orderManager.world;
+					if( orderManager.GameStarted && world.LocalPlayer != null )
+						++Viewport.TicksSinceLastMove;
+					Sound.Tick();
+					Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate(); } );
+
+					var isNetTick = LocalTick % NetTickScale == 0;
+
+					if( !isNetTick || orderManager.IsReadyForNextFrame )
+					{
+						++orderManager.LocalFrameNumber;
+
+						Log.Write( "debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local" );
+
+						if( isNetTick ) orderManager.Tick();
+
+						Sync.CheckSyncUnchanged(world, () =>
+							{
+								world.OrderGenerator.Tick(world);
+								world.Selection.Tick(world);
+							});
+						
+						world.Tick();
+						worldRenderer.Tick();
+
+						PerfHistory.Tick();
+					}
+					else
+						if( orderManager.NetFrameNumber == 0 )
+							orderManager.LastTickTime = Environment.TickCount;
+				}
+		}
+
 		internal static event Action LobbyInfoChanged = () => { };
 
-		internal static void SyncLobbyInfo( World world, string data)
+		internal static void SyncLobbyInfo()
 		{
-			LobbyInfo = Session.Deserialize(data);
-
-			if( !world.GameHasStarted )
-				world.SharedRandom = new XRandom( LobbyInfo.GlobalSettings.RandomSeed );
-
-			if (orderManager.Connection.ConnectionState == ConnectionState.Connected)
-				world.SetLocalPlayer(orderManager.Connection.LocalClientId);
-
-			if (orderManager.FramesAhead != LobbyInfo.GlobalSettings.OrderLatency
-				&& !orderManager.GameStarted)
-			{
-				orderManager.FramesAhead = LobbyInfo.GlobalSettings.OrderLatency;
-				Debug("Order lag is now {0} frames.".F(LobbyInfo.GlobalSettings.OrderLatency));
-			}
-
 			LobbyInfoChanged();
 		}
 
-		public static void IssueOrder( Order o ) { orderManager.IssueOrder( o ); }	/* avoid exposing the OM to mod code */
-
-
-		public static event Action AfterGameStart = () => {};
+		public static event Action<World> AfterGameStart = _ => {};
 		public static event Action BeforeGameStart = () => {};
-		internal static void StartGame(string map)
+		internal static void StartGame(string mapUID)
 		{
-			world = null;
 			BeforeGameStart();
-			LoadMap(map);
+
+			var map = modData.PrepareMap(mapUID);
+			viewport = new Viewport(new float2(Renderer.Resolution), map.TopLeft, map.BottomRight, Renderer);
+			orderManager.world = new World(modData.Manifest, map, orderManager);
+			worldRenderer = new WorldRenderer(orderManager.world);
+
 			if (orderManager.GameStarted) return;
 			Widget.SelectedWidget = null;
 
-			LocalTick = 0;
+			orderManager.LocalFrameNumber = 0;
 
-			orderManager.StartGame();
-			viewport.RefreshPalette();
-			AfterGameStart();
+			orderManager.StartGame();
+			worldRenderer.RefreshPalette();
+			AfterGameStart( orderManager.world );
 		}
 
 		public static void DispatchMouseInput(MouseInputEvent ev, MouseEventArgs e, Modifiers modifierKeys)
 		{
-			var world = Game.world;
-			if (world == null) return;
-
-			Sync.CheckSyncUnchanged( world, () =>
+			Sync.CheckSyncUnchanged( orderManager.world, () =>
 			{
 				var mi = new MouseInput
 				{
@@ -212,7 +191,7 @@ namespace OpenRA
 					Location = new int2( e.Location ),
 					Modifiers = modifierKeys,
 				};
-				Widget.HandleInput( world, mi );
+				Widget.HandleInput( mi );
 			} );
 		}
 
@@ -221,17 +200,9 @@ namespace OpenRA
 			get { return orderManager.Connection.LocalClientId == 0; }
 		}
 
-		internal static Session.Client LocalClient
-		{
-			get { return LobbyInfo.Clients.FirstOrDefault(c => c.Index == orderManager.Connection.LocalClientId); }
-		}
-
 		public static void HandleKeyEvent(KeyInput e)
 		{
-			var world = Game.world;
-			if( world == null ) return;
-
-			Sync.CheckSyncUnchanged( world, () =>
+			Sync.CheckSyncUnchanged( orderManager.world, () =>
 			{
 				Widget.HandleKeyPress( e );
 			} );
@@ -243,18 +214,24 @@ namespace OpenRA
 
 		internal static void Initialize(Arguments args)
 		{
-			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
-
-			var defaultSupport = Environment.GetFolderPath(Environment.SpecialFolder.Personal)
-												+ Path.DirectorySeparatorChar + "OpenRA";
-
-			SupportDir = args.GetValue("SupportDir", defaultSupport);
-			Settings = new Settings(SupportDir + "settings.yaml", args);
-
-			Log.LogPath = SupportDir + "Logs" + Path.DirectorySeparatorChar;
-			Log.AddChannel("perf", "perf.log");
-			Log.AddChannel("debug", "debug.log");
-			Log.AddChannel("sync", "syncreport.log");
+			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
+
+			var defaultSupport = Environment.GetFolderPath(Environment.SpecialFolder.Personal)
+												+ Path.DirectorySeparatorChar + "OpenRA";
+
+			SupportDir = args.GetValue("SupportDir", defaultSupport);
+			Settings = new Settings(SupportDir + "settings.yaml", args);
+
+			// force master server upgrade -- remove once everyone is switched over.
+			if (Settings.Server.MasterServer == "http://open-ra.org/master/")
+				Settings.Server.MasterServer = "http://master.open-ra.org/";
+
+			Settings.Save();
+
+			Log.LogPath = SupportDir + "Logs" + Path.DirectorySeparatorChar;
+			Log.AddChannel("perf", "perf.log");
+			Log.AddChannel("debug", "debug.log");
+			Log.AddChannel("sync", "syncreport.log");
 
 			FileSystem.Mount("."); // Needed to access shaders
 			Renderer.Initialize( Game.Settings.Graphics.Mode );
@@ -262,42 +239,43 @@ namespace OpenRA
 			Renderer = new Renderer();
 			
 			Console.WriteLine("Available mods:");
-			foreach(var mod in ModData.AllMods)
+			foreach(var mod in Mod.AllMods)
 				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
 			
 			// Discard any invalid mods
-			LobbyInfo.GlobalSettings.Mods = Settings.Game.Mods.Where(m => ModData.AllMods.ContainsKey(m)).ToArray();
-			Console.WriteLine("Loading mods: {0}",string.Join(",",LobbyInfo.GlobalSettings.Mods));
+			var mods = Settings.Game.Mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
+			Console.WriteLine("Loading mods: {0}",string.Join(",",mods));
 			
-			modData = new ModData( LobbyInfo.GlobalSettings.Mods );
+			modData = new ModData( mods );
 			
 			Sound.Initialize();
 			PerfHistory.items["render"].hasNormalTick = false;
 			PerfHistory.items["batches"].hasNormalTick = false;
 			PerfHistory.items["text"].hasNormalTick = false;
-			PerfHistory.items["cursor"].hasNormalTick = false;
-
+			PerfHistory.items["cursor"].hasNormalTick = false;
+
+			
 			JoinLocal();
 			StartGame(modData.Manifest.ShellmapUid);
 
-
-			Game.BeforeGameStart += () => Widget.OpenWindow("INGAME_ROOT");
-
+			Game.ConnectionStateChanged += orderManager =>
 			{
 				Widget.CloseWindow();
-				Widget.CloseWindow();
+				switch( orderManager.Connection.ConnectionState )
 				{
 					case ConnectionState.PreConnecting:
 						Widget.OpenWindow("MAINMENU_BG");
 						break;
 					case ConnectionState.Connecting:
-					case ConnectionState.Connecting:
+						Widget.OpenWindow( "CONNECTING_BG",
+							new Dictionary<string, object> { { "host", orderManager.Host }, { "port", orderManager.Port } } );
 						break;
 					case ConnectionState.NotConnected:
-					case ConnectionState.NotConnected:
+						Widget.OpenWindow( "CONNECTION_FAILED_BG",
+							new Dictionary<string, object> { { "host", orderManager.Host }, { "port", orderManager.Port } } );
 						break;
 					case ConnectionState.Connected:
-					case ConnectionState.Connected:
+						var lobby = Widget.OpenWindow( "SERVER_LOBBY", new Dictionary<string, object> { { "orderManager", orderManager } } );
 						lobby.GetWidget<ChatDisplayWidget>("CHAT_DISPLAY").ClearChat();
 						lobby.GetWidget("CHANGEMAP_BUTTON").Visible = true;
 						lobby.GetWidget("LOCKTEAMS_CHECKBOX").Visible = true;
@@ -307,10 +285,10 @@ namespace OpenRA
 				}
 			};
 
-
+			modData.WidgetLoader.LoadWidget( new Dictionary<string,object>(), Widget.RootWidget, "PERF_BG" );
 			Widget.OpenWindow("MAINMENU_BG");
 
-
+			Game.orderManager.LastTickTime = Environment.TickCount;
 		}
 
 		static bool quit;
@@ -318,50 +296,48 @@ namespace OpenRA
 		{
 			while (!quit)
 			{
-			{
+				Tick( orderManager, viewport );
 				Application.DoEvents();
 			}
 		}
 
-
-		public static void Exit() { quit = true; }
+		public static void Exit() { quit = true; }
+
 		public static Action<Color,string,string> AddChatLine = (c,n,s) => {};
 
-
-		public static void Debug(string s, params object[] args)
-		{
+		public static void Debug(string s, params object[] args)
+		{
+			AddChatLine(Color.White, "Debug", String.Format(s,args)); 
 		}
 
 		public static void Disconnect()
 		{
 			orderManager.Dispose();
 			var shellmap = modData.Manifest.ShellmapUid;
-			var shellmap = modData.Manifest.ShellmapUid;
-			LobbyInfo = new Session();
 			JoinLocal();
 			StartGame(shellmap);
 
 			Widget.CloseWindow();
 			Widget.OpenWindow("MAINMENU_BG");
-			Widget.OpenWindow("MAINMENU_BG");
-		}
-
-		static string baseSupportDir = null;
-		public static string SupportDir
-		{
-			set
-			{
-				var dir = value;
-
-				// Expand paths relative to the personal directory
-				if (dir.ElementAt(0) == '~')
-					dir = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + dir.Substring(1);
-
-				if (!Directory.Exists(dir))
-					Directory.CreateDirectory(dir);
-
+		}
+
+		static string baseSupportDir = null;
+		public static string SupportDir
+		{
+			set
+			{
+				var dir = value;
+
+				// Expand paths relative to the personal directory
+				if (dir.ElementAt(0) == '~')
+					dir = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + dir.Substring(1);
+
+				if (!Directory.Exists(dir))
+					Directory.CreateDirectory(dir);
+
+				baseSupportDir = dir + Path.DirectorySeparatorChar;
 			}
-			}
+			get { return baseSupportDir; }
 		}
 
 		public static T CreateObject<T>( string name )
@@ -369,4 +345,4 @@ namespace OpenRA
 			return modData.ObjectCreator.CreateObject<T>( name );
 		}
 	}
-	}
+}

OpenRA.Game/GameRules/Settings.cs

@@ -32,7 +32,6 @@ namespace OpenRA.GameRules
 	{
 		public bool PerfGraph = false;
 		public bool RecordSyncReports = true;
-		public bool ShowCollisions = false;
 		public float LongTickThreshold = 0.001f;
 	}
 	
@@ -66,6 +65,9 @@ namespace OpenRA.GameRules
 		public string[] Mods = { "ra" };
 		public bool MatchTimer = true;
 		
+		// Chat settings
+		public bool TeamChatToggle = false;
+
 		// Behaviour settings
         public bool ViewportEdgeScroll = true;
         public bool InverseDragScroll = false;
@@ -107,12 +109,12 @@ namespace OpenRA.GameRules
 			
 			FieldLoader.UnknownFieldAction = (s,f) =>
 			{
-				System.Console.WriteLine( "Ignoring unknown field `{0}` on `{1}`".F( s, f.Name ) );
+				Console.WriteLine( "Ignoring unknown field `{0}` on `{1}`".F( s, f.Name ) );
 			};
 			
 			if (File.Exists(SettingsFile))
 			{
-				System.Console.WriteLine("Loading settings file {0}",SettingsFile);
+				Console.WriteLine("Loading settings file {0}",SettingsFile);
 				var yaml = MiniYaml.DictFromFile(SettingsFile);
 				
 				foreach (var kv in Sections)
@@ -124,7 +126,7 @@ namespace OpenRA.GameRules
 			foreach (var kv in Sections)
 				foreach (var f in kv.Value.GetType().GetFields())
 					if (args.Contains(kv.Key+"."+f.Name))
-						OpenRA.FileFormats.FieldLoader.LoadField( kv.Value, f.Name, args.GetValue(kv.Key+"."+f.Name, "") );
+						FieldLoader.LoadField( kv.Value, f.Name, args.GetValue(kv.Key+"."+f.Name, "") );
 			
 			FieldLoader.UnknownFieldAction = err1;
 			FieldLoader.InvalidValueAction = err2;
@@ -134,7 +136,7 @@ namespace OpenRA.GameRules
 		{
 			var root = new List<MiniYamlNode>();
 			foreach( var kv in Sections )
-				root.Add( new MiniYamlNode( kv.Key, FieldSaver.Save(kv.Value) ) );
+				root.Add( new MiniYamlNode( kv.Key, FieldSaver.SaveDifferences(kv.Value, Activator.CreateInstance(kv.Value.GetType())) ) );
 			
 			root.WriteToFile(SettingsFile);
 		}

OpenRA.Game/GameRules/VoiceInfo.cs

@@ -31,7 +31,7 @@ namespace OpenRA.GameRules
 				: new Dictionary<string, string[]>();
 		}
 
-		public readonly Lazy<Dictionary<string, VoicePool>> Pools;
+		public readonly OpenRA.FileFormats.Lazy<Dictionary<string, VoicePool>> Pools;
 
 		public VoiceInfo( MiniYaml y )
 		{
@@ -41,6 +41,9 @@ namespace OpenRA.GameRules
 			
 			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) ));
 		}

OpenRA.Game/Graphics/Sprite.cs

@@ -50,9 +50,9 @@ namespace OpenRA.Graphics
 			return uvhax[ k ];
 		}
 
-		public void DrawAt( float2 location, string palette )
+		public void DrawAt( WorldRenderer wr, float2 location, string palette )
 		{
-			Game.Renderer.SpriteRenderer.DrawSprite( this, location, palette, this.size );
+			Game.Renderer.SpriteRenderer.DrawSprite( this, location, wr, palette, this.size );
 		}
 
 		public void DrawAt( float2 location, int paletteIndex )
@@ -60,11 +60,6 @@ namespace OpenRA.Graphics
 			Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, this.size );
 		}
 
-		public void DrawAt(float2 location, string palette, float2 size)
-		{
-			Game.Renderer.SpriteRenderer.DrawSprite( this, location, palette, size );
-		}
-
 		public void DrawAt( float2 location, int paletteIndex, float2 size )
 		{
 			Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, size );

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -54,14 +54,14 @@ namespace OpenRA.Graphics
 			}
 		}
 				
-		public void DrawSprite(Sprite s, float2 location, string palette)
+		public void DrawSprite(Sprite s, float2 location, WorldRenderer wr, string palette)
 		{
-			DrawSprite(s, location, Game.world.WorldRenderer.GetPaletteIndex(palette), s.size);
+			DrawSprite(s, location, wr.GetPaletteIndex(palette), s.size);
 		}
 		
-		public void DrawSprite(Sprite s, float2 location, string palette, float2 size)
+		public void DrawSprite(Sprite s, float2 location, WorldRenderer wr, string palette, float2 size)
 		{
-			DrawSprite(s, location, Game.world.WorldRenderer.GetPaletteIndex(palette), size);
+			DrawSprite(s, location, wr.GetPaletteIndex(palette), size);
 		}
 		
 		public void DrawSprite(Sprite s, float2 location, int paletteIndex, float2 size)

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -62,7 +62,7 @@ namespace OpenRA.Graphics
 			indexBuffer.SetData( indices, ni );
 		}
 
-		public void Draw( Viewport viewport )
+		public void Draw( WorldRenderer wr, Viewport viewport )
 		{
 			int indicesPerRow = map.Width * 6;
 			int verticesPerRow = map.Width * 4;
@@ -98,7 +98,7 @@ namespace OpenRA.Graphics
 					PrimitiveType.TriangleList, Game.Renderer.SpriteShader));
 
 			foreach (var r in world.WorldActor.TraitsImplementing<IRenderOverlay>())
-				r.Render();
+				r.Render( wr );
 		}
 	}
 }

OpenRA.Game/Graphics/Viewport.cs

@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Support;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
@@ -96,30 +95,23 @@ namespace OpenRA.Graphics
 			this.scrollPosition = Game.CellSize* mapStart;
 		}
 		
-		public void DrawRegions( World world )
+		public void DrawRegions( WorldRenderer wr )
 		{
 			renderer.BeginFrame(scrollPosition);
-			world.WorldRenderer.Draw();
+			wr.Draw();
 
-			Widget.DoDraw(world);
+			Widget.DoDraw( wr );
 
 			var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
 			var c = new Cursor(cursorName);
-			c.Draw((int)cursorFrame, Viewport.LastMousePos + Location); 
+			c.Draw(wr, (int)cursorFrame, Viewport.LastMousePos + Location); 
 
 			renderer.EndFrame();
 		}
 
-		public void RefreshPalette()
-		{
-			Game.world.WorldRenderer.palette.Update(
-				Game.world.WorldActor.TraitsImplementing<IPaletteModifier>());
-		}
-
 		public void Tick()
 		{
 			cursorFrame += 0.5f;
-			RefreshPalette();
 		}
 
 		public float2 ViewToWorld(int2 loc)
@@ -147,12 +139,13 @@ namespace OpenRA.Graphics
 			scrollPosition = this.NormalizeScrollPosition((avgPos - .5f * new float2(Width, Height)));
 		}
 
-		public Rectangle? ShroudBounds()
+		public Rectangle ShroudBounds( World world )
 		{
-			var localPlayer = Game.world.LocalPlayer;
-			if (localPlayer == null) return null;
-			if (localPlayer.Shroud.Disabled) return null;
-			return localPlayer.Shroud.Bounds;
+			var localPlayer = world.LocalPlayer;
+			if( localPlayer == null ) return world.Map.Bounds;
+			if( localPlayer.Shroud.Disabled ) return world.Map.Bounds;
+			if( !localPlayer.Shroud.Bounds.HasValue ) return world.Map.Bounds;
+			return Rectangle.Intersect( localPlayer.Shroud.Bounds.Value, world.Map.Bounds );
 		}
 		
 		public Rectangle ViewBounds()

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -19,7 +19,7 @@ namespace OpenRA.Graphics
 {
 	public class WorldRenderer
 	{
-		readonly World world;
+		public readonly World world;
 		internal readonly TerrainRenderer terrainRenderer;
 		public readonly UiOverlay uiOverlay;
 		internal readonly HardwarePalette palette;
@@ -31,6 +31,9 @@ namespace OpenRA.Graphics
 			terrainRenderer = new TerrainRenderer(world, this);
 			uiOverlay = new UiOverlay();
 			palette = new HardwarePalette(world.Map);
+
+			foreach( var pal in world.traitDict.ActorsWithTraitMultiple<IPalette>( world ) )
+				pal.Trait.InitPalette( this );
 		}
 		
 		public int GetPaletteIndex(string name) { return palette.GetPaletteIndex(name); }
@@ -89,23 +92,24 @@ namespace OpenRA.Graphics
 
 		public void Draw()
 		{
+			RefreshPalette();
 			var bounds = GetBoundsRect();
 			Game.Renderer.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
 
-			terrainRenderer.Draw(Game.viewport);
+			terrainRenderer.Draw(this, Game.viewport);
 
 			if (world.OrderGenerator != null)
-				world.OrderGenerator.RenderBeforeWorld(world);
+				world.OrderGenerator.RenderBeforeWorld(this, world);
 
 			foreach( var image in worldSprites )
 				image.Sprite.DrawAt( image.Pos, this.GetPaletteIndex( image.Palette ) );
-			uiOverlay.Draw(world);
+			uiOverlay.Draw(this, world);
 
 			if (world.OrderGenerator != null)
-				world.OrderGenerator.RenderAfterWorld(world);
+				world.OrderGenerator.RenderAfterWorld(this, world);
 
 			if (world.LocalPlayer != null)
-				world.LocalPlayer.Shroud.Draw();
+				world.LocalPlayer.Shroud.Draw( this );
 
 			Game.Renderer.DisableScissor();
 		}
@@ -185,5 +189,10 @@ namespace OpenRA.Graphics
 				prev = pos;
 			}
 		}
+
+		public void RefreshPalette()
+		{
+			palette.Update( world.WorldActor.TraitsImplementing<IPaletteModifier>() );
+		}
 	}
 }

OpenRA.Game/Map.cs

@@ -19,24 +19,14 @@ using OpenRA.FileFormats;
 
 namespace OpenRA
 {
-	public class Map
+	public class Map : MapStub
 	{
-		public IFolder Package;
-		public string Uid;
-
 		// Yaml map data
-		[FieldLoader.Load] public bool Selectable = true;
 		[FieldLoader.Load] public int MapFormat;
-		[FieldLoader.Load] public string Title;
-		[FieldLoader.Load] public string Description;
-		[FieldLoader.Load] public string Author;
-		[FieldLoader.Load] public int PlayerCount;
-		[FieldLoader.Load] public string Tileset;
 
 		public Dictionary<string, PlayerReference> Players = new Dictionary<string, PlayerReference>();
 		public Dictionary<string, ActorReference> Actors = new Dictionary<string, ActorReference>();
 		public List<SmudgeReference> Smudges = new List<SmudgeReference>();
-		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
 
 		// Rules overrides
 		public List<MiniYamlNode> Rules = new List<MiniYamlNode>();
@@ -45,8 +35,6 @@ namespace OpenRA
 		public byte TileFormat = 1;
 		[FieldLoader.Load] public int2 MapSize;
 
-		[FieldLoader.Load] public int2 TopLeft;
-		[FieldLoader.Load] public int2 BottomRight;
 
 		public TileReference<ushort, byte>[,] MapTiles;
 		public TileReference<byte, byte>[,] MapResources;
@@ -55,10 +43,7 @@ namespace OpenRA
 		// Temporary compat hacks
 		public int XOffset { get { return TopLeft.X; } }
 		public int YOffset { get { return TopLeft.Y; } }
-		public int Width { get { return BottomRight.X - TopLeft.X; } }
-		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
 		public string Theater { get { return Tileset; } }
-		public IEnumerable<int2> SpawnPoints { get { return Waypoints.Select(kv => kv.Value); } }
 		public Rectangle Bounds { get { return Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y); } }
 
 		public Map()
@@ -97,19 +82,13 @@ namespace OpenRA
 		}
 
 		public Map(IFolder package)
+			: base(package)
 		{
-			Package = package;
 			var yaml = new MiniYaml( null, MiniYaml.FromStream( Package.GetContent( "map.yaml" ) ) );
 
 			// 'Simple' metadata
 			FieldLoader.Load( this, yaml );
 
-			// Waypoints
-			foreach (var wp in yaml.NodesDict["Waypoints"].NodesDict)
-			{
-				string[] loc = wp.Value.Value.Split(',');
-				Waypoints.Add(wp.Key, new int2(int.Parse(loc[0]), int.Parse(loc[1])));
-			}
 
 			// Players & Actors -- this has changed several times.
 			//	- Be backwards compatible wherever possible.
@@ -199,12 +178,13 @@ namespace OpenRA
 			Rules = yaml.NodesDict["Rules"].Nodes;
 
 			CustomTerrain = new string[MapSize.X, MapSize.Y];			
-			LoadUid();
 			LoadBinaryData();
 		}
 
 		public void Save(string filepath)
 		{
+			// Todo: save to a zip file in the support dir by default
+			Package = new Folder(filepath);
 			MapFormat = 3;
 			
 			var root = new List<MiniYamlNode>();
@@ -314,11 +294,6 @@ namespace OpenRA
 			File.Move(filepath + ".tmp", filepath);
 		}
 
-		public void LoadUid()
-		{
-			Uid = Package.GetContent("map.uid").ReadAllText();
-		}
-
 		public void SaveUid(string filename)
 		{
 			// UID is calculated by taking an SHA1 of the yaml and binary data

OpenRA.Game/ModData.cs

@@ -19,35 +19,6 @@ namespace OpenRA
 {
 	public class ModData
 	{
-		public static readonly Dictionary<string,Mod> AllMods = ValidateMods(Directory.GetDirectories("mods").Select(x => x.Substring(5)).ToArray());
-		
-		public static Dictionary<string,Mod> ValidateMods(string[] mods)
-		{
-			var ret = new Dictionary<string,Mod>();
-			foreach (var m in mods)
-			{
-				if (!File.Exists("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"))
-					continue;
-				
-				var yaml = new MiniYaml( null, MiniYaml.FromFile("mods" + Path.DirectorySeparatorChar + m + Path.DirectorySeparatorChar + "mod.yaml"));
-				if (!yaml.NodesDict.ContainsKey("Metadata"))
-				{
-					System.Console.WriteLine("Invalid mod: "+m);
-					continue;
-				}
-				
-				ret.Add(m,FieldLoader.Load<Mod>(yaml.NodesDict["Metadata"]));
-			}
-			return ret;
-		}
-		
-		public class Mod
-		{
-			public string Title;
-			public string Description;
-			public string Version;
-		}
-		
 		public readonly Manifest Manifest;
 		public readonly ObjectCreator ObjectCreator;
 		public readonly SheetBuilder SheetBuilder;

OpenRA.Game/Network/Connection.cs

@@ -26,11 +26,13 @@ namespace OpenRA.Network
 		Connected,
 	}
 
-	interface IConnection
+	interface IConnection : IDisposable
 	{
 		int LocalClientId { get; }
 		ConnectionState ConnectionState { get; }
-		void Send( byte[] packet );
+		void Send( int frame, List<byte[]> orders );
+		void SendImmediate( List<byte[]> orders );
+		void SendSync( int frame, byte[] syncData );
 		void Receive( Action<int, byte[]> packetFn );
 	}
 
@@ -53,7 +55,33 @@ namespace OpenRA.Network
 			get { return ConnectionState.PreConnecting; }
 		}
 
-		public virtual void Send( byte[] packet )
+		public virtual void Send( int frame, List<byte[]> orders )
+		{
+			var ms = new MemoryStream();
+			ms.Write( BitConverter.GetBytes( frame ) );
+			foreach( var o in orders )
+				ms.Write( o );
+			Send( ms.ToArray() );
+		}
+
+		public virtual void SendImmediate( List<byte[]> orders )
+		{
+			var ms = new MemoryStream();
+			ms.Write( BitConverter.GetBytes( (int)0 ) );
+			foreach( var o in orders )
+				ms.Write( o );
+			Send( ms.ToArray() );
+		}
+
+		public virtual void SendSync( int frame, byte[] syncData )
+		{
+			var ms = new MemoryStream();
+			ms.Write( BitConverter.GetBytes( frame ) );
+			ms.Write( syncData );
+			Send( ms.ToArray() );
+		}
+
+		protected virtual void Send( byte[] packet )
 		{
 			if( packet.Length == 0 )
 				throw new NotImplementedException();
@@ -73,9 +101,11 @@ namespace OpenRA.Network
 			foreach( var p in packets )
 				packetFn( p.FromClient, p.Data );
 		}
+
+		public virtual void Dispose() { }
 	}
 
-	class NetworkConnection : EchoConnection, IDisposable
+	class NetworkConnection : EchoConnection
 	{
 		TcpClient socket;
 		int clientId;
@@ -112,12 +142,13 @@ namespace OpenRA.Network
 							receivedPackets.Add( new ReceivedPacket { FromClient = client, Data = buf } );
 					}
 				}
-				catch( SocketException )
+				catch { }
+				finally
 				{
 					connectionState = ConnectionState.NotConnected;
+					if( socket != null )
+						socket.Close();
 				}
-				catch ( IOException ) { socket.Close(); }
-				catch (ThreadAbortException ) { socket.Close(); }
 			}
 			) { IsBackground = true };
 			t.Start();
@@ -126,18 +157,33 @@ namespace OpenRA.Network
 		public override int LocalClientId { get { return clientId; } }
 		public override ConnectionState ConnectionState { get { return connectionState; } }
 
-		public override void Send( byte[] packet )
+		List<byte[]> queuedSyncPackets = new List<byte[]>();
+
+		public override void SendSync( int frame, byte[] syncData )
+		{
+			var ms = new MemoryStream();
+			ms.Write( BitConverter.GetBytes( frame ) );
+			ms.Write( syncData );
+			queuedSyncPackets.Add( ms.ToArray() );
+		}
+
+		protected override void Send( byte[] packet )
 		{
 			base.Send( packet );
 
 			try
 			{
-
 				var ms = new MemoryStream();
 				ms.Write(BitConverter.GetBytes((int)packet.Length));
 				ms.Write(packet);
+				foreach( var q in queuedSyncPackets )
+				{
+					ms.Write( BitConverter.GetBytes( (int)q.Length ) );
+					ms.Write( q );
+					base.Send( q );
+				}
+				queuedSyncPackets.Clear();
 				ms.WriteTo(socket.GetStream());
-
 			}
 			catch (SocketException) { /* drop this on the floor; we'll pick up the disconnect from the reader thread */ }
 			catch (ObjectDisposedException) { /* ditto */ }
@@ -145,7 +191,7 @@ namespace OpenRA.Network
 
 		bool disposed = false;
 
-		public void Dispose ()
+		public override void Dispose ()
 		{
 			if (disposed) return;
 			disposed = true;
@@ -160,48 +206,4 @@ namespace OpenRA.Network
 		
 		~NetworkConnection() { Dispose(); }
 	}
-
-	class ReplayConnection : IConnection
-	{
-		//uint nextFrame = 1;
-		FileStream replayStream;
-
-		public ReplayConnection( string replayFilename )
-		{
-			replayStream = File.OpenRead( replayFilename );
-		}
-
-		public int LocalClientId
-		{
-			get { return 0; }
-		}
-
-		public ConnectionState ConnectionState
-		{
-			get { return ConnectionState.Connected; }
-		}
-
-		public void Send( byte[] packet )
-		{
-			// do nothing; ignore locally generated orders
-		}
-
-		public void Receive( Action<int, byte[]> packetFn )
-		{
-			if( replayStream == null ) return;
-
-			var reader = new BinaryReader( replayStream );
-			while( replayStream.Position < replayStream.Length )
-			{
-				var client = reader.ReadInt32();
-				var packetLen = reader.ReadInt32();
-				var packet = reader.ReadBytes( packetLen );
-				packetFn( client, packet );
-
-				if( !Game.orderManager.GameStarted )
-					return;
-			}
-			replayStream = null;
-		}
-	}
 }

OpenRA.Game/Network/FrameData.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.Network
+{
+	class FrameData
+	{
+		public struct ClientOrder
+		{
+			public int Client;
+			public Order Order;
+		}
+
+		readonly Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>();
+		readonly Dictionary<int, Dictionary<int, byte[]>> framePackets = new Dictionary<int, Dictionary<int, byte[]>>();
+
+		public IEnumerable<int> ClientsPlayingInFrame( int frame )
+		{
+			return clientQuitTimes
+				.Where( x => frame <= x.Value )
+				.Select( x => x.Key )
+				.OrderBy( x => x );
+		}
+
+		public void ClientQuit( int clientId, int lastClientFrame )
+		{
+			clientQuitTimes[clientId] = lastClientFrame;
+		}
+
+		public void AddFrameOrders( int clientId, int frame, byte[] orders )
+		{
+			var frameData = framePackets.GetOrAdd( frame );
+			frameData.Add( clientId, orders );
+		}
+
+		public bool IsReadyForFrame( int frame )
+		{
+			var frameData = framePackets.GetOrAdd( frame );
+			return ClientsPlayingInFrame( frame )
+				.All( client => frameData.ContainsKey( client ) );
+		}
+
+		public IEnumerable<ClientOrder> OrdersForFrame( World world, int frame )
+		{
+			var frameData = framePackets[ frame ];
+			var clientData = ClientsPlayingInFrame( frame )
+				.ToDictionary( k => k, v => frameData[ v ] );
+
+			return clientData
+				.SelectMany( x => x.Value
+					.ToOrderList( world )
+					.Select( o => new ClientOrder { Client = x.Key, Order = o } ) );
+		}
+	}
+}

OpenRA.Game/Network/OrderIO.cs

@@ -22,22 +22,6 @@ namespace OpenRA.Network
 			s.Write(buf, 0, buf.Length);
 		}
 
-		public static void WriteFrameData(this Stream s, IEnumerable<Order> orders, int frameNumber)
-		{
-			var bytes = Serialize( orders, frameNumber );
-			s.Write( BitConverter.GetBytes( (int)bytes.Length ) );
-			s.Write( bytes );
-		}
-
-		public static byte[] Serialize( this IEnumerable<Order> orders, int frameNumber )
-		{
-			var ms = new MemoryStream();
-			ms.Write( BitConverter.GetBytes( frameNumber ) );
-			foreach( var o in orders.Select( o => o.Serialize() ) )
-				ms.Write( o );
-			return ms.ToArray();
-		}
-
 		public static List<Order> ToOrderList(this byte[] bytes, World world)
 		{
 			var ms = new MemoryStream(bytes, 4, bytes.Length - 4);
@@ -52,12 +36,11 @@ namespace OpenRA.Network
 			return ret;
 		}
 
-		public static byte[] SerializeSync( this List<int> sync, int frameNumber )
+		public static byte[] SerializeSync( this List<int> sync )
 		{
 			var ms = new MemoryStream();
 			using( var writer = new BinaryWriter( ms ) )
 			{
-				writer.Write( frameNumber );
 				writer.Write( (byte)0x65 );
 				foreach( var s in sync )
 					writer.Write( s );

OpenRA.Game/Network/OrderManager.cs

@@ -18,45 +18,44 @@ namespace OpenRA.Network
 {
 	class OrderManager : IDisposable
 	{
-		SyncReport syncReport = new SyncReport();
+		readonly SyncReport syncReport;
+		readonly FrameData frameData = new FrameData();
 
-		public int FrameNumber { get; private set; }
+		public Session LobbyInfo = new Session( Game.Settings.Game.Mods );
+		public Session.Client LocalClient { get { return LobbyInfo.ClientWithIndex( Connection.LocalClientId ); } }
+		public World world;
 
+		public readonly string Host;
+		public readonly int Port;
+
+		public int NetFrameNumber { get; private set; }
+		public int LocalFrameNumber;
 		public int FramesAhead = 0;
 
-		public bool GameStarted { get { return FrameNumber != 0; } }
+		public int LastTickTime = Environment.TickCount;
+
+		public bool GameStarted { get { return NetFrameNumber != 0; } }
 		public IConnection Connection { get; private set; }
 		
 		public readonly int SyncHeaderSize = 9;
 		
-		Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>();
-
-		Dictionary<int, Dictionary<int, byte[]>> frameClientData = 
-			new Dictionary<int, Dictionary<int, byte[]>>();
 		List<Order> localOrders = new List<Order>();
 
-		FileStream replaySaveFile;
-
 		public void StartGame()
 		{
 			if (GameStarted) return;
 
-			FrameNumber = 1;
-			for( int i = FrameNumber ; i <= FramesAhead ; i++ )
-				Connection.Send( new List<Order>().Serialize( i ) );
+			NetFrameNumber = 1;
+			for( int i = NetFrameNumber ; i <= FramesAhead ; i++ )
+				Connection.Send( i, new List<byte[]>() );
 		}
 
-		public OrderManager( IConnection conn )
+		public OrderManager( string host, int port, IConnection conn )
 		{
+			this.Host = host;
+			this.Port = port;
 			Connection = conn;
-		}
-
-		public OrderManager( IConnection conn, string replayFilename )
-			: this( conn )
-		{
-			string path = Game.SupportDir + "Replays" + Path.DirectorySeparatorChar;
-			if (!Directory.Exists(path)) Directory.CreateDirectory(path);
-			replaySaveFile = File.Create( path + replayFilename );
+			syncReport = new SyncReport( this );
 		}
 
 		public void IssueOrders( Order[] orders )
@@ -70,11 +69,11 @@ namespace OpenRA.Network
 			localOrders.Add( order );
 		}
 
-		public void TickImmediate( World world )
+		public void TickImmediate()
 		{
 			var immediateOrders = localOrders.Where( o => o.IsImmediate ).ToList();
 			if( immediateOrders.Count != 0 )
-				Connection.Send( immediateOrders.Serialize( 0 ) );
+				Connection.SendImmediate( immediateOrders.Select( o => o.Serialize() ).ToList() );
 			localOrders.RemoveAll( o => o.IsImmediate );
 
 			var immediatePackets = new List<Pair<int, byte[]>>();
@@ -84,26 +83,23 @@ namespace OpenRA.Network
 				{
 					var frame = BitConverter.ToInt32( packet, 0 );
 					if( packet.Length == 5 && packet[ 4 ] == 0xBF )
-						clientQuitTimes[ clientId ] = frame;
+						frameData.ClientQuit( clientId, frame );
 					else if( packet.Length >= 5 && packet[ 4 ] == 0x65 )
 						CheckSync( packet );
 					else if( frame == 0 )
 						immediatePackets.Add( Pair.New( clientId, packet ) );
 					else
-						frameClientData.GetOrAdd( frame ).Add( clientId, packet );
+						frameData.AddFrameOrders( clientId, frame, packet );
 				} );
 
 			foreach( var p in immediatePackets )
-			{
 				foreach( var o in p.Second.ToOrderList( world ) )
-					UnitOrders.ProcessOrder( world, p.First, o );
-				WriteImmediateToReplay( immediatePackets );
-			}
+					UnitOrders.ProcessOrder( this, world, p.First, o );
 		}
 
 		Dictionary<int, byte[]> syncForFrame = new Dictionary<int, byte[]>();
 
-		void CheckSync(byte[] packet)
+		void CheckSync( byte[] packet )
 		{
 			var frame = BitConverter.ToInt32(packet, 0);
 			byte[] existingSync;
@@ -134,14 +130,9 @@ namespace OpenRA.Network
 				syncForFrame.Add(frame, packet);
 		}
 
-		void OutOfSync( int frame , int index)
-		{	
-			var frameData = clientQuitTimes
-				.Where( x => frame <= x.Value )
-				.OrderBy( x => x.Key )
-				.ToDictionary( k => k.Key, v => frameClientData[ FrameNumber ][ v.Key ] );
-			
-			var order = frameData.SelectMany( o => o.Value.ToOrderList( Game.world ).Select( a => new { Client = o.Key, Order = a } ) ).ElementAt(index);
+		void OutOfSync(int frame, int index)
+		{
+			var order = frameData.OrdersForFrame( world, frame ).ElementAt(index);
 			throw new InvalidOperationException("Out of sync in frame {0}.\n {1}".F(frame, order.Order.ToString()));
 		}
 		
@@ -157,72 +148,32 @@ namespace OpenRA.Network
 
 		public bool IsReadyForNextFrame
 		{
-			get
-			{
-				return FrameNumber > 0 &&
-					clientQuitTimes
-						.Where( x => FrameNumber <= x.Value )
-						.All( x => frameClientData.GetOrAdd( FrameNumber ).ContainsKey( x.Key ) );
-			}
+			get { return NetFrameNumber >= 1 && frameData.IsReadyForFrame( NetFrameNumber ); }
 		}
 
-		public void Tick( World world )
+		public void Tick()
 		{
 			if( !IsReadyForNextFrame )
 				throw new InvalidOperationException();
 
-			Connection.Send( localOrders.Serialize( FrameNumber + FramesAhead ) );
+			Connection.Send( NetFrameNumber + FramesAhead, localOrders.Select( o => o.Serialize() ).ToList() );
 			localOrders.Clear();
 
-			var frameData = clientQuitTimes
-				.Where( x => FrameNumber <= x.Value )
-				.OrderBy( x => x.Key )
-				.ToDictionary( k => k.Key, v => frameClientData[ FrameNumber ][ v.Key ] );
 			var sync = new List<int>();
 			sync.Add( world.SyncHash() );
 
-			foreach( var order in frameData.SelectMany( o => o.Value.ToOrderList( world ).Select( a => new { Client = o.Key, Order = a } ) ) )
+			foreach( var order in frameData.OrdersForFrame( world, NetFrameNumber) )
 			{
-				UnitOrders.ProcessOrder( world, order.Client, order.Order );
+				UnitOrders.ProcessOrder( this, world, order.Client, order.Order );
 				sync.Add( world.SyncHash() );
 			}
 
-			var ss = sync.SerializeSync( FrameNumber );
-			Connection.Send( ss );
-			WriteToReplay( frameData, ss );
+			var ss = sync.SerializeSync();
+			Connection.SendSync( NetFrameNumber, ss );
 
 			syncReport.UpdateSyncReport();
 
-			CheckSync( ss );
-
-			++FrameNumber;
-		}
-
-		void WriteToReplay( Dictionary<int, byte[]> frameData, byte[] syncData )
-		{
-			if( replaySaveFile == null ) return;
-
-			foreach( var f in frameData )
-			{
-				replaySaveFile.Write( BitConverter.GetBytes( f.Key ) );
-				replaySaveFile.Write( BitConverter.GetBytes( f.Value.Length ) );
-				replaySaveFile.Write( f.Value );
-			}
-			replaySaveFile.Write( BitConverter.GetBytes( (int)0 ) );
-			replaySaveFile.Write( BitConverter.GetBytes( (int)syncData.Length ) );
-			replaySaveFile.Write( syncData );
-		}
-
-		void WriteImmediateToReplay( List<Pair<int, byte[]>> immediatePackets )
-		{
-			if( replaySaveFile == null ) return;
-
-			foreach( var i in immediatePackets )
-			{
-				replaySaveFile.Write( BitConverter.GetBytes( i.First ) );
-				replaySaveFile.Write( BitConverter.GetBytes( i.Second.Length ) );
-				replaySaveFile.Write( i.Second );
-			}
+			++NetFrameNumber;
 		}
 
 		bool disposed;
@@ -230,11 +181,7 @@ namespace OpenRA.Network
 		{
 			if (disposed) return;
 
-			if (replaySaveFile != null)
-				replaySaveFile.Dispose();
-
-			var disposableConnection = Connection as IDisposable;
-			if (disposableConnection != null) disposableConnection.Dispose();
+			Connection.Dispose();
 
 			disposed = true;
 			GC.SuppressFinalize(this);

OpenRA.Game/Network/ReplayConnection.cs

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

OpenRA.Game/Network/Session.cs

@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using OpenRA.FileFormats;
 
 namespace OpenRA.Network
@@ -20,6 +21,16 @@ namespace OpenRA.Network
 		public List<Slot> Slots = new List<Slot>();
 		public Global GlobalSettings = new Global();
 
+		public Client ClientWithIndex( int clientID )
+		{
+			return Clients.SingleOrDefault( c => c.Index == clientID );
+		}
+
+		public Client ClientInSlot( Slot slot )
+		{
+			return Clients.SingleOrDefault( c => c.Slot == slot.Index );
+		}
+
 		public enum ClientState
 		{
 			NotReady,
@@ -51,6 +62,7 @@ namespace OpenRA.Network
 
 		public class Global
 		{
+			public string ServerName;
 			public string Map;
 			public string[] Mods = { "ra" };	// mod names
 			public int OrderLatency = 3;
@@ -59,6 +71,11 @@ namespace OpenRA.Network
 			public bool AllowCheats = false;
 		}
 
+		public Session( string[] mods )
+		{
+			this.GlobalSettings.Mods = mods.ToArray();
+		}
+
 		public string Serialize()
 		{
 			var clientData = new List<MiniYamlNode>();
@@ -76,8 +93,7 @@ namespace OpenRA.Network
 
 		public static Session Deserialize(string data)
 		{
-			var session = new Session();
-			session.GlobalSettings.Mods = Game.Settings.Game.Mods;
+			var session = new Session( Game.Settings.Game.Mods );
 
 			var ys = MiniYaml.FromString(data);
 			foreach (var y in ys)

OpenRA.Game/Network/SyncReport.cs

@@ -9,12 +9,14 @@ namespace OpenRA.Network
 {
 	class SyncReport
 	{
+		readonly OrderManager orderManager;
 		const int numSyncReports = 5;
 		Report[] syncReports = new Report[numSyncReports];
 		int curIndex = 0;
 
-		public SyncReport()
+		public SyncReport( OrderManager orderManager )
 		{
+			this.orderManager = orderManager;
 			for (var i = 0; i < numSyncReports; i++)
 				syncReports[i] = new SyncReport.Report();
 		}
@@ -30,10 +32,10 @@ namespace OpenRA.Network
 		
 		void GenerateSyncReport(Report report)
 		{
-			report.Frame = Game.orderManager.FrameNumber;
-			report.SyncedRandom = Game.world.SharedRandom.Last;
+			report.Frame = orderManager.NetFrameNumber;
+			report.SyncedRandom = orderManager.world.SharedRandom.Last;
 			report.Traits.Clear();
-			foreach (var a in Game.world.Queries.WithTraitMultiple<object>())
+			foreach (var a in orderManager.world.Queries.WithTraitMultiple<object>())
 			{
 				var sync = Sync.CalculateSyncHash(a.Trait);
 				if (sync != 0)

OpenRA.Game/Network/UnitOrders.cs

@@ -16,18 +16,16 @@ namespace OpenRA.Network
 {
 	static class UnitOrders
 	{
-		static Session.Client FindClientById(int id)
+		static Player FindPlayerByClient( this World world, Session.Client c)
 		{
-			return Game.LobbyInfo.Clients.FirstOrDefault(c => c.Index == id);
+			/* todo: this is still a hack. 
+			 * the cases we're trying to avoid are the extra players on the host's client -- Neutral, other MapPlayers,
+			 * bots,.. */
+			return world.players.Values.FirstOrDefault(
+				p => p.ClientIndex == c.Index && p.PlayerName == c.Name);
 		}
 
-		static Player FindPlayerByClientId( this World world, int id)
-		{
-			/* todo: find the interactive player. */
-			return world.players.Values.FirstOrDefault(p => p.ClientIndex == id);
-		}
-
-		public static void ProcessOrder( World world, int clientId, Order order )
+		public static void ProcessOrder( OrderManager orderManager, World world, int clientId, Order order )
 		{
 			// Drop exploiting orders
 			if (order.Subject != null && order.Subject.Owner.ClientIndex != clientId)
@@ -40,32 +38,40 @@ namespace OpenRA.Network
 			{
 			case "Chat":
 				{
-					var client = FindClientById(clientId);
+					var client = orderManager.LobbyInfo.ClientWithIndex( clientId );
 					if (client != null)
 					{
-						var player = world.FindPlayerByClientId(clientId);
-						if (player != null && player.WinState == WinState.Lost)
-							Game.AddChatLine(client.Color1, client.Name + " (Dead)", order.TargetString);
-						else
-							Game.AddChatLine(client.Color1, client.Name, order.TargetString);
+						var player = world != null ? world.FindPlayerByClient(client) : null;
+						var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
+						Game.AddChatLine(client.Color1, client.Name+suffix, order.TargetString);
 					}
+					else
+						Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString);
 					break;
 				}
 			case "TeamChat":
 				{
-					var client = FindClientById(clientId);
+					var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
 					if (client != null)
 					{
-						var player = world.FindPlayerByClientId(clientId);
-						var display = (world.GameHasStarted) ? 
-							player != null && (world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally 
-								|| player.WinState == WinState.Lost) :
-							client == Game.LocalClient || (client.Team == Game.LocalClient.Team && client.Team != 0);
-						
-						if (display)
+						if (world == null)
 						{
-							var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : " (Team)";
-							Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString);
+							if (client.Team == orderManager.LocalClient.Team)
+								Game.AddChatLine(client.Color1, 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 (display)
+							{
+								var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : " (Team)";
+								Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString);
+							}
 						}
 					}
 					break;
@@ -73,25 +79,36 @@ namespace OpenRA.Network
 			case "StartGame":
 				{
 					Game.AddChatLine(Color.White, "Server", "The game has started.");
-					Game.StartGame(Game.LobbyInfo.GlobalSettings.Map);
+					Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map);
 					break;
 				}
 			case "SyncInfo":
 				{
-					Game.SyncLobbyInfo( world, order.TargetString);
+					orderManager.LobbyInfo = Session.Deserialize( order.TargetString );
+
+					if( orderManager.FramesAhead != orderManager.LobbyInfo.GlobalSettings.OrderLatency
+						&& !orderManager.GameStarted )
+					{
+						orderManager.FramesAhead = orderManager.LobbyInfo.GlobalSettings.OrderLatency;
+						Game.Debug( "Order lag is now {0} frames.".F( orderManager.LobbyInfo.GlobalSettings.OrderLatency ) );
+					}
+
+					Game.SyncLobbyInfo();
 					break;
 				}
 			case "SetStance":
 				{
 					var targetPlayer = order.Player.World.players[order.TargetLocation.X];
-					var oldStance = order.Player.Stances[targetPlayer];
-					order.Player.Stances[targetPlayer] = (Stance)order.TargetLocation.Y;
-					
-					if (targetPlayer == world.LocalPlayer)
-						world.WorldActor.Trait<Shroud>().UpdatePlayerStance(world, order.Player, oldStance, order.Player.Stances[targetPlayer]);
-					
+					var newStance = (Stance)order.TargetLocation.Y;
+
+					SetPlayerStance(world, order.Player, targetPlayer, newStance);
+
+					// automatically declare war reciprocally
+					if (newStance == Stance.Enemy)
+						SetPlayerStance(world, targetPlayer, order.Player, newStance);
+
 					Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F(
-						order.Player.PlayerName, targetPlayer.PlayerName, order.Player.Stances[targetPlayer]));
+						order.Player.PlayerName, targetPlayer.PlayerName, newStance));
 					break;
 				}
 			default:
@@ -103,5 +120,13 @@ namespace OpenRA.Network
 				}
 			}
 		}
+
+		static void SetPlayerStance(World w, Player a, Player b, Stance s)
+		{
+			var oldStance = a.Stances[b];
+			a.Stances[b] = s;
+			if (b == w.LocalPlayer)
+				w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, b, oldStance, s);
+		}
 	}
 }

OpenRA.Game/ObjectCreator.cs

@@ -42,7 +42,7 @@ namespace OpenRA
 			{
 				var type = mod.First.GetType( mod.Second + "." + className, false );
 				if( type == null ) continue;
-				var ctors = type.GetConstructors().Where( x => x.HasAttribute<UseCtorAttribute>() ).ToList();
+				var ctors = type.GetConstructors( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance ).Where( x => x.HasAttribute<UseCtorAttribute>() ).ToList();
 				if( ctors.Count == 0 )
 					return (T)CreateBasic( type );
 				else if( ctors.Count == 1 )
@@ -67,7 +67,7 @@ namespace OpenRA
 			{
 				var attrs = p[ i ].GetCustomAttributes<ParamAttribute>();
 				if( attrs.Length != 1 ) throw new InvalidOperationException( "ObjectCreator: argument in [UseCtor] doesn't have [Param]" );
-				a[ i ] = args[ attrs[ 0 ].ParamName ];
+				a[ i ] = args[ attrs[ 0 ].ParamName ?? p[i].Name ];
 			}
 			return ctor.Invoke( a );
 		}
@@ -77,6 +77,8 @@ namespace OpenRA
 		{
 			public string ParamName { get; private set; }
 
+			public ParamAttribute() { }
+
 			public ParamAttribute( string paramName )
 			{
 				ParamName = paramName;

OpenRA.Game/OpenRA.Game.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -106,7 +106,6 @@
     <Compile Include="Network\Connection.cs" />
     <Compile Include="Network\OrderIO.cs" />
     <Compile Include="Network\OrderManager.cs" />
-    <Compile Include="PathSearch.cs" />
     <Compile Include="Selection.cs" />
     <Compile Include="Server\Connection.cs" />
     <Compile Include="Server\Exts.cs" />
@@ -136,7 +135,6 @@
     <Compile Include="Orders\IOrderGenerator.cs" />
     <Compile Include="Player.cs" />
     <Compile Include="Graphics\Sheet.cs" />
-    <Compile Include="PathFinder.cs" />
     <Compile Include="Graphics\Sequence.cs" />
     <Compile Include="Network\Order.cs" />
     <Compile Include="Graphics\SequenceProvider.cs" />
@@ -151,7 +149,6 @@
     <Compile Include="Graphics\SpriteRenderer.cs" />
     <Compile Include="Graphics\SpriteSheetBuilder.cs" />
     <Compile Include="Graphics\TerrainRenderer.cs" />
-    <Compile Include="Traits\Activities\Move.cs" />
     <Compile Include="Traits\Activities\Turn.cs" />
     <Compile Include="Traits\Building.cs" />
     <Compile Include="Traits\World\BuildingInfluence.cs" />
@@ -159,7 +156,6 @@
     <Compile Include="Traits\World\ResourceLayer.cs" />
     <Compile Include="Traits\World\ResourceType.cs" />
     <Compile Include="Traits\Selectable.cs" />
-    <Compile Include="Traits\Mobile.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
     <Compile Include="Traits\World\UnitInfluence.cs" />
@@ -202,7 +198,6 @@
     <Compile Include="Traits\RevealsShroud.cs" />
     <Compile Include="Traits\Targetable.cs" />
     <Compile Include="Traits\Health.cs" />
-    <Compile Include="Traits\Activities\Drag.cs" />
     <Compile Include="Widgets\VqaPlayerWidget.cs" />
     <Compile Include="Widgets\Delegates\VideoPlayerDelegate.cs" />
     <Compile Include="GameRules\Settings.cs" />
@@ -222,6 +217,8 @@
     <Compile Include="ActorReference.cs" />
     <Compile Include="ModData.cs" />
     <Compile Include="Map.cs" />
+    <Compile Include="Network\FrameData.cs" />
+    <Compile Include="Network\ReplayConnection.cs" />
     <Compile Include="Network\Session.cs" />
     <Compile Include="ObjectCreator.cs" />
     <Compile Include="Network\SyncReport.cs" />

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -10,18 +10,27 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
 namespace OpenRA.Orders
 {
 	public class GenericSelectTarget : IOrderGenerator
 	{
-		readonly Actor subject;
+		readonly IEnumerable<Actor> subjects;
 		readonly string order;
 		readonly string cursor;
 
+		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor)
+		{
+			this.subjects = subjects;
+			this.order = order;
+			this.cursor = cursor;
+		}
+
 		public GenericSelectTarget(Actor subject, string order, string cursor)
 		{
-			this.subject = subject;
+			this.subjects = new Actor[] { subject };
 			this.order = order;
 			this.cursor = cursor;
 		}
@@ -35,16 +44,35 @@ namespace OpenRA.Orders
 
 		IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
 		{
-			if( mi.Button == MouseButton.Left && world.Map.IsInMap( xy ) )
+			if (mi.Button == MouseButton.Left && world.Map.IsInMap(xy))
 			{
 				world.CancelInputMode();
-				yield return new Order( order, subject, xy );
+				foreach (var subject in subjects)
+					yield return new Order(order, subject, xy);
 			}
 		}
 
 		public virtual void Tick(World world) { }
-		public void RenderAfterWorld(World world) { }
-		public void RenderBeforeWorld(World world) { }
+
+		public void RenderBeforeWorld(WorldRenderer wr, World world)
+		{
+			foreach (var a in world.Selection.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
+						t.RenderBeforeWorld(wr, a);
+
+			Game.Renderer.Flush();
+		}
+
+		public void RenderAfterWorld(WorldRenderer wr, World world)
+		{
+			foreach (var a in world.Selection.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
+						t.RenderAfterWorld(wr, a);
+
+			Game.Renderer.Flush();
+		}
 
 		public string GetCursor(World world, int2 xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
 	}
@@ -66,5 +94,4 @@ namespace OpenRA.Orders
 				world.CancelInputMode();
 		}
 	}
-
 }

OpenRA.Game/Orders/IOrderGenerator.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Graphics;
 
 namespace OpenRA
 {
@@ -16,8 +17,8 @@ namespace OpenRA
 	{
 		IEnumerable<Order> Order(World world, int2 xy, MouseInput mi);
 		void Tick(World world);
-		void RenderBeforeWorld(World world);
-		void RenderAfterWorld(World world);
+		void RenderBeforeWorld(WorldRenderer wr, World world);
+		void RenderAfterWorld(WorldRenderer wr, World world);
 		string GetCursor(World world, int2 xy, MouseInput mi);
 	}
 }

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -6,13 +6,12 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.Traits;
-using OpenRA.FileFormats;
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
 namespace OpenRA.Orders
 {
@@ -41,22 +40,22 @@ namespace OpenRA.Orders
 
 		public void Tick( World world ) {}
 
-		public void RenderBeforeWorld(World world)
+		public void RenderBeforeWorld( WorldRenderer wr, World world )
 		{
 			foreach (var a in world.Selection.Actors)
 				if (!a.Destroyed)
 					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
-						t.RenderBeforeWorld(a);
+						t.RenderBeforeWorld( wr, a );
 
 			Game.Renderer.Flush();
 		}
 
-		public void RenderAfterWorld( World world )
+		public void RenderAfterWorld( WorldRenderer wr, World world )
 		{
 			foreach (var a in world.Selection.Actors)
 				if (!a.Destroyed)
 					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
-						t.RenderAfterWorld(a);
+						t.RenderAfterWorld( wr, a );
 
 			Game.Renderer.Flush();
 		}

OpenRA.Game/Player.cs

@@ -37,7 +37,8 @@ namespace OpenRA
 		public readonly int Index;
 		public readonly bool NonCombatant = false;
 		public readonly int ClientIndex;
-		public readonly PlayerReference PlayerRef;
+		public readonly PlayerReference PlayerRef;
+		public bool IsBot;
 		
 		public ShroudRenderer Shroud;
 		public World World { get; private set; }
@@ -62,7 +63,6 @@ namespace OpenRA
 
 			PlayerRef = pr;
 			
-			RegisterPlayerColor(world, Palette);
 			PlayerActor = world.CreateActor("Player", new TypeDictionary{ new OwnerInit( this ) });
 		}
 		
@@ -84,18 +84,9 @@ namespace OpenRA
 			ClientIndex = client.Index;
 			PlayerRef = pr;
 			
-			RegisterPlayerColor(world, Palette);
 			PlayerActor = world.CreateActor("Player", new TypeDictionary{ new OwnerInit( this ) });
 		}
 		
-		public void RegisterPlayerColor(World world, string palette)
-		{			
-			var info = Rules.Info["world"].Traits.Get<PlayerColorPaletteInfo>();
-			var newpal = new Palette(world.WorldRenderer.GetPalette(info.BasePalette),
-			                 new PlayerColorRemap(Color, Color2, info.PaletteFormat));
-			world.WorldRenderer.AddPalette(palette, newpal);
-		}
-		
 		public void GiveAdvice(string advice)
 		{
 			Sound.PlayToPlayer(this, advice);

OpenRA.Game/Server/MasterServerQuery.cs

@@ -62,8 +62,13 @@ namespace OpenRA.Server
 				{
 					try
 					{
-						motd.SetText(GetData(new Uri(masterServerUrl + "motd.php?v=" + ClientVersion)));
-						motd.ResetScroll();
+						string motdText = GetData(new Uri(masterServerUrl + "motd.php?v=" + ClientVersion));
+						string[] p = motdText.Split('|');
+						if (p.Length == 2 && p[1].Length == int.Parse(p[0]))
+						{
+							motd.SetText(p[1]);
+							motd.ResetScroll();
+						}
 					}
 					catch
 					{

OpenRA.Game/Server/Server.cs

@@ -60,11 +60,11 @@ namespace OpenRA.Server
 			randomSeed = (int)DateTime.Now.ToBinary();
 			ModData = modData;
 
-			lobbyInfo = new Session();
-			lobbyInfo.GlobalSettings.Mods = settings.Game.Mods;
+			lobbyInfo = new Session( settings.Game.Mods );
 			lobbyInfo.GlobalSettings.RandomSeed = randomSeed;
 			lobbyInfo.GlobalSettings.Map = map;
 			lobbyInfo.GlobalSettings.AllowCheats = settings.Server.AllowCheats;
+			lobbyInfo.GlobalSettings.ServerName = settings.Server.Name;
 			
 			LoadMap();	// populates the Session's slots, too.
 			
@@ -191,19 +191,25 @@ namespace OpenRA.Server
 				conns.Add(newConn);
 
 				var defaults = new GameRules.PlayerSettings();
-				lobbyInfo.Clients.Add(
-					new Session.Client()
-					{
-						Index = newConn.PlayerIndex,
-						Color1 = defaults.Color1,
-						Color2 = defaults.Color2,
-						Name = defaults.Name,
-						Country = "random",
-						State = Session.ClientState.NotReady,
-						SpawnPoint = 0,
-						Team = 0,
-						Slot = ChooseFreeSlot(),
-					});
+				
+				var client = new Session.Client()
+				{
+					Index = newConn.PlayerIndex,
+					Color1 = defaults.Color1,
+					Color2 = defaults.Color2,
+					Name = defaults.Name,
+					Country = "random",
+					State = Session.ClientState.NotReady,
+					SpawnPoint = 0,
+					Team = 0,
+					Slot = ChooseFreeSlot(),
+				};
+				
+				var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == client.Slot );
+				if (slotData != null)
+					SyncClientToPlayerReference(client, Map.Players[slotData.MapPlayer]);
+				
+				lobbyInfo.Clients.Add(client);
 
 				Log.Write("server", "Client {0}: Accepted connection from {1}",
 					newConn.PlayerIndex, newConn.socket.RemoteEndPoint);
@@ -275,6 +281,17 @@ namespace OpenRA.Server
 			catch (NotImplementedException) { }
 		}
 
+		static void SyncClientToPlayerReference(Session.Client c, PlayerReference pr)
+		{
+			if (pr.LockColor)
+			{
+				c.Color1 = pr.Color;
+				c.Color2 = pr.Color2;
+			}
+			if (pr.LockRace)
+				c.Country = pr.Race;
+		}
+		
 		static bool InterpretCommand(Connection conn, string cmd)
 		{
 			var dict = new Dictionary<string, Func<string, bool>>
@@ -391,7 +408,11 @@ namespace OpenRA.Server
 							|| lobbyInfo.Clients.Any( c => c.Slot == slot ))
 							return false;
 
-						GetClient(conn).Slot = slot;
+						var cl = GetClient(conn);
+						cl.Slot = slot;
+						
+						SyncClientToPlayerReference(cl, Map.Players[slotData.MapPlayer]);
+						
 						SyncLobbyInfo();
 						return true;
 					}},
@@ -491,6 +512,10 @@ namespace OpenRA.Server
 						foreach(var client in lobbyInfo.Clients)
 						{
 							client.SpawnPoint = 0;
+							var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == client.Slot );
+							if (slotData != null)
+								SyncClientToPlayerReference(client, Map.Players[slotData.MapPlayer]);
+				
 							client.State = Session.ClientState.NotReady;
 						}
 						

OpenRA.Game/ShroudRenderer.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.FileFormats;
 using OpenRA.Graphics;
 
 namespace OpenRA
@@ -128,7 +127,7 @@ namespace OpenRA
 			return shadowBits[SpecialShroudTiles[u ^ uSides][v]];
 		}
 
-		internal void Draw()
+		internal void Draw( WorldRenderer wr )
 		{
 			if (disabled)
 				return;
@@ -151,13 +150,13 @@ namespace OpenRA
 			var minx = clipRect.Left;
 			var maxx = clipRect.Right;
 
-			DrawShroud( minx, miny, maxx, maxy, fogSprites, "fog" );
-			DrawShroud( minx, miny, maxx, maxy, sprites, "shroud" );
+			DrawShroud( wr, minx, miny, maxx, maxy, fogSprites, "fog" );
+			DrawShroud( wr, minx, miny, maxx, maxy, sprites, "shroud" );
 		}
 
-		void DrawShroud( int minx, int miny, int maxx, int maxy, Sprite[,] s, string pal )
+		void DrawShroud( WorldRenderer wr, int minx, int miny, int maxx, int maxy, Sprite[,] s, string pal )
 		{
-			var shroudPalette = Game.world.WorldRenderer.GetPaletteIndex(pal);
+			var shroudPalette = wr.GetPaletteIndex(pal);
 
 			for (var j = miny; j < maxy; j++)
 			{

OpenRA.Game/Sound.cs

@@ -54,7 +54,7 @@ namespace OpenRA
 				return;
 
 			var sound = sounds[name];
-			soundEngine.Play2D(sound, false, true, float2.Zero, SoundVolume);
+			soundEngine.Play2D(sound, false, true, float2.Zero, InternalSoundVolume);
 		}
 
 		public static void Play(string name, float2 pos)
@@ -63,7 +63,7 @@ namespace OpenRA
 				return;
 			
 			var sound = sounds[name];
-			soundEngine.Play2D(sound, false, false, pos, SoundVolume);
+			soundEngine.Play2D(sound, false, false, pos, InternalSoundVolume);
 		}
 
 		public static void PlayToPlayer(Player player, string name)
@@ -81,7 +81,7 @@ namespace OpenRA
 		public static void PlayVideo(byte[] raw)
 		{
 			rawSource = LoadSoundRaw(raw);
-			video = soundEngine.Play2D(rawSource, false, true, float2.Zero, SoundVolume);
+			video = soundEngine.Play2D(rawSource, false, true, float2.Zero, InternalSoundVolume);
 		}
 		
 		public static void PlayVideo()
@@ -171,13 +171,25 @@ namespace OpenRA
 			set { soundEngine.Volume = value;}
 		}
 		
+		static float soundVolumeModifier = 1.0f;
+		public static float SoundVolumeModifier
+		{
+			get { return soundVolumeModifier; }
+			set
+			{
+				soundVolumeModifier = value;
+				soundEngine.SetSoundVolume(InternalSoundVolume, music, video);
+			}
+		}
+		
+		static float InternalSoundVolume { get { return SoundVolume*soundVolumeModifier; } }
 		public static float SoundVolume
 		{
 			get { return Game.Settings.Sound.SoundVolume; }
 			set
 			{
 				Game.Settings.Sound.SoundVolume = value;
-				soundEngine.SetSoundVolume(value, music, video);
+				soundEngine.SetSoundVolume(InternalSoundVolume, music, video);
 			}
 		}
 
@@ -230,7 +242,7 @@ namespace OpenRA
 				return false;
 			
 			var variantext = (vi.Variants.ContainsKey(variant) && !vi.DisableVariants.Contains(phrase))? 
-				  vi.Variants[variant][voicedUnit.ActorID % vi.Variants.Count] : vi.DefaultVariant;
+				  vi.Variants[variant][voicedUnit.ActorID % vi.Variants[variant].Length] : vi.DefaultVariant;
 			Play(clip + variantext);
 			return true;
 		}

OpenRA.Game/Support/PerfHistory.cs

@@ -90,7 +90,7 @@ namespace OpenRA.Support
 		}
 	}
 
-	class PerfSample : IDisposable
+	public class PerfSample : IDisposable
 	{
 		readonly Stopwatch sw = new Stopwatch();
 		readonly string Item;

OpenRA.Game/Sync.cs

@@ -139,7 +139,9 @@ namespace OpenRA
 
 		public static T CheckSyncUnchanged<T>( World world, Func<T> fn )
 		{
+			if( world == null ) return fn();
 			int sync = world.SyncHash();
+			bool prevInUnsyncedCode = inUnsyncedCode;
 			inUnsyncedCode = true;
 			try
 			{
@@ -147,9 +149,9 @@ namespace OpenRA
 			}
 			finally
 			{
-				inUnsyncedCode = false;
+				inUnsyncedCode = prevInUnsyncedCode;
 				if( sync != world.SyncHash() )
-					throw new InvalidOperationException( "Desync in DispatchMouseInput" );
+					throw new InvalidOperationException( "CheckSyncUnchanged: sync-changing code may not run here" );
 			}
 		}
 

OpenRA.Game/Traits/Building.cs

@@ -44,16 +44,16 @@ namespace OpenRA.Traits
 		public readonly BuildingInfo Info;
 		[Sync]
 		readonly int2 topLeft;
-		
+
 		readonly PowerManager PlayerPower;
 
+		public int2 PxPosition { get { return ( 2 * topLeft + Info.Dimensions ) * Game.CellSize / 2; } }
+
 		public Building(ActorInitializer init)
 		{
 			this.self = init.self;
 			this.topLeft = init.Get<LocationInit,int2>();
 			Info = self.Info.Traits.Get<BuildingInfo>();
-			self.CenterLocation = Game.CellSize 
-				* ((float2)topLeft + .5f * (float2)Info.Dimensions);
 			
 			PlayerPower = init.self.Owner.PlayerActor.Trait<PowerManager>();
 		}

OpenRA.Game/Traits/DrawLineToTarget.cs

@@ -8,8 +8,8 @@
  */
 #endregion
 
-using System.Drawing;
-using OpenRA.Traits.Activities;
+using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Traits
 {
@@ -45,7 +45,7 @@ namespace OpenRA.Traits
 			this.c = c;
 		}
 
-		public void RenderAfterWorld(Actor self)
+		public void RenderAfterWorld(WorldRenderer wr, Actor self)
 		{
 			if (self.IsIdle) return;
 
@@ -53,6 +53,9 @@ namespace OpenRA.Traits
 			if ((lifetime <= 0 || --lifetime <= 0) && !force)
 				return;
 
+			if (!target.IsValid)
+				return;
+
 			var p = target.CenterLocation;
 
 			Game.Renderer.LineRenderer.DrawLine(self.CenterLocation, p, c, c);

OpenRA.Game/Traits/Health.cs

@@ -163,7 +163,9 @@ namespace OpenRA.Traits
 		{
 			var health = self.TraitOrDefault<Health>();
 			if (health == null) return;
-			health.InflictDamage(self, attacker, health.HP, null);
+
+			/* hack. Fix for proper */
+			health.InflictDamage(self, attacker, int.MaxValue, null);
 		}
 	}
 }

OpenRA.Game/Traits/Player/DeveloperMode.cs

@@ -17,7 +17,8 @@ namespace OpenRA.Traits
 		public bool FastBuild = false;
 		public bool FastCharge = false;
 		public bool DisableShroud = false;
-		public bool PathDebug = false;
+		public bool PathDebug = false;
+		public bool UnitInfluenceDebug = false;
 		
 		public object Create (ActorInitializer init) { return new DeveloperMode(this); }
 	}
@@ -30,19 +31,21 @@ namespace OpenRA.Traits
 		[Sync] public bool FastBuild;
 		[Sync] public bool DisableShroud;
 		[Sync] public bool PathDebug;
-		
+		[Sync] public bool UnitInfluenceDebug;
+
 		public DeveloperMode(DeveloperModeInfo info)
 		{
 			Info = info;
 			FastBuild = Info.FastBuild;
 			FastCharge = Info.FastCharge;
 			DisableShroud = Info.DisableShroud;
-			PathDebug = Info.PathDebug;
+			PathDebug = Info.PathDebug;
+			UnitInfluenceDebug = info.UnitInfluenceDebug;
 		}
 		
 		public void ResolveOrder (Actor self, Order order)
 		{
-			if (!Game.LobbyInfo.GlobalSettings.AllowCheats) return;
+			if (!self.World.LobbyInfo.GlobalSettings.AllowCheats) return;
 			
 			switch(order.OrderString)
 			{
@@ -79,9 +82,8 @@ namespace OpenRA.Traits
 						break;
 					}
 				case "DevUnitDebug":
-					{
-						if (self.World.LocalPlayer == self.Owner)
-							Game.Settings.Debug.ShowCollisions ^= true;
+					{
+						UnitInfluenceDebug ^= true;
 						break;
 					}
 				case "DevGiveExploration":

OpenRA.Game/Traits/Selectable.cs

@@ -10,7 +10,6 @@
 
 using System.Drawing;
 using OpenRA.Graphics;
-using System.Linq;
 
 namespace OpenRA.Traits
 {
@@ -29,7 +28,7 @@ namespace OpenRA.Traits
 		static readonly string[] pipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray" };
 		static readonly string[] tagStrings = { "", "tag-fake", "tag-primary" };
 		
-		public void RenderAfterWorld (Actor self)
+		public void RenderAfterWorld (WorldRenderer wr, Actor self)
 		{
 			var bounds = self.GetBounds(true);
 
@@ -40,9 +39,9 @@ namespace OpenRA.Traits
 
 			DrawSelectionBox(self, xy, Xy, xY, XY, Color.White);
 			DrawHealthBar(self, xy, Xy);
-			DrawControlGroup(self, xy);
-			DrawPips(self, xY);
-			DrawTags(self, new float2(.5f * (bounds.Left + bounds.Right), bounds.Top));
+			DrawControlGroup(wr, self, xy);
+			DrawPips(wr, self, xY);
+			DrawTags(wr, self, new float2(.5f * (bounds.Left + bounds.Right), bounds.Top));
 			DrawUnitPath(self);
 		}
 		
@@ -89,7 +88,7 @@ namespace OpenRA.Traits
 			Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), healthColor2, healthColor2);
 		}
 
-		void DrawControlGroup(Actor self, float2 basePosition)
+		void DrawControlGroup(WorldRenderer wr, Actor self, float2 basePosition)
 		{
 			var group = self.World.Selection.GetControlGroupForActor(self);
 			if (group == null) return;
@@ -97,10 +96,10 @@ namespace OpenRA.Traits
 			var pipImages = new Animation("pips");
 			pipImages.PlayFetchIndex("groups", () => (int)group);
 			pipImages.Tick();
-			pipImages.Image.DrawAt(basePosition + new float2(-8, 1), "chrome");
+			pipImages.Image.DrawAt(wr, basePosition + new float2(-8, 1), "chrome");
 		}
 
-		void DrawPips(Actor self, float2 basePosition)
+		void DrawPips(WorldRenderer wr, Actor self, float2 basePosition)
 		{
 			if (self.Owner != self.World.LocalPlayer) return;
 			
@@ -123,7 +122,7 @@ namespace OpenRA.Traits
 					}
 					var pipImages = new Animation("pips");
 					pipImages.PlayRepeating(pipStrings[(int)pip]);
-					pipImages.Image.DrawAt(pipxyBase + pipxyOffset, "chrome");
+					pipImages.Image.DrawAt(wr, pipxyBase + pipxyOffset, "chrome");
 					pipxyOffset += new float2(4, 0);
 				}
 				// Increment row
@@ -132,7 +131,7 @@ namespace OpenRA.Traits
 			}
 		}
 		
-		void DrawTags(Actor self, float2 basePosition)
+		void DrawTags(WorldRenderer wr, Actor self, float2 basePosition)
 		{
 			if (self.Owner != self.World.LocalPlayer) return;
 			
@@ -149,7 +148,7 @@ namespace OpenRA.Traits
 						
 					var tagImages = new Animation("pips");
 					tagImages.PlayRepeating(tagStrings[(int)tag]);
-					tagImages.Image.DrawAt(tagxyBase + tagxyOffset, "chrome");
+					tagImages.Image.DrawAt(wr, tagxyBase + tagxyOffset, "chrome");
 					
 					// Increment row
 					tagxyOffset.Y += 8;

OpenRA.Game/Traits/Targetable.cs

@@ -20,15 +20,15 @@ namespace OpenRA.Traits
 		public virtual object Create( ActorInitializer init ) { return new Targetable(this); }
 	}
 
-	public class Targetable : ITargetable
+	public class Targetable
 	{
-		TargetableInfo Info;
+		protected TargetableInfo Info;
 		public Targetable(TargetableInfo info)
 		{
 			Info = info;
 		}
 		
-		public string[] TargetTypes
+		public virtual string[] TargetTypes
 		{
 			get { return Info.TargetTypes;}
 		}

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -10,9 +10,9 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using OpenRA.FileFormats;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
@@ -48,7 +48,6 @@ namespace OpenRA.Traits
 	public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
 	public interface IOrderCursor { string CursorForOrder(Actor self, Order order); }
 	public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }
-	public interface ITargetable { string[] TargetTypes { get; } }
 
 	public interface INotifySold { void Selling( Actor self );  void Sold( Actor self ); }
 	public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
@@ -70,7 +69,12 @@ namespace OpenRA.Traits
 	
 	public interface IVisibilityModifier { bool IsVisible(Actor self, Player byPlayer); }
 	public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
-	public interface IOccupySpace
+	public interface IHasLocation
+	{
+		int2 PxPosition { get; }
+	}
+
+	public interface IOccupySpace : IHasLocation
 	{
 		int2 TopLeft { get; }
 		IEnumerable<int2> OccupiedCells();
@@ -100,19 +104,20 @@ namespace OpenRA.Traits
 	public interface IDamageModifier { float GetDamageModifier( WarheadInfo warhead ); }
 	public interface ISpeedModifier { float GetSpeedModifier(); }
 	public interface IFirepowerModifier { float GetFirepowerModifier(); }
+	public interface IPalette { void InitPalette( WorldRenderer wr ); }
 	public interface IPaletteModifier { void AdjustPalette(Dictionary<string,Palette> b); }
 	public interface IPips { IEnumerable<PipType> GetPips(Actor self); }
 	public interface ITags { IEnumerable<TagType> GetTags(); }
 
-	public interface ITeleportable /* crap name! */
+	public interface ITeleportable : IHasLocation /* crap name! */
 	{
 		bool CanEnterCell(int2 location);
 		void SetPosition(Actor self, int2 cell);
+		void SetPxPosition(Actor self, int2 px);
 	}
 
 	public interface IMove : ITeleportable
 	{
-		float MovementSpeedForCell(Actor self, int2 cell);
 		int Altitude { get; set; }
 	}
 	
@@ -188,7 +193,7 @@ namespace OpenRA.Traits
 			IsCanceled = OnCancel();
 			if( IsCanceled )
 				NextActivity = null;
-			else
+			else if (NextActivity != null)
 				NextActivity.Cancel( self );
 		}
 
@@ -206,13 +211,13 @@ namespace OpenRA.Traits
 		}
 	}
 
-	public interface IRenderOverlay { void Render(); }
+	public interface IRenderOverlay { void Render( WorldRenderer wr ); }
 	public interface INotifyIdle { void Idle(Actor self); }
 
 	public interface IBlocksBullets { }
 
-	public interface IPostRenderSelection { void RenderAfterWorld(Actor self); }
-	public interface IPreRenderSelection { void RenderBeforeWorld(Actor self); }
+	public interface IPostRenderSelection { void RenderAfterWorld(WorldRenderer wr, Actor self); }
+	public interface IPreRenderSelection { void RenderBeforeWorld(WorldRenderer wr, Actor self); }
 
 	public struct Target		// a target: either an actor, or a fixed location.
 	{
@@ -233,9 +238,10 @@ namespace OpenRA.Traits
 		public static readonly Target None = new Target();
 
 		public bool IsValid { get { return valid && (actor == null || actor.IsInWorld); } }
-		public float2 CenterLocation { get { return actor != null ? actor.CenterLocation : pos.ToInt2(); } }
+		public int2 PxPosition { get { return IsActor ? actor.Trait<IHasLocation>().PxPosition : pos.ToInt2(); } }
+		public float2 CenterLocation { get { return PxPosition; } }
 
-		public Actor Actor { get { return actor; } }
-		public bool IsActor { get { return actor != null; } }
+		public Actor Actor { get { return IsActor ? actor : null; } }
+		public bool IsActor { get { return actor != null && !actor.Destroyed; } }
 	}
 }

OpenRA.Game/Traits/Util.cs

@@ -82,14 +82,14 @@ namespace OpenRA.Traits
 				ecc * (cosAngle * v.Y - sinAngle * v.X));
 		}
 
-		public static float2 CenterOfCell(int2 loc)
+		public static int2 CenterOfCell(int2 loc)
 		{
-			return new float2(12, 12) + Game.CellSize * (float2)loc;
+			return new int2( Game.CellSize / 2, Game.CellSize / 2 ) + Game.CellSize * loc;
 		}
 
-		public static float2 BetweenCells(int2 from, int2 to)
+		public static int2 BetweenCells(int2 from, int2 to)
 		{
-			return 0.5f * (CenterOfCell(from) + CenterOfCell(to));
+			return int2.Lerp( CenterOfCell( from ), CenterOfCell( to ), 1, 2 );
 		}
 
 		public static int2 AsInt2(this int[] xs) { return new int2(xs[0], xs[1]); }

OpenRA.Game/Traits/World/BibLayer.cs

@@ -6,14 +6,14 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
-using System.Drawing;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using System.Collections.Generic;
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
 
 namespace OpenRA.Traits
 {
@@ -71,11 +71,9 @@ namespace OpenRA.Traits
 			}
 		}
 
-		public void Render()
-		{
-			var cliprect = Game.viewport.ShroudBounds().HasValue
-				? Rectangle.Intersect(Game.viewport.ShroudBounds().Value, world.Map.Bounds) : world.Map.Bounds;
-			
+		public void Render( WorldRenderer wr )
+		{
+			var cliprect = Game.viewport.ShroudBounds( world );			
 			cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
 			foreach (var kv in tiles)
 			{
@@ -84,7 +82,7 @@ namespace OpenRA.Traits
 				if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(kv.Key))
 					continue;
 
-				bibSprites[kv.Value.type - 1][kv.Value.image].DrawAt(
+				bibSprites[kv.Value.type - 1][kv.Value.image].DrawAt( wr,
 					Game.CellSize * kv.Key, "terrain");
 			}
 		}

OpenRA.Game/Traits/World/PlayerColorPalette.cs

@@ -9,13 +9,34 @@
 #endregion
 
 using OpenRA.FileFormats;
+using OpenRA.Graphics;
 namespace OpenRA.Traits
 {	
-	public class PlayerColorPaletteInfo : TraitInfo<PlayerColorPalette>
+	public class PlayerColorPaletteInfo : ITraitInfo
 	{
 		public readonly string BasePalette = null;
+		public readonly string BaseName = "player";
 		public readonly PaletteFormat PaletteFormat = PaletteFormat.ra;
+
+		public object Create( ActorInitializer init ) { return new PlayerColorPalette( init.self.Owner, this ); }
 	}
 
-	public class PlayerColorPalette {}
+	public class PlayerColorPalette : IPalette
+	{
+		readonly Player owner;
+		readonly PlayerColorPaletteInfo info;
+		public PlayerColorPalette( Player owner, PlayerColorPaletteInfo info )
+		{
+			this.owner = owner;
+			this.info = info;
+		}
+
+		public void InitPalette( WorldRenderer wr )
+		{
+			var paletteName = "{0}{1}".F( info.BaseName, owner.Index );
+			var newpal = new Palette(wr.GetPalette(info.BasePalette),
+			                 new PlayerColorRemap(owner.Color, owner.Color2, info.PaletteFormat));
+			wr.AddPalette(paletteName, newpal);
+		}
+	}
 }

OpenRA.Game/Traits/World/ResourceLayer.cs

@@ -24,11 +24,9 @@ namespace OpenRA.Traits
 		public ResourceType[] resourceTypes;
 		CellContents[,] content;
 		
-		public void Render()
+		public void Render( WorldRenderer wr )
 		{
-			var cliprect = Game.viewport.ShroudBounds().HasValue
-				? Rectangle.Intersect(Game.viewport.ShroudBounds().Value, world.Map.Bounds) : world.Map.Bounds;
-
+			var cliprect = Game.viewport.ShroudBounds( world );
 			cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
 			
 			var minx = cliprect.Left;
@@ -38,7 +36,7 @@ namespace OpenRA.Traits
 			var maxy = cliprect.Bottom;
 
 			foreach( var rt in world.WorldActor.TraitsImplementing<ResourceType>() )
-				rt.info.PaletteIndex = world.WorldRenderer.GetPaletteIndex(rt.info.Palette);
+				rt.info.PaletteIndex = wr.GetPaletteIndex(rt.info.Palette);
 
 			for (int x = minx; x < maxx; x++)
 				for (int y = miny; y < maxy; y++)

OpenRA.Game/Traits/World/Shroud.cs

@@ -129,11 +129,14 @@ namespace OpenRA.Traits
 			}
 			else
 			{
-				var mobile = a.TraitOrDefault<Mobile>();
-				if (mobile != null)
-					return new[] { mobile.fromCell, mobile.toCell };
-				else
-					return new[] { (1f / Game.CellSize * a.CenterLocation).ToInt2() };
+				var ios = a.TraitOrDefault<IOccupySpace>();
+				if (ios != null)
+				{
+					var cells = ios.OccupiedCells();
+					if (cells.Any()) return cells;
+				}
+
+				return new[] { (1f / Game.CellSize * a.CenterLocation).ToInt2() };
 			}
 		}
 

OpenRA.Game/Traits/World/SpatialBins.cs

@@ -45,9 +45,9 @@ namespace OpenRA.Traits
 				for (var i = 0; i <= bins.GetUpperBound(0); i++)
 					bins[i, j].Clear();
 
-			foreach (var a in self.World.Actors)
+			foreach (var a in self.World.Queries.WithTrait<IHasLocation>())
 			{
-				var bounds = a.GetBounds(true);
+				var bounds = a.Actor.GetBounds(true);
 
 				if (bounds.Right <= Game.CellSize * self.World.Map.XOffset) continue;
 				if (bounds.Bottom <= Game.CellSize * self.World.Map.YOffset) continue;
@@ -61,7 +61,7 @@ namespace OpenRA.Traits
 				
 				for (var j = j1; j <= j2; j++)
 					for (var i = i1; i <= i2; i++)
-						bins[i, j].Add(a);
+						bins[i, j].Add(a.Actor);
 			}
 		}
 

OpenRA.Game/UiOverlay.cs

@@ -14,7 +14,6 @@ using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Traits;
-using OpenRA.Widgets;
 
 namespace OpenRA
 {
@@ -40,20 +39,21 @@ namespace OpenRA
 			return Game.modData.SheetBuilder.Add(data, new Size(Game.CellSize, Game.CellSize));
 		}
 
-		public void Draw( World world )
+		public void Draw( WorldRenderer wr, World world )
 		{
-			if (Game.Settings.Debug.ShowCollisions)
+			if( world.LocalPlayer == null ) return;
+			if (world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().UnitInfluenceDebug)
 			{
 				var uim = world.WorldActor.Trait<UnitInfluence>();
 				
 				for (var i = world.Map.Bounds.Left; i < world.Map.Bounds.Right; i++)
 					for (var j = world.Map.Bounds.Top; j < world.Map.Bounds.Bottom; j++)	
 						if (uim.GetUnitsAt(new int2(i, j)).Any())
-							unitDebug.DrawAt(Game.CellSize * new float2(i, j), "terrain");
+							unitDebug.DrawAt(wr, Game.CellSize * new float2(i, j), "terrain");
 			}
 		}
 
-		public void DrawBuildingGrid( World world, string name, BuildingInfo bi )
+		public void DrawBuildingGrid( WorldRenderer wr, World world, string name, BuildingInfo bi )
 		{
 			var position = Game.viewport.ViewToWorld(Viewport.LastMousePos).ToInt2();
 			var topLeft = position - Footprint.AdjustForBuildingSize( bi );
@@ -64,7 +64,7 @@ namespace OpenRA
 			{
 				foreach (var t in LineBuildUtils.GetLineBuildCells(world, topLeft, name, bi))
 					(world.IsCloseEnoughToBase(world.LocalPlayer, name, bi, t) ? buildOk : buildBlocked)
-						.DrawAt(Game.CellSize * t, "terrain");
+						.DrawAt(wr, Game.CellSize * t, "terrain");
 			}
 			else
 			{
@@ -72,7 +72,7 @@ namespace OpenRA
 				var isCloseEnough = world.IsCloseEnoughToBase(world.LocalPlayer, name, bi, topLeft);
 				foreach (var t in Footprint.Tiles(name, bi, topLeft))
 					((isCloseEnough && world.IsCellBuildable(t, bi.WaterBound) && res.GetResource(t) == null) ? buildOk : buildBlocked)
-						.DrawAt(Game.CellSize * t, "terrain");
+						.DrawAt( wr, Game.CellSize * t, "terrain");
 			}
 		}
 	}

OpenRA.Game/Widgets/BackgroundWidget.cs

@@ -8,13 +8,15 @@
  */
 #endregion
 
+using OpenRA.Graphics;
+
 namespace OpenRA.Widgets
 {
 	class BackgroundWidget : Widget
 	{
 		public readonly string Background = "dialog";
 		
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			WidgetUtils.DrawPanel(Background, RenderBounds);
 		}

OpenRA.Game/Widgets/ButtonWidget.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -53,7 +54,7 @@ namespace OpenRA.Widgets
 				var wasPressed = Depressed;
 				return (LoseFocus(mi) && wasPressed);
 			}
-
+
 			if (mi.Event == MouseInputEvent.Down)
 				Depressed = true;
 			else if (mi.Event == MouseInputEvent.Move && Focused)
@@ -62,7 +63,7 @@ namespace OpenRA.Widgets
 			return Depressed;
 		}
 
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
 			var stateOffset = (Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0);

OpenRA.Game/Widgets/ChatDisplayWidget.cs

@@ -8,9 +8,10 @@
  */
 #endregion
 
-using System.Collections.Generic;
-using System.Drawing;
+using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -32,7 +33,7 @@ namespace OpenRA.Widgets
 			: base(widget) { }
 
 		public override Rectangle EventBounds { get { return Rectangle.Empty; } }
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			var pos = RenderOrigin;
 			var chatLogArea = new Rectangle(pos.X, pos.Y, Bounds.Width, Bounds.Height);
@@ -75,7 +76,7 @@ namespace OpenRA.Widgets
 			recentLines = new List<ChatLine>();	
 		}
 		
-		public override void Tick (World world)
+		public override void Tick()
 		{
 			if (RemoveTime == 0) return;
 			if (--ticksUntilRemove > 0) return;

OpenRA.Game/Widgets/ChatEntryWidget.cs

@@ -9,6 +9,8 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Graphics;
+using OpenRA.Network;
 
 namespace OpenRA.Widgets
 {
@@ -24,7 +26,14 @@ namespace OpenRA.Widgets
 		bool composing = false;
 		bool teamChat = false;
 
-		public override void DrawInner(World world)
+		readonly OrderManager orderManager;
+		[ObjectCreator.UseCtor]
+		internal ChatEntryWidget( [ObjectCreator.Param] OrderManager orderManager )
+		{
+			this.orderManager = orderManager;
+		}
+
+		public override void DrawInner( WorldRenderer wr )
 		{
 			if (composing)
 			{
@@ -60,7 +69,7 @@ namespace OpenRA.Widgets
 
 					composing = false;
 					if (content != "")
-						Game.IssueOrder(teamChat
+						orderManager.IssueOrder(teamChat
 							? Order.TeamChat(content)
 							: Order.Chat(content));
 					content = "";
@@ -72,7 +81,14 @@ namespace OpenRA.Widgets
 				{
 					TakeFocus(new MouseInput());
 					composing = true;
-					teamChat ^= e.Modifiers.HasModifier(Modifiers.Shift);
+					if (Game.Settings.Game.TeamChatToggle)
+					{
+						teamChat ^= e.Modifiers.HasModifier(Modifiers.Shift);
+					}
+					else
+					{
+						teamChat = e.Modifiers.HasModifier(Modifiers.Shift);
+					}
 					return true;
 				}
 			}

OpenRA.Game/Widgets/CheckboxWidget.cs

@@ -21,7 +21,7 @@ namespace OpenRA.Widgets
 		public bool Bold = false;
 		public Func<bool> Checked = () => false;
 		
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			var font = Bold ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
 			var pos = RenderOrigin;

OpenRA.Game/Widgets/ColorBlockWidget.cs

@@ -6,10 +6,11 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
+#endregion
+
+using System;
 using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -34,9 +35,9 @@ namespace OpenRA.Widgets
 			return new ColorBlockWidget(this);
 		}
 
-		public override void DrawInner(World world)
-		{
-			WidgetUtils.FillRectWithColor(RenderBounds, GetColor());
+		public override void DrawInner( WorldRenderer wr )
+		{
+			WidgetUtils.FillRectWithColor(RenderBounds, GetColor());
 		}
 	}
-}
+}

OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs

@@ -15,7 +15,10 @@ namespace OpenRA.Widgets.Delegates
 	public class ConnectionDialogsDelegate : IWidgetDelegate
 	{
 		[ObjectCreator.UseCtor]
-		public ConnectionDialogsDelegate( [ObjectCreator.Param( "widget" )] Widget widget )
+		public ConnectionDialogsDelegate(
+			[ObjectCreator.Param] Widget widget,
+			[ObjectCreator.Param] string host,
+			[ObjectCreator.Param] int port )
 		{
 			widget.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => {
 				widget.GetWidget("CONNECTION_BUTTON_ABORT").Parent.Visible = false;
@@ -24,14 +27,17 @@ namespace OpenRA.Widgets.Delegates
 			};
 
 			widget.GetWidget<LabelWidget>("CONNECTING_DESC").GetText = () =>
-				"Connecting to {0}:{1}...".F(Game.CurrentHost, Game.CurrentPort);
+				"Connecting to {0}:{1}...".F(host, port);
 		}
 	}
 
 	public class ConnectionFailedDelegate : IWidgetDelegate
 	{
 		[ObjectCreator.UseCtor]
-		public ConnectionFailedDelegate( [ObjectCreator.Param( "widget" )] Widget widget )
+		public ConnectionFailedDelegate(
+			[ObjectCreator.Param] Widget widget,
+			[ObjectCreator.Param] string host,
+			[ObjectCreator.Param] int port )
 		{
 			widget.GetWidget("CONNECTION_BUTTON_CANCEL").OnMouseUp = mi => {
 				widget.GetWidget("CONNECTION_BUTTON_CANCEL").Parent.Visible = false;
@@ -39,12 +45,12 @@ namespace OpenRA.Widgets.Delegates
 				return true;
 			};
 			widget.GetWidget("CONNECTION_BUTTON_RETRY").OnMouseUp = mi => {
-				Game.JoinServer(Game.CurrentHost, Game.CurrentPort);
+				Game.JoinServer(host, port);
 				return true;
 			};
 
 			widget.GetWidget<LabelWidget>("CONNECTION_FAILED_DESC").GetText = () =>
-				"Could not connect to {0}:{1}".F(Game.CurrentHost, Game.CurrentPort);
+				"Could not connect to {0}:{1}".F(host, port);
 		}
 	}
 }

OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs

@@ -23,14 +23,13 @@ using OpenRA;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-
 namespace OpenRA.Widgets.Delegates
 {
-
 	public class DeveloperModeDelegate : IWidgetDelegate
 	{
-		public DeveloperModeDelegate ()
-		{
+		[ObjectCreator.UseCtor]
+		public DeveloperModeDelegate( [ObjectCreator.Param] World world )
+		{
 			var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG");
 			var devModeButton = Widget.RootWidget.GetWidget<ButtonWidget>("INGAME_DEVELOPERMODE_BUTTON");
 			
@@ -41,66 +40,66 @@ namespace OpenRA.Widgets.Delegates
 			};
 			
 			devmodeBG.GetWidget<CheckboxWidget>("CHECKBOX_SHROUD").Checked = 
-				() => Game.world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().DisableShroud;
+				() => world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().DisableShroud;
 			devmodeBG.GetWidget<CheckboxWidget>("CHECKBOX_SHROUD").OnMouseDown = mi => 
 			{
-				Game.IssueOrder(new Order("DevShroud", Game.world.LocalPlayer.PlayerActor));
+				world.IssueOrder(new Order("DevShroud", world.LocalPlayer.PlayerActor));
 				return true;
 			};
 			
-			devmodeBG.GetWidget<CheckboxWidget>("CHECKBOX_UNITDEBUG").Checked = 
-				() => Game.Settings.Debug.ShowCollisions;
+			devmodeBG.GetWidget<CheckboxWidget>("CHECKBOX_UNITDEBUG").Checked =
+				() => world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().UnitInfluenceDebug;
 			devmodeBG.GetWidget("CHECKBOX_UNITDEBUG").OnMouseDown = mi => 
 			{
-				Game.IssueOrder(new Order("DevUnitDebug", Game.world.LocalPlayer.PlayerActor));
+				world.IssueOrder(new Order("DevUnitDebug", world.LocalPlayer.PlayerActor));
 				return true;
 			};
 			
 			devmodeBG.GetWidget<CheckboxWidget>("CHECKBOX_PATHDEBUG").Checked = 
-				() => Game.world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug;
+				() => world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug;
 			devmodeBG.GetWidget("CHECKBOX_PATHDEBUG").OnMouseDown = mi => 
 			{
-				Game.IssueOrder(new Order("DevPathDebug", Game.world.LocalPlayer.PlayerActor));
+				world.IssueOrder(new Order("DevPathDebug", world.LocalPlayer.PlayerActor));
 				return true;
 			};
 			
 			devmodeBG.GetWidget<ButtonWidget>("GIVE_CASH").OnMouseUp = mi =>
 			{
-				Game.IssueOrder(new Order("DevGiveCash", Game.world.LocalPlayer.PlayerActor));
+				world.IssueOrder(new Order("DevGiveCash", world.LocalPlayer.PlayerActor));
 				return true;
 			};
 			
 			devmodeBG.GetWidget<CheckboxWidget>("INSTANT_BUILD").Checked =
-				() => Game.world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().FastBuild;
+				() => world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().FastBuild;
 			devmodeBG.GetWidget<CheckboxWidget>("INSTANT_BUILD").OnMouseDown = mi =>
 			{
-				Game.IssueOrder(new Order("DevFastBuild", Game.world.LocalPlayer.PlayerActor));
+				world.IssueOrder(new Order("DevFastBuild", world.LocalPlayer.PlayerActor));
 				return true;
 			};	
 
 			devmodeBG.GetWidget<CheckboxWidget>("INSTANT_CHARGE").Checked = 
-				() => Game.world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().FastCharge;
+				() => world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().FastCharge;
 			devmodeBG.GetWidget<CheckboxWidget>("INSTANT_CHARGE").OnMouseDown = mi =>
 			{
-				Game.IssueOrder(new Order("DevFastCharge", Game.world.LocalPlayer.PlayerActor));
+				world.IssueOrder(new Order("DevFastCharge", world.LocalPlayer.PlayerActor));
 				return true;
 			};
 			
 			devmodeBG.GetWidget<CheckboxWidget>("ENABLE_TECH").Checked = 
-				() => Game.world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().AllTech;
+				() => world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().AllTech;
 			devmodeBG.GetWidget<CheckboxWidget>("ENABLE_TECH").OnMouseDown = mi =>
 			{
-				Game.IssueOrder(new Order("DevEnableTech", Game.world.LocalPlayer.PlayerActor));
+				world.IssueOrder(new Order("DevEnableTech", world.LocalPlayer.PlayerActor));
 				return true;
 			};
 
 			devmodeBG.GetWidget<ButtonWidget>("GIVE_EXPLORATION").OnMouseUp = mi =>
 			{
-				Game.IssueOrder(new Order("DevGiveExploration", Game.world.LocalPlayer.PlayerActor));
+				world.IssueOrder(new Order("DevGiveExploration", world.LocalPlayer.PlayerActor));
 				return true;
 			};
 				
-			devModeButton.IsVisible = () => { return Game.LobbyInfo.GlobalSettings.AllowCheats; };
+			devModeButton.IsVisible = () => { return world.LobbyInfo.GlobalSettings.AllowCheats; };
 		}
 	}
 }

OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs

@@ -21,8 +21,11 @@ namespace OpenRA.Widgets.Delegates
 		static List<Widget> controls = new List<Widget>();
 
 		int validPlayers = 0;
-		public DiplomacyDelegate()
+		readonly World world;
+		[ObjectCreator.UseCtor]
+		public DiplomacyDelegate( [ObjectCreator.Param] World world )
 		{
+			this.world = world;
 			var root = Widget.RootWidget.GetWidget("INGAME_ROOT");
 			var diplomacyBG = root.GetWidget("DIPLOMACY_BG");
 			var diplomacy = root.GetWidget("INGAME_DIPLOMACY_BUTTON");
@@ -34,7 +37,7 @@ namespace OpenRA.Widgets.Delegates
 				return true;
 			};
 			
-			Game.AfterGameStart += () => validPlayers = Game.world.players.Values.Where(a => a != Game.world.LocalPlayer && !a.NonCombatant).Count();
+			Game.AfterGameStart += _ => validPlayers = world.players.Values.Where(a => a != world.LocalPlayer && !a.NonCombatant).Count();
 			diplomacy.IsVisible = () => (validPlayers > 0);
 		}
 
@@ -71,7 +74,7 @@ namespace OpenRA.Widgets.Delegates
 
 			y += 35;
 
-			foreach (var p in Game.world.players.Values.Where(a => a != Game.world.LocalPlayer && !a.NonCombatant))
+			foreach (var p in world.players.Values.Where(a => a != world.LocalPlayer && !a.NonCombatant))
 			{
 				var pp = p;
 				var label = new LabelWidget
@@ -94,7 +97,7 @@ namespace OpenRA.Widgets.Delegates
 					Align = LabelWidget.TextAlign.Left,
 					Bold = false,
 
-					GetText = () => pp.Stances[ Game.world.LocalPlayer ].ToString(),
+					GetText = () => pp.Stances[ world.LocalPlayer ].ToString(),
 				};
 
 				bg.AddChild(theirStance);
@@ -104,7 +107,7 @@ namespace OpenRA.Widgets.Delegates
 				{
 					Bounds = new Rectangle( margin + 2 * labelWidth + 20,  y, labelWidth, 25),
 					Id = "DIPLOMACY_PLAYER_LABEL_MY_{0}".F(p.Index),
-					Text = Game.world.LocalPlayer.Stances[ pp ].ToString(),
+					Text = world.LocalPlayer.Stances[ pp ].ToString(),
 				};
 
 				myStance.OnMouseUp = mi => { CycleStance(pp, myStance); return true; };
@@ -130,12 +133,12 @@ namespace OpenRA.Widgets.Delegates
 
 		void CycleStance(Player p, ButtonWidget bw)
 		{
-			if (Game.LobbyInfo.GlobalSettings.LockTeams)
+			if (p.World.LobbyInfo.GlobalSettings.LockTeams)
 				return;	// team changes are banned
 
 			var nextStance = GetNextStance((Stance)Enum.Parse(typeof(Stance), bw.Text));
 
-			Game.IssueOrder(new Order("SetStance", Game.world.LocalPlayer.PlayerActor,
+			world.IssueOrder(new Order("SetStance", world.LocalPlayer.PlayerActor,
 				new int2(p.Index, (int)nextStance)));
 
 			bw.Text = nextStance.ToString();

OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs

@@ -13,6 +13,7 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Network;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets.Delegates
 {
@@ -22,14 +23,16 @@ namespace OpenRA.Widgets.Delegates
 		
 		Dictionary<string, string> CountryNames;
 		string MapUid;
-		MapStub Map;
+		Map Map;
 		
 		public static Color CurrentColorPreview1;
 		public static Color CurrentColorPreview2;
-		
+
+		readonly OrderManager orderManager;
 		[ObjectCreator.UseCtor]
-		public LobbyDelegate( [ObjectCreator.Param( "widget" )] Widget lobby )
+		internal LobbyDelegate( [ObjectCreator.Param( "widget" )] Widget lobby, [ObjectCreator.Param] OrderManager orderManager )
 		{
+			this.orderManager = orderManager;
 			Game.LobbyInfoChanged += UpdateCurrentMap;
 			UpdateCurrentMap();
 			
@@ -46,10 +49,10 @@ namespace OpenRA.Widgets.Delegates
 			mapPreview.Map = () => Map;
 			mapPreview.OnSpawnClick = sp =>
 			{
-				if (Game.LocalClient.State == Session.ClientState.Ready) return;
-				var owned = Game.LobbyInfo.Clients.Any(c => c.SpawnPoint == sp);
+				if (orderManager.LocalClient.State == Session.ClientState.Ready) return;
+				var owned = orderManager.LobbyInfo.Clients.Any(c => c.SpawnPoint == sp);
 				if (sp == 0 || !owned)
-					Game.IssueOrder(Order.Command("spawn {0}".F(sp)));
+					orderManager.IssueOrder(Order.Command("spawn {0}".F(sp)));
 			};
 
 			mapPreview.SpawnColors = () =>
@@ -59,7 +62,7 @@ namespace OpenRA.Widgets.Delegates
 
 				for (int i = 1; i <= spawns.Count(); i++)
 				{
-					var client = Game.LobbyInfo.Clients.FirstOrDefault(c => c.SpawnPoint == i);
+					var client = orderManager.LobbyInfo.Clients.FirstOrDefault(c => c.SpawnPoint == i);
 					if (client == null)
 						continue;
 					sc.Add(spawns.ElementAt(i - 1), client.Color1);
@@ -73,7 +76,7 @@ namespace OpenRA.Widgets.Delegates
 			var mapButton = lobby.GetWidget("CHANGEMAP_BUTTON");
 			mapButton.OnMouseUp = mi =>
 			{
-				Widget.OpenWindow("MAP_CHOOSER").SpecialOneArg(MapUid); // WTF
+				Widget.OpenWindow( "MAP_CHOOSER", new Dictionary<string, object> { { "orderManager", orderManager }, { "mapName", MapUid } } );
 				return true;
 			};
 
@@ -88,12 +91,12 @@ namespace OpenRA.Widgets.Delegates
 
 			var lockTeamsCheckbox = lobby.GetWidget<CheckboxWidget>("LOCKTEAMS_CHECKBOX");
 			lockTeamsCheckbox.IsVisible = () => lockTeamsCheckbox.Visible && true;
-			lockTeamsCheckbox.Checked = () => Game.LobbyInfo.GlobalSettings.LockTeams;
+			lockTeamsCheckbox.Checked = () => orderManager.LobbyInfo.GlobalSettings.LockTeams;
 			lockTeamsCheckbox.OnMouseDown = mi =>
 			{
 				if (Game.IsHost)
-					Game.IssueOrder(Order.Command(
-						"lockteams {0}".F(!Game.LobbyInfo.GlobalSettings.LockTeams)));
+					orderManager.IssueOrder(Order.Command(
+						"lockteams {0}".F(!orderManager.LobbyInfo.GlobalSettings.LockTeams)));
 				return true;
 			};
 			
@@ -103,9 +106,11 @@ namespace OpenRA.Widgets.Delegates
 				mapButton.Visible = false;
 				disconnectButton.Visible = false;
 				lockTeamsCheckbox.Visible = false;
-				Game.IssueOrder(Order.Command("startgame"));
+				orderManager.IssueOrder(Order.Command("startgame"));
 				return true;
 			};
+			
+			// Todo: Only show if the map requirements are met for player slots
 			startGameButton.IsVisible = () => Game.IsHost;
 			
 			Game.LobbyInfoChanged += JoinedServer;
@@ -123,7 +128,7 @@ namespace OpenRA.Widgets.Delegates
 					return true;
 
 				var order = (teamChat) ? Order.TeamChat(chatTextField.Text) : Order.Chat(chatTextField.Text);
-				Game.IssueOrder(order);
+				orderManager.IssueOrder(order);
 				chatTextField.Text = "";
 				return true;
 			};
@@ -157,60 +162,31 @@ namespace OpenRA.Widgets.Delegates
 		
 		void UpdatePlayerColor(float hf, float sf, float lf, float r)
 		{
-			var c1 = ColorFromHSL(hf, sf, lf);
-			var c2 = ColorFromHSL(hf, sf, r*lf);
+			var c1 = PlayerColorRemap.ColorFromHSL(hf, sf, lf);
+			var c2 = PlayerColorRemap.ColorFromHSL(hf, sf, r * lf);
 			
 			Game.Settings.Player.Color1 = c1;
 			Game.Settings.Player.Color2 = c2;
 			Game.Settings.Save();
-			Game.IssueOrder(Order.Command("color {0},{1},{2},{3},{4},{5}".F(c1.R,c1.G,c1.B,c2.R,c2.G,c2.B)));
+			orderManager.IssueOrder(Order.Command("color {0},{1},{2},{3},{4},{5}".F(c1.R,c1.G,c1.B,c2.R,c2.G,c2.B)));
 		}
 		
 		void UpdateColorPreview(float hf, float sf, float lf, float r)
 		{
-			CurrentColorPreview1 = ColorFromHSL(hf, sf, lf);
-			CurrentColorPreview2 = ColorFromHSL(hf, sf, r*lf);
-			Game.viewport.RefreshPalette();
+			CurrentColorPreview1 = PlayerColorRemap.ColorFromHSL(hf, sf, lf);
+			CurrentColorPreview2 = PlayerColorRemap.ColorFromHSL(hf, sf, r * lf);
 		}
-		
-		// hk is hue in the range [0,1] instead of [0,360]
-		public static Color ColorFromHSL(float hk, float s, float l)
-		{		
-			// Convert from HSL to RGB
-			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
-			var p = 2 * l - q;
-			
-			float[] trgb = { hk + 1 / 3.0f,
-							  hk,
-							  hk - 1/3.0f };
-			float[] rgb = { 0, 0, 0 };
-			
-			for (int k = 0; k < 3; k++)
-			{
-				while (trgb[k] < 0) trgb[k] += 1.0f;
-				while (trgb[k] > 1) trgb[k] -= 1.0f;
-			}
-			
-			for (int k = 0; k < 3; k++)
-			{
-				if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
-				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
-				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
-				else { rgb[k] = p; }
-			}
-			
-			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
-		}
-
 
 		void UpdateCurrentMap()
 		{
-			if (MapUid == Game.LobbyInfo.GlobalSettings.Map) return;
-			MapUid = Game.LobbyInfo.GlobalSettings.Map;
-			Map = Game.modData.AvailableMaps[MapUid];
+			if (MapUid == orderManager.LobbyInfo.GlobalSettings.Map) return;
+			MapUid = orderManager.LobbyInfo.GlobalSettings.Map;
+			Map = new Map(Game.modData.AvailableMaps[MapUid].Package);
+
+			var title = Widget.RootWidget.GetWidget<LabelWidget>("LOBBY_TITLE");
+			title.Text = "OpenRA Multiplayer Lobby - " + orderManager.LobbyInfo.GlobalSettings.ServerName;
 		}
 
-		
 		bool hasJoined = false;
 		void JoinedServer()
 		{
@@ -218,25 +194,25 @@ namespace OpenRA.Widgets.Delegates
 				return;
 			hasJoined = true;
 			
-			if (Game.LocalClient.Name != Game.Settings.Player.Name)
-				Game.IssueOrder(Order.Command("name " + Game.Settings.Player.Name));
+			if (orderManager.LocalClient.Name != Game.Settings.Player.Name)
+				orderManager.IssueOrder(Order.Command("name " + Game.Settings.Player.Name));
 			
 			var c1 = Game.Settings.Player.Color1;
 			var c2 = Game.Settings.Player.Color2;
 			
-			if (Game.LocalClient.Color1 != c1 || Game.LocalClient.Color2 != c2)			
-				Game.IssueOrder(Order.Command("color {0},{1},{2},{3},{4},{5}".F(c1.R,c1.G,c1.B,c2.R,c2.G,c2.B)));
+			if (orderManager.LocalClient.Color1 != c1 || orderManager.LocalClient.Color2 != c2)			
+				orderManager.IssueOrder(Order.Command("color {0},{1},{2},{3},{4},{5}".F(c1.R,c1.G,c1.B,c2.R,c2.G,c2.B)));
 		}
-		
-		void ResetConnectionState()
+
+		void ResetConnectionState( OrderManager orderManager )
 		{
-			if (Game.orderManager.Connection.ConnectionState == ConnectionState.PreConnecting)
+			if( orderManager.Connection.ConnectionState == ConnectionState.PreConnecting )
 				hasJoined = false;
 		}
 
-		static Session.Client GetClientInSlot(Session.Slot slot)
+		Session.Client GetClientInSlot(Session.Slot slot)
 		{
-			return Game.LobbyInfo.Clients.FirstOrDefault(c => c.Slot == slot.Index);
+			return orderManager.LobbyInfo.ClientInSlot( slot );
 		}
 		
 		void UpdatePlayerList()
@@ -246,7 +222,7 @@ namespace OpenRA.Widgets.Delegates
 			Players.Children.Clear();
 
 			int offset = 0;
-			foreach (var slot in Game.LobbyInfo.Slots)
+			foreach (var slot in orderManager.LobbyInfo.Slots)
 			{
 				var s = slot;
 				var c = GetClientInSlot(s);
@@ -264,14 +240,14 @@ namespace OpenRA.Widgets.Delegates
 							if (s.Closed)
 							{
 								s.Bot = null;
-								Game.IssueOrder(Order.Command("slot_open " + s.Index));
+								orderManager.IssueOrder(Order.Command("slot_open " + s.Index));
 							}
 							else
 							{
-								if (s.Bot == null)
-									Game.IssueOrder(Order.Command("slot_bot {0} HackyAI".F(s.Index)));
+								if (s.Bot == null && Map.Players[s.MapPlayer].AllowBots)
+									orderManager.IssueOrder(Order.Command("slot_bot {0} HackyAI".F(s.Index)));
 								else
-									Game.IssueOrder(Order.Command("slot_close " + s.Index));
+									orderManager.IssueOrder(Order.Command("slot_close " + s.Index));
 							}
 							return true;
 						};
@@ -286,11 +262,11 @@ namespace OpenRA.Widgets.Delegates
 					var join = template.GetWidget<ButtonWidget>("JOIN");
 					if (join != null)
 					{
-						join.OnMouseUp = _ => { Game.IssueOrder(Order.Command("slot " + s.Index)); return true; };
+						join.OnMouseUp = _ => { orderManager.IssueOrder(Order.Command("slot " + s.Index)); return true; };
 						join.IsVisible = () => !s.Closed && s.Bot == null;
 					}
 				}
-				else if (c.Index == Game.LocalClient.Index && c.State != Session.ClientState.Ready)
+				else if (c.Index == orderManager.LocalClient.Index && c.State != Session.ClientState.Ready)
 				{
 					template = LocalPlayerTemplate.Clone();
 					var name = template.GetWidget<TextFieldWidget>("NAME");
@@ -305,7 +281,7 @@ namespace OpenRA.Widgets.Delegates
 						if (name.Text == c.Name)
 							return true;
 
-						Game.IssueOrder(Order.Command("name " + name.Text));
+						orderManager.IssueOrder(Order.Command("name " + name.Text));
 						Game.Settings.Player.Name = name.Text;
 						Game.Settings.Save();
 						return true;
@@ -315,18 +291,21 @@ namespace OpenRA.Widgets.Delegates
 					var color = template.GetWidget<ButtonWidget>("COLOR");
 					color.OnMouseUp = mi =>
 					{
+						if (Map.Players[s.MapPlayer].LockColor)
+							return false;
+						
 						var colorChooser = Widget.RootWidget.GetWidget("SERVER_LOBBY").GetWidget("COLOR_CHOOSER");
 						var hueSlider = colorChooser.GetWidget<SliderWidget>("HUE_SLIDER");
-						hueSlider.SetOffset(Game.LocalClient.Color1.GetHue()/360f);
+						hueSlider.SetOffset(orderManager.LocalClient.Color1.GetHue()/360f);
 						
 						var satSlider = colorChooser.GetWidget<SliderWidget>("SAT_SLIDER");
-						satSlider.SetOffset(Game.LocalClient.Color1.GetSaturation());
+						satSlider.SetOffset(orderManager.LocalClient.Color1.GetSaturation());
 
 						var lumSlider = colorChooser.GetWidget<SliderWidget>("LUM_SLIDER"); 
-						lumSlider.SetOffset(Game.LocalClient.Color1.GetBrightness());
+						lumSlider.SetOffset(orderManager.LocalClient.Color1.GetBrightness());
 						
 						var rangeSlider = colorChooser.GetWidget<SliderWidget>("RANGE_SLIDER");
-						rangeSlider.SetOffset(Game.LocalClient.Color1.GetBrightness() == 0 ? 0 : Game.LocalClient.Color2.GetBrightness()/Game.LocalClient.Color1.GetBrightness());
+						rangeSlider.SetOffset(orderManager.LocalClient.Color1.GetBrightness() == 0 ? 0 : orderManager.LocalClient.Color2.GetBrightness()/orderManager.LocalClient.Color1.GetBrightness());
 
 						UpdateColorPreview(hueSlider.GetOffset(), satSlider.GetOffset(), lumSlider.GetOffset(), rangeSlider.GetOffset());
 						colorChooser.IsVisible = () => true;
@@ -337,7 +316,7 @@ namespace OpenRA.Widgets.Delegates
 					colorBlock.GetColor = () => c.Color1;
 
 					var faction = template.GetWidget<ButtonWidget>("FACTION");
-					faction.OnMouseUp = CycleRace;
+					faction.OnMouseUp = mi => CycleRace(mi, s);
 					var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME");
 					factionname.GetText = () => CountryNames[c.Country];
 					var factionflag = faction.GetWidget<ImageWidget>("FACTIONFLAG");
@@ -371,7 +350,7 @@ namespace OpenRA.Widgets.Delegates
 
 					var status = template.GetWidget<CheckboxWidget>("STATUS");
 					status.Checked = () => c.State == Session.ClientState.Ready;
-					if (c.Index == Game.LocalClient.Index) status.OnMouseDown = CycleReady;
+					if (c.Index == orderManager.LocalClient.Index) status.OnMouseDown = CycleReady;
 				}
 
 				template.Id = "SLOT_{0}".F(s.Index);
@@ -385,39 +364,42 @@ namespace OpenRA.Widgets.Delegates
 			}
 		}
 
-		bool SpawnPointAvailable(int index) { return (index == 0) || Game.LobbyInfo.Clients.All(c => c.SpawnPoint != index); }
-		bool CycleRace(MouseInput mi)
+		bool SpawnPointAvailable(int index) { return (index == 0) || orderManager.LobbyInfo.Clients.All(c => c.SpawnPoint != index); }
+		bool CycleRace(MouseInput mi, Session.Slot s)
 		{
+			if (Map.Players[s.MapPlayer].LockColor)
+				return false;
+			
 			var countries = CountryNames.Select(a => a.Key);
 
 			if (mi.Button == MouseButton.Right)
 				countries = countries.Reverse();
 
 			var nextCountry = countries
-				.SkipWhile(c => c != Game.LocalClient.Country)
+				.SkipWhile(c => c != orderManager.LocalClient.Country)
 				.Skip(1)
 				.FirstOrDefault();
 
 			if (nextCountry == null)
 				nextCountry = countries.First();
 
-			Game.IssueOrder(Order.Command("race " + nextCountry));
+			orderManager.IssueOrder(Order.Command("race " + nextCountry));
 
 			return true;
 		}
 
 		bool CycleReady(MouseInput mi)
 		{
-			Game.IssueOrder(Order.Command("ready"));
+			orderManager.IssueOrder(Order.Command("ready"));
 			return true;
 		}
 
 		bool CycleTeam(MouseInput mi)
 		{
 			var d = (mi.Button == MouseButton.Left) ? +1 : Map.PlayerCount;
-			var newIndex = (Game.LocalClient.Team + d) % (Map.PlayerCount + 1);
+			var newIndex = (orderManager.LocalClient.Team + d) % (Map.PlayerCount + 1);
 			
-			Game.IssueOrder(
+			orderManager.IssueOrder(
 				Order.Command("team " + newIndex));
 			return true;
 		}

OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs

@@ -10,15 +10,13 @@
 
 using OpenRA.FileFormats;
 using OpenRA.Server;
-using System.Net;
-using System.IO;
 
 namespace OpenRA.Widgets.Delegates
 {
 	public class MainMenuButtonsDelegate : IWidgetDelegate
 	{
 		[ObjectCreator.UseCtor]
-		public MainMenuButtonsDelegate( [ObjectCreator.Param( "widget" )] Widget widget )
+		public MainMenuButtonsDelegate( [ObjectCreator.Param] Widget widget )
 		{
 			// Main menu is the default window
 			widget.GetWidget( "MAINMENU_BUTTON_JOIN" ).OnMouseUp = mi => { Widget.OpenWindow( "JOINSERVER_BG" ); return true; };
@@ -32,9 +30,15 @@ namespace OpenRA.Widgets.Delegates
 			if (FileSystem.Exists("VERSION"))
 			{
 				var s = FileSystem.Open("VERSION");
-				version.Text = s.ReadAllText();
+				var versionFileContent = s.ReadAllText();
+				version.Text = versionFileContent;
 				s.Close();
-				MasterServerQuery.OnVersion += v => { if (!string.IsNullOrEmpty(v)) version.Text += "\nLatest: " + v; };
+
+				MasterServerQuery.OnVersion += v =>
+				{
+					if (!string.IsNullOrEmpty(v))
+						version.Text = versionFileContent + "\nLatest: " + v;
+				};
 				MasterServerQuery.GetCurrentVersion(Game.Settings.Server.MasterServer);
 			}
 			else

OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs

@@ -11,6 +11,7 @@
 using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
+using OpenRA.Network;
 
 namespace OpenRA.Widgets.Delegates
 {
@@ -19,11 +20,17 @@ namespace OpenRA.Widgets.Delegates
 		MapStub Map = null;
 
 		[ObjectCreator.UseCtor]
-		public MapChooserDelegate( [ObjectCreator.Param( "widget" )] Widget bg )
+		internal MapChooserDelegate(
+			[ObjectCreator.Param( "widget" )] Widget bg,
+			[ObjectCreator.Param] OrderManager orderManager,
+			[ObjectCreator.Param] string mapName )
 		{
-			bg.SpecialOneArg = (map) => RefreshMapList(map);
-			var ml = bg.GetWidget<ListBoxWidget>("MAP_LIST");
+			if (mapName != null)
+				Map = Game.modData.AvailableMaps[mapName];
+			else
+				Map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value;
 
+			var ml = bg.GetWidget<ListBoxWidget>("MAP_LIST");
 			bg.GetWidget<MapPreviewWidget>("MAPCHOOSER_MAP_PREVIEW").Map = () => Map;
 			bg.GetWidget<LabelWidget>("CURMAP_TITLE").GetText = () => Map.Title;
 			bg.GetWidget<LabelWidget>("CURMAP_SIZE").GetText = () => "{0}x{1}".F(Map.Width, Map.Height);
@@ -32,7 +39,7 @@ namespace OpenRA.Widgets.Delegates
 
 			bg.GetWidget("BUTTON_OK").OnMouseUp = mi =>
 			{
-				Game.IssueOrder(Order.Command("map " + Map.Uid));
+				orderManager.IssueOrder(Order.Command("map " + Map.Uid));
 				Widget.CloseWindow();
 				return true;
 			};
@@ -66,15 +73,5 @@ namespace OpenRA.Widgets.Delegates
 				ml.ContentHeight += template.Bounds.Height;
 			}
 		}
-
-		public void RefreshMapList(object uidobj)
-		{
-			// Set the default selected map
-			var uid = uidobj as string;
-			if (uid != null)
-				Map = Game.modData.AvailableMaps[uid];
-			else
-				Map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value;
-		}
 	}
 }

OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs

@@ -24,7 +24,7 @@ namespace OpenRA.Widgets.Delegates
 			var perfText = perfRoot.GetWidget<LabelWidget>("TEXT");
 			perfText.GetText = () => "Render {0} ({5}={2:F1} ms)\nTick {4} ({3:F1} ms)".F(
 					Game.RenderFrame,
-					Game.orderManager.FrameNumber,
+					Game.orderManager.NetFrameNumber,
 					PerfHistory.items["render"].LastValue,
 					PerfHistory.items["tick_time"].LastValue,
 					Game.LocalTick,

OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs

@@ -24,7 +24,7 @@ namespace OpenRA.Widgets.Delegates
 		Widget ServerTemplate;
 
 		[ObjectCreator.UseCtor]
-		public ServerBrowserDelegate( [ObjectCreator.Param( "widget" )] Widget widget )
+		public ServerBrowserDelegate( [ObjectCreator.Param] Widget widget )
 		{
 			var bg = widget.GetWidget("JOINSERVER_BG");
 
@@ -95,7 +95,7 @@ namespace OpenRA.Widgets.Delegates
 				// Or even better, reject them server side and display the error in the connection failed dialog.
 
 				// Don't bother joining a server with different mods... its only going to crash
-				if (currentServer.Mods.SymmetricDifference(Game.LobbyInfo.GlobalSettings.Mods).Any())
+				if (currentServer.Mods.SymmetricDifference(Game.modData.Manifest.Mods).Any())
 				{
 					System.Console.WriteLine("Player has different mods to server; not connecting to avoid crash");
 					System.Console.WriteLine("FIX THIS BUG YOU NOOB!");
@@ -124,7 +124,7 @@ namespace OpenRA.Widgets.Delegates
 		string GenerateModsLabel()
 		{
 			return string.Join("\n", currentServer.Mods.Select(m => 
-			       ModData.AllMods.ContainsKey(m) ? string.Format("{0} ({1})", ModData.AllMods[m].Title, ModData.AllMods[m].Version)
+			       Mod.AllMods.ContainsKey(m) ? string.Format("{0} ({1})", Mod.AllMods[m].Title, Mod.AllMods[m].Version)
 			                                   : string.Format("Unknown Mod: {0}",m)).ToArray());
 		}
 
@@ -187,7 +187,7 @@ namespace OpenRA.Widgets.Delegates
 	public class DirectConnectDelegate : IWidgetDelegate
 	{
 		[ObjectCreator.UseCtor]
-		public DirectConnectDelegate( [ObjectCreator.Param( "widget" )] Widget widget )
+		public DirectConnectDelegate( [ObjectCreator.Param] Widget widget )
 		{
 			var dc = widget.GetWidget("DIRECTCONNECT_BG");
 

OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs

@@ -70,7 +70,15 @@ namespace OpenRA.Widgets.Delegates
                 Game.Settings.Game.InverseDragScroll ^= true;
                 return true;
             };
-						
+
+			var teamChatToggle = general.GetWidget<CheckboxWidget>("TEAMCHAT_TOGGLE");
+			teamChatToggle.Checked = () => Game.Settings.Game.TeamChatToggle;
+			teamChatToggle.OnMouseDown = mi =>
+			{
+				Game.Settings.Game.TeamChatToggle ^= true;
+				return true;
+			};
+			
 			// Audio
 			var audio = bg.GetWidget("AUDIO_PANE");
 			

OpenRA.Game/Widgets/ImageWidget.cs

@@ -6,12 +6,12 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
-using OpenRA.Graphics;
-
-namespace OpenRA.Widgets
+#endregion
+
+using System;
+using OpenRA.Graphics;
+
+namespace OpenRA.Widgets
 {
 	public class ImageWidget : Widget
 	{
@@ -38,7 +38,7 @@ namespace OpenRA.Widgets
 
 		public override Widget Clone() { return new ImageWidget(this); }
 
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			var name = GetImageName();
 			var collection = GetImageCollection();
@@ -46,5 +46,5 @@ namespace OpenRA.Widgets
 				ChromeProvider.GetImage(collection, name), 
 				RenderOrigin);
 		}
-	}
-}
+	}
+}

OpenRA.Game/Widgets/LabelWidget.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -43,7 +44,7 @@ namespace OpenRA.Widgets
 			GetBackground = other.GetBackground;
 		}
 
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{		
 			var bg = GetBackground();
 

OpenRA.Game/Widgets/ListBoxWidget.cs

@@ -1,14 +1,14 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
-
-using System.Drawing;
+
+using System.Drawing;
 using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
@@ -30,7 +30,7 @@ namespace OpenRA.Widgets
 		Rectangle backgroundRect;
 		Rectangle scrollbarRect;
 		
-		public ListBoxWidget() : base() {}
+		public ListBoxWidget() : base() {}
 		protected ListBoxWidget(ListBoxWidget other)
 			: base(other)
 		{
@@ -44,49 +44,49 @@ namespace OpenRA.Widgets
 			DownPressed = other.DownPressed;
 		}
 		
-		public override void DrawInner(World world) {}
-		public override void Draw(World world)
-		{
-			if (!IsVisible())
-				return;
-
-			backgroundRect = new Rectangle(RenderBounds.X, RenderBounds.Y, RenderBounds.Width - ScrollbarWidth, RenderBounds.Height);
-			upButtonRect = new Rectangle(RenderBounds.Right - ScrollbarWidth, RenderBounds.Y, ScrollbarWidth, ScrollbarWidth);
-			downButtonRect = new Rectangle(RenderBounds.Right - ScrollbarWidth, RenderBounds.Bottom - ScrollbarWidth, ScrollbarWidth, ScrollbarWidth);
-			scrollbarRect = new Rectangle(RenderBounds.Right - ScrollbarWidth, RenderBounds.Y + ScrollbarWidth, ScrollbarWidth, RenderBounds.Height - 2 * ScrollbarWidth);
-
-			string upButtonBg = (UpPressed) ? "dialog3" : "dialog2";
-			string downButtonBg = (DownPressed) ? "dialog3" : "dialog2";
-			string scrollbarBg = "dialog3";
-
-			WidgetUtils.DrawPanel(Background, backgroundRect);
-			WidgetUtils.DrawPanel(upButtonBg, upButtonRect);
-			WidgetUtils.DrawPanel(downButtonBg, downButtonRect);
-			WidgetUtils.DrawPanel(scrollbarBg, scrollbarRect);
-
-			var upOffset = UpPressed ? 4 : 3;
-			var downOffset = DownPressed ? 4 : 3;
-			WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "up_arrow"),
-				new float2(upButtonRect.Left + upOffset, upButtonRect.Top + upOffset));
-			WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "down_arrow"),
-				new float2(downButtonRect.Left + downOffset, downButtonRect.Top + downOffset));
-
-			Game.Renderer.EnableScissor(backgroundRect.X, backgroundRect.Y + HeaderHeight, backgroundRect.Width, backgroundRect.Height - HeaderHeight);
-
-			foreach (var child in Children)
-				child.Draw(world);
-
-			Game.Renderer.DisableScissor();
+		public override void DrawInner( WorldRenderer wr ) {}
+		public override void Draw( WorldRenderer wr )
+		{
+			if (!IsVisible())
+				return;
+
+			backgroundRect = new Rectangle(RenderBounds.X, RenderBounds.Y, RenderBounds.Width - ScrollbarWidth, RenderBounds.Height);
+			upButtonRect = new Rectangle(RenderBounds.Right - ScrollbarWidth, RenderBounds.Y, ScrollbarWidth, ScrollbarWidth);
+			downButtonRect = new Rectangle(RenderBounds.Right - ScrollbarWidth, RenderBounds.Bottom - ScrollbarWidth, ScrollbarWidth, ScrollbarWidth);
+			scrollbarRect = new Rectangle(RenderBounds.Right - ScrollbarWidth, RenderBounds.Y + ScrollbarWidth, ScrollbarWidth, RenderBounds.Height - 2 * ScrollbarWidth);
+
+			string upButtonBg = (UpPressed) ? "dialog3" : "dialog2";
+			string downButtonBg = (DownPressed) ? "dialog3" : "dialog2";
+			string scrollbarBg = "dialog3";
+
+			WidgetUtils.DrawPanel(Background, backgroundRect);
+			WidgetUtils.DrawPanel(upButtonBg, upButtonRect);
+			WidgetUtils.DrawPanel(downButtonBg, downButtonRect);
+			WidgetUtils.DrawPanel(scrollbarBg, scrollbarRect);
+
+			var upOffset = UpPressed ? 4 : 3;
+			var downOffset = DownPressed ? 4 : 3;
+			WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "up_arrow"),
+				new float2(upButtonRect.Left + upOffset, upButtonRect.Top + upOffset));
+			WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "down_arrow"),
+				new float2(downButtonRect.Left + downOffset, downButtonRect.Top + downOffset));
+
+			Game.Renderer.EnableScissor(backgroundRect.X, backgroundRect.Y + HeaderHeight, backgroundRect.Width, backgroundRect.Height - HeaderHeight);
+
+			foreach (var child in Children)
+				child.Draw( wr );
+
+			Game.Renderer.DisableScissor();
 		}
 
 		public override int2 ChildOrigin { get { return RenderOrigin + new int2(0, (int)ListOffset); } }
-
-		public override Rectangle GetEventBounds()
-		{
-			return EventBounds;
-		}
+
+		public override Rectangle GetEventBounds()
+		{
+			return EventBounds;
+		}
 		
-		public override void Tick (World world)
+		public override void Tick ()
 		{
 			if (UpPressed && ListOffset <= 0) ListOffset += ScrollVelocity;
 			if (DownPressed) ListOffset -= ScrollVelocity;

OpenRA.Game/Widgets/MapPreviewWidget.cs

@@ -71,7 +71,7 @@ namespace OpenRA.Widgets
 		static Sprite UnownedSpawn = null;
 		static Sprite OwnedSpawn = null;
 
-		public override void DrawInner( World world )
+		public override void DrawInner( WorldRenderer wr )
 		{
 			if (UnownedSpawn == null)
 				UnownedSpawn = ChromeProvider.GetImage("spawnpoints", "unowned");

OpenRA.Game/Widgets/PerfGraphWidget.cs

@@ -6,19 +6,20 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
+#endregion
 
 using System.Drawing;
-using System.Linq;
-using OpenRA.Support;
-
-namespace OpenRA.Widgets
-{
-	class PerfGraphWidget : Widget
-	{
+using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Support;
+
+namespace OpenRA.Widgets
+{
+	class PerfGraphWidget : Widget
+	{
 		public PerfGraphWidget() : base() { }
 
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			var rect = RenderBounds;
 			float2 origin = Game.viewport.Location + new float2(rect.Right, rect.Bottom);
@@ -40,6 +41,6 @@ namespace OpenRA.Widgets
 					return b;
 				});
 			}
-		}
-	}
+		}
+	}
 }

OpenRA.Game/Widgets/ScrollingTextWidget.cs

@@ -1,8 +1,19 @@
-using System;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -44,7 +55,7 @@ namespace OpenRA.Widgets
 			GetBackground = other.GetBackground;
 		}
 
-		public override void Tick(World world)
+		public override void Tick()
 		{
 			if (Text != "")
 			{
@@ -93,7 +104,7 @@ namespace OpenRA.Widgets
 			Text = Text.Replace("\r", "");
 		}
 
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			var bg = GetBackground();
 

OpenRA.Game/Widgets/ShpImageWidget.cs

@@ -48,7 +48,7 @@ namespace OpenRA.Widgets
 		Sprite sprite = null;
 		string cachedImage = null;
 		int cachedFrame= -1;
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			var image = GetImage();
 			var frame = GetFrame();
@@ -61,7 +61,7 @@ namespace OpenRA.Widgets
 				cachedFrame = frame;
 			}
 			
-			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite,RenderOrigin, palette);
+			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite,RenderOrigin, wr, palette);
 		}
 	}
 }

OpenRA.Game/Widgets/SliderWidget.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -165,7 +166,7 @@ namespace OpenRA.Widgets
 			}
 		}
 
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			if (!IsVisible())
 				return;

OpenRA.Game/Widgets/TextFieldWidget.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -97,17 +98,17 @@ namespace OpenRA.Widgets
 
 		int blinkCycle = 10;
 		bool showCursor = true;
-		public override void Tick(World world)
+		public override void Tick()
 		{
 			if (--blinkCycle <= 0)
 			{
 				blinkCycle = 20;
 				showCursor ^= true;
 			}
-			base.Tick(world);
+			base.Tick();
 		}
 
-		public override void DrawInner(World world)
+		public override void DrawInner( WorldRenderer wr )
 		{
 			int margin = 5;
 			var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;

OpenRA.Game/Widgets/TimerWidget.cs

@@ -1,14 +1,15 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using System.Drawing;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using OpenRA.Graphics;
 using OpenRA.Support;
 
 namespace OpenRA.Widgets
@@ -20,13 +21,13 @@ namespace OpenRA.Widgets
 		public TimerWidget ()
 		{
 			IsVisible = () => Game.Settings.Game.MatchTimer;
-		}
-
-		public override void DrawInner(World world)
-		{
-			var s = WorldUtils.FormatTime(Game.LocalTick);
-			var size = Game.Renderer.TitleFont.Measure(s);
-			Game.Renderer.TitleFont.DrawText(s, new float2(RenderBounds.Left - size.X / 2, RenderBounds.Top - 20), Color.White);
+		}
+
+		public override void DrawInner( WorldRenderer wr )
+		{
+			var s = WorldUtils.FormatTime(Game.LocalTick);
+			var size = Game.Renderer.TitleFont.Measure(s);
+			Game.Renderer.TitleFont.DrawText(s, new float2(RenderBounds.Left - size.X / 2, RenderBounds.Top - 20), Color.White);
 		}
 	}
 }

OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs

@@ -32,7 +32,7 @@ namespace OpenRA.Widgets
 
 		public ViewportScrollControllerWidget() : base() { }
 		protected ViewportScrollControllerWidget(ViewportScrollControllerWidget widget) : base(widget) {}
-		public override void DrawInner( World world ) {}
+		public override void DrawInner( WorldRenderer wr ) {}
 		
 		public override bool HandleInputInner(MouseInput mi)
 		{									
@@ -122,7 +122,7 @@ namespace OpenRA.Widgets
 			return false;
 		}
 		
-		public override void Tick(World world)
+		public override void Tick()
 		{
 			Edge = ScrollDirection.None;
 			if (Game.Settings.Game.ViewportEdgeScroll && Game.HasInputFocus)
@@ -152,7 +152,7 @@ namespace OpenRA.Widgets
                 if (Keyboard.Includes(ScrollDirection.Left) || Edge.Includes(ScrollDirection.Left))
                     scroll += new float2(-1, 0);
 
-				float length = scroll.Length;
+				float length = Math.Max(1, scroll.Length);
 				scroll.X = (scroll.X / length) * Game.Settings.Game.ViewportEdgeScrollStep;
 				scroll.Y = (scroll.Y / length) * Game.Settings.Game.ViewportEdgeScrollStep;
 

OpenRA.Game/Widgets/VqaPlayerWidget.cs

@@ -6,11 +6,11 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
-using System.Drawing;
-using OpenRA.FileFormats;
+#endregion
+
+using System;
+using System.Drawing;
+using OpenRA.FileFormats;
 using OpenRA.Graphics;
 using OpenRA.Support;
 
@@ -31,6 +31,14 @@ namespace OpenRA.Widgets
 		
 		public bool Paused { get { return paused; } }
 		
+		
+		readonly World world;
+		[ObjectCreator.UseCtor]
+		public VqaPlayerWidget( [ObjectCreator.Param] World world )
+		{
+			this.world = world;
+		}
+		
 		public bool DrawOverlay = true;
 		public void Load(string filename)
 		{
@@ -69,8 +77,8 @@ namespace OpenRA.Widgets
 			overlaySprite.sheet.Texture.SetData(overlay);
 		}
 		
-		public override void DrawInner(World world)
-		{
+		public override void DrawInner( WorldRenderer wr )
+		{
 			if (video == null)
 				return;
 			
@@ -148,7 +156,7 @@ namespace OpenRA.Widgets
 			Sound.StopVideo();
 			video.Reset();
 			videoSprite.sheet.Texture.SetData(video.FrameData);
-			OnComplete();
+			world.AddFrameEndTask(_ => OnComplete());
 		}
 	}
 }

OpenRA.Game/Widgets/Widget.cs

@@ -39,7 +39,6 @@ namespace OpenRA.Widgets
 		public static Stack<Widget> WindowList = new Stack<Widget>();
 		
 		// Common Funcs that most widgets will want
-		public Action<object> SpecialOneArg = (arg) => {};
 		public Func<MouseInput, bool> OnMouseDown = mi => false;
 		public Func<MouseInput, bool> OnMouseUp = mi => false;
 		public Func<MouseInput, bool> OnMouseMove = mi => false;
@@ -124,12 +123,13 @@ namespace OpenRA.Widgets
 								   height);
 		}
 
-		public void PostInit()
+		public void PostInit( Dictionary<string, object> args )
 		{
 			if( Delegate != null )
 			{
-				var createDict = new Dictionary<string, object> { { "widget", this } };
-				Game.modData.ObjectCreator.CreateObject<IWidgetDelegate>( Delegate, createDict );
+				args[ "widget" ] = this;
+				Game.modData.ObjectCreator.CreateObject<IWidgetDelegate>( Delegate, args );
+				args.Remove( "widget" );
 			}
 		}
 		
@@ -196,7 +196,7 @@ namespace OpenRA.Widgets
 		
 		public virtual bool HandleInputInner(MouseInput mi) { return !ClickThrough; }
 		
-		public static bool HandleInput(World world, MouseInput mi)
+		public static bool HandleInput(MouseInput mi)
 		{
 			bool handled = false;
 			if (SelectedWidget != null && SelectedWidget.HandleMouseInputOuter(mi))
@@ -268,23 +268,23 @@ namespace OpenRA.Widgets
 			return false;
 		}
 		
-		public abstract void DrawInner( World world );
+		public abstract void DrawInner( WorldRenderer wr );
 		
-		public virtual void Draw(World world)
+		public virtual void Draw( WorldRenderer wr )
 		{
 			if (IsVisible())
 			{
-				DrawInner( world );
+				DrawInner( wr );
 				foreach (var child in Children)
-					child.Draw(world);
+					child.Draw( wr );
 			}
 		}
 		
-		public virtual void Tick(World world)
+		public virtual void Tick()
 		{
 			if (IsVisible())
 				foreach (var child in Children)
-					child.Tick(world);
+					child.Tick();
 		}
 		
 		public void AddChild(Widget child)
@@ -320,27 +320,28 @@ namespace OpenRA.Widgets
 				rootWidget.Children.Add( WindowList.Peek() );
 		}
 
-		public static Widget OpenWindow(string id)
+		public static Widget OpenWindow( string id )
 		{
-			var window = Game.modData.WidgetLoader.LoadWidget( rootWidget, id );
+			return OpenWindow( id, new Dictionary<string, object>() );
+		}
+
+		public static Widget OpenWindow(string id, Dictionary<string, object> args )
+		{
+			var window = Game.modData.WidgetLoader.LoadWidget( args, rootWidget, id );
 			if( WindowList.Count > 0 )
 				rootWidget.Children.Remove( WindowList.Peek() );
 			WindowList.Push( window );
 			return window;
 		}
 		
-		public static void DoTick(World world)
+		public static void DoTick()
 		{
-			RootWidget.Tick(world);
-			
-			if (!world.GameHasStarted) return;
-			if (world.LocalPlayer == null) return;
-			++Viewport.TicksSinceLastMove;
+			RootWidget.Tick();
 		}
 		
-		public static void DoDraw(World world)
+		public static void DoDraw( WorldRenderer wr )
 		{
-			RootWidget.Draw(world);
+			RootWidget.Draw( wr );
 		}
 	}
 
@@ -349,7 +350,7 @@ namespace OpenRA.Widgets
 
 		public ContainerWidget(Widget other) : base(other) { }
 
-		public override void DrawInner( World world ) { }
+		public override void DrawInner( WorldRenderer wr ) { }
 		
 		public override string GetCursor(int2 pos) { return null; }
 		public override Widget Clone() { return new ContainerWidget(this); }

OpenRA.Game/Widgets/WidgetLoader.cs

@@ -33,14 +33,14 @@ namespace OpenRA
 					widgets.Add( w.Key.Substring( w.Key.IndexOf( '@' ) + 1 ), w );
 		}
 
-		public Widget LoadWidget( Widget parent, string w )
+		public Widget LoadWidget( Dictionary<string, object> args, Widget parent, string w )
 		{
-			return LoadWidget( parent, widgets[ w ] );
+			return LoadWidget( args, parent, widgets[ w ] );
 		}
 
-		public Widget LoadWidget( Widget parent, MiniYamlNode node)
+		public Widget LoadWidget( Dictionary<string, object> args, Widget parent, MiniYamlNode node)
 		{
-			var widget = NewWidget(node.Key);
+			var widget = NewWidget(node.Key, args);
 			parent.AddChild( widget );
 
 			foreach (var child in node.Value.Nodes)
@@ -52,16 +52,16 @@ namespace OpenRA
 			foreach (var child in node.Value.Nodes)
 				if (child.Key == "Children")
 					foreach (var c in child.Value.Nodes)
-						LoadWidget( widget, c);
+						LoadWidget( args, widget, c);
 
-			widget.PostInit();
+			widget.PostInit( args );
 			return widget;
 		}
 
-		Widget NewWidget(string widgetType)
+		Widget NewWidget(string widgetType, Dictionary<string, object> args)
 		{
 			widgetType = widgetType.Split('@')[0];
-			return Game.CreateObject<Widget>(widgetType + "Widget");
+			return Game.modData.ObjectCreator.CreateObject<Widget>(widgetType + "Widget", args);
 		}
 	}
 }

OpenRA.Game/Widgets/WidgetUtils.cs

@@ -27,9 +27,9 @@ namespace OpenRA.Widgets
 			Game.Renderer.RgbaSpriteRenderer.DrawSprite(s,pos);
 		}
 		
-		public static void DrawSHP(Sprite s, float2 pos)
+		public static void DrawSHP(Sprite s, float2 pos, WorldRenderer wr)
 		{
-			Game.Renderer.WorldSpriteRenderer.DrawSprite(s,pos, "chrome");
+			Game.Renderer.WorldSpriteRenderer.DrawSprite(s,pos, wr, "chrome");
 		}
 
 		public static void DrawPanel(string collection, Rectangle Bounds)

OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs

@@ -6,24 +6,28 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
+#endregion
+
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Orders;
-using OpenRA.Traits;
+using OpenRA.Traits;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
 	class WorldInteractionControllerWidget : Widget
 	{
-		public WorldInteractionControllerWidget() : base()	{}
-		protected WorldInteractionControllerWidget(WorldInteractionControllerWidget widget) : base(widget) {}
+		readonly World world;
+		[ObjectCreator.UseCtor]
+		public WorldInteractionControllerWidget( [ObjectCreator.Param] World world )
+		{
+			this.world = world;
+		}
 		
-		public override void DrawInner( World world )
+		public override void DrawInner( WorldRenderer wr )
 		{
 			var selbox = SelectionBox;
 			if (selbox == null) return;
@@ -38,14 +42,14 @@ namespace OpenRA.Widgets
 			Game.Renderer.LineRenderer.DrawLine(a, a + c, Color.White, Color.White);
 
 			foreach (var u in SelectActorsInBox(world, selbox.Value.First, selbox.Value.Second))
-				world.WorldRenderer.DrawSelectionBox(u, Color.Yellow);
+				wr.DrawSelectionBox(u, Color.Yellow);
 		}
 		
 		float2 dragStart, dragEnd;
+
 		public override bool HandleInputInner(MouseInput mi)
 		{			
 			var xy = Game.viewport.ViewToWorld(mi);
-			var world = Game.world;
 			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down)
 			{
 				dragStart = dragEnd = xy;
@@ -87,8 +91,8 @@ namespace OpenRA.Widgets
 		{
 			if (world.OrderGenerator == null) return;
 
-			var orders = world.OrderGenerator.Order(world, xy.ToInt2(), mi).ToArray();
-			Game.orderManager.IssueOrders( orders );
+			var orders = world.OrderGenerator.Order(world, xy.ToInt2(), mi).ToArray();
+			orders.Do( o => world.IssueOrder( o ) );
 			
 			// Find an actor with a phrase to say
 			var done = false;
@@ -108,12 +112,8 @@ namespace OpenRA.Widgets
 		
 		public override string GetCursor(int2 pos)
 		{
-			var world = Game.world;
 			return Sync.CheckSyncUnchanged( world, () =>
 			{
-				if (!world.GameHasStarted)
-					return "default";
-
 				var mi = new MouseInput
 				{
 					Location = pos,
@@ -131,28 +131,39 @@ namespace OpenRA.Widgets
 			{
 				if (e.KeyName.Length == 1 && char.IsDigit(e.KeyName[0]))
 				{
-					Game.world.Selection.DoControlGroup(Game.world, e.KeyName[0] - '0', e.Modifiers);
+					world.Selection.DoControlGroup(world, e.KeyName[0] - '0', e.Modifiers);
 					return true;
 				}
 
-				if (e.KeyChar == '\b')
+				if (e.KeyChar == '\b' || e.KeyChar == (char)127)
 				{
 					GotoNextBase();
 					return true;
 				}
+
+				if (e.KeyChar == 'a')
+				{
+					StartAttackMoveOrder();
+					return true;
+				}
 			}
 			return false;
+		}
+
+		public void StartAttackMoveOrder()
+		{
+			if (world.Selection.Actors.Count() > 0)
+				world.OrderGenerator = new GenericSelectTarget(world.Selection.Actors, "AttackMove", "attackmove");
 		}
 		
 		public void GotoNextBase()
 		{
-			var world = Game.world;
 			var bases = world.Queries.OwnedBy[world.LocalPlayer].WithTrait<BaseBuilding>().ToArray();
 			if (!bases.Any()) return;
 
 			var next = bases
 				.Select( b => b.Actor )
-				.SkipWhile(b => world.Selection.Actors.Contains(b))
+				.SkipWhile(b => !world.Selection.Actors.Contains(b))
 				.Skip(1)
 				.FirstOrDefault();
 
@@ -173,7 +184,5 @@ namespace OpenRA.Widgets
 				.DefaultIfEmpty( new Actor[] {} )
 				.FirstOrDefault();
 		}
-		
-		public override Widget Clone() { return new WorldInteractionControllerWidget(this); }
 	}
 }

OpenRA.Game/Widgets/WorldTooltipWidget.cs

@@ -19,8 +19,14 @@ namespace OpenRA.Widgets
 	public class WorldTooltipWidget : Widget
 	{
 		public int TooltipDelay = 10;
-		public WorldTooltipWidget() : base() { }
-		public override void DrawInner(World world)
+		readonly World world;
+		[ObjectCreator.UseCtor]
+		public WorldTooltipWidget( [ObjectCreator.Param] World world )
+		{
+			this.world = world;
+		}
+
+		public override void DrawInner( WorldRenderer wr )
 		{
 			if (Viewport.TicksSinceLastMove < TooltipDelay || world == null || world.LocalPlayer == null)
 				return;

OpenRA.Game/World.cs

@@ -13,10 +13,10 @@ using System.Collections.Generic;
 using OpenRA.Collections;
 using OpenRA.Effects;
 using OpenRA.FileFormats;
-using OpenRA.Graphics;
+using OpenRA.Network;
 using OpenRA.Orders;
 using OpenRA.Traits;
-
+using OpenRA.Widgets;
 using XRandom = OpenRA.Thirdparty.Random;
 
 namespace OpenRA
@@ -28,14 +28,17 @@ namespace OpenRA
 		List<IEffect> effects = new List<IEffect>();
 		Queue<Action<World>> frameEndActions = new Queue<Action<World>>();
 
-		public XRandom SharedRandom = new XRandom(0);
+		public int FrameNumber { get { return orderManager.LocalFrameNumber; } }
+
+		internal readonly OrderManager orderManager;
+		public Session LobbyInfo { get { return orderManager.LobbyInfo; } }
+
+		public XRandom SharedRandom;
 
 		public readonly Dictionary<int, Player> players = new Dictionary<int, Player>();
 
 		public void AddPlayer(Player p) { players[p.Index] = p; }
 
-		public bool GameHasStarted { get { return Game.orderManager.GameStarted; } }
-
 		int localPlayerIndex;
 		public Player LocalPlayer
 		{
@@ -48,12 +51,11 @@ namespace OpenRA
 		}
 
 		public readonly Actor WorldActor;		
-		public readonly PathFinder PathFinder;
 
 		public readonly Map Map;
 		public readonly TileSet TileSet;
 
-		public readonly WorldRenderer WorldRenderer;
+		public void IssueOrder( Order o ) { orderManager.IssueOrder( o ); }	/* avoid exposing the OM to mod code */
 
 		IOrderGenerator orderGenerator_;
 		public IOrderGenerator OrderGenerator
@@ -84,15 +86,16 @@ namespace OpenRA
 			}
 		}
 		
-		public World(Manifest manifest, Map map)
+		internal World(Manifest manifest, Map map, OrderManager orderManager)
 		{
+			this.orderManager = orderManager;
 			orderGenerator_ = new UnitOrderGenerator();
 			Map = map;
 			
 			TileSet = Rules.TileSets[Map.Tileset];
 			TileSet.LoadTiles();
 
-			WorldRenderer = new WorldRenderer(this);
+			SharedRandom = new XRandom(orderManager.LobbyInfo.GlobalSettings.RandomSeed);
 
 			WorldActor = CreateActor( "World", new TypeDictionary() );
 			Queries = new AllQueries(this);
@@ -107,12 +110,17 @@ namespace OpenRA
 					if (!p.Stances.ContainsKey(q))
 						p.Stances[q] = Stance.Neutral;		
 			
-			PathFinder = new PathFinder(this);
-
+			Sound.SoundVolumeModifier = 1.0f;
 			foreach (var wlh in WorldActor.TraitsImplementing<IWorldLoaded>())
 				wlh.WorldLoaded(this);
 		}
 
+		// Hacky workaround for orderManager visibility
+		public Widget OpenWindow(string widget)
+		{
+			return Widget.OpenWindow(widget, new Dictionary<string,object>{{"world", this}, { "orderManager", orderManager }});
+		}
+		
 		public Actor CreateActor( string name, TypeDictionary initDict )
 		{
 			return CreateActor( true, name, initDict );
@@ -152,21 +160,21 @@ namespace OpenRA
 		public bool DisableTick = false;
 		public void Tick()
 		{
-			if (DisableTick)
-				return;
-			
-			actors.Do( x => x.Tick() );
-			Queries.WithTraitMultiple<ITick>().DoTimed( x =>
+			// Todo: Expose this as an order so it can be synced
+			if (!DisableTick)
 			{
-				x.Trait.Tick( x.Actor );
-			}, "[{2}] Trait: {0} ({1:0.000} ms)", Game.Settings.Debug.LongTickThreshold );
-
-			effects.DoTimed( e => e.Tick( this ), "[{2}] Effect: {0} ({1:0.000} ms)", Game.Settings.Debug.LongTickThreshold );
-			Game.viewport.Tick();
+				actors.Do( x => x.Tick() );
+				Queries.WithTraitMultiple<ITick>().DoTimed( x =>
+				{
+					x.Trait.Tick( x.Actor );
+				}, "[{2}] Trait: {0} ({1:0.000} ms)", Game.Settings.Debug.LongTickThreshold );
+	
+				effects.DoTimed( e => e.Tick( this ), "[{2}] Effect: {0} ({1:0.000} ms)", Game.Settings.Debug.LongTickThreshold );
+			}
+			
 			while (frameEndActions.Count != 0)
 				frameEndActions.Dequeue()(this);
-
-			WorldRenderer.Tick();
+			Game.viewport.Tick();
 		}
 
 		public IEnumerable<Actor> Actors { get { return actors; } }

OpenRA.Mods.Cnc/Missions/Gdi01Script.cs

@@ -14,12 +14,15 @@ using OpenRA.Traits;
 using OpenRA.Widgets;
 using OpenRA.Traits.Activities;
 using OpenRA.FileFormats;
+using OpenRA;
 using OpenRA.Mods.RA.Activities;
 using System;
+using OpenRA.Mods.RA;
+using OpenRA.Mods.RA.Move;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Cnc
 {
-	class Gdi01ScriptInfo : TraitInfo<Gdi01Script> { }
+	class Gdi01ScriptInfo : TraitInfo<Gdi01Script>, ITraitPrerequisite<OpenWidgetAtGameStartInfo> { }
 
 	class Gdi01Script: IWorldLoaded, ITick
 	{		
@@ -27,29 +30,6 @@ namespace OpenRA.Mods.RA
 		Dictionary<string, Player> Players;
 		Map Map;
 				
-		public static void PlayFullscreenFMVThen(World w, string movie, Action then)
-		{
-			var playerRoot = Widget.OpenWindow("FMVPLAYER");
-			var player = playerRoot.GetWidget<VqaPlayerWidget>("PLAYER");
-			w.DisableTick = true;
-			player.Load(movie);	
-			
-			// Stop music while fmv plays
-			var music = Sound.MusicPlaying;
-			if (music)
-				Sound.PauseMusic();
-			
-			player.PlayThen(() =>
-			{
-				if (music)
-					Sound.PlayMusic();
-				
-				Widget.CloseWindow();
-				w.DisableTick = false;
-				then();
-			});
-		}
-		
 		public void WorldLoaded(World w)
 		{
 			Map = w.Map;
@@ -57,11 +37,12 @@ namespace OpenRA.Mods.RA
 			Actors = w.WorldActor.Trait<SpawnMapActors>().Actors;		
 			Game.MoveViewport((.5f * (w.Map.TopLeft + w.Map.BottomRight).ToFloat2()).ToInt2());
 			
-			PlayFullscreenFMVThen(w, "gdi1.vqa", () => PlayFullscreenFMVThen(w, "landing.vqa", () =>
-			{
-				Sound.PlayMusic(Rules.Music["aoi"].Filename);
-				started = true;
-			}));
+			Scripting.Media.PlayFMVFullscreen(w, "gdi1.vqa", 
+			    () => Scripting.Media.PlayFMVFullscreen(w, "landing.vqa", () =>
+				{
+					Sound.PlayMusic(Rules.Music["aoi"].Filename);
+					started = true;
+				}));
 		}
 		
 		public void OnVictory(World w)
@@ -72,7 +53,7 @@ namespace OpenRA.Mods.RA
 			
 			w.WorldActor.CancelActivity();
 			w.WorldActor.QueueActivity(new Wait(125));
-			w.WorldActor.QueueActivity(new CallFunc(() => PlayFullscreenFMVThen(w, "consyard.vqa", () =>
+			w.WorldActor.QueueActivity(new CallFunc(() => Scripting.Media.PlayFMVFullscreen(w, "consyard.vqa", () =>
 			{
 				Sound.StopMusic();
 				Game.Disconnect();
@@ -87,7 +68,7 @@ namespace OpenRA.Mods.RA
 			
 			w.WorldActor.CancelActivity();
 			w.WorldActor.QueueActivity(new Wait(125));
-			w.WorldActor.QueueActivity(new CallFunc(() => PlayFullscreenFMVThen(w, "gameover.vqa", () =>
+			w.WorldActor.QueueActivity(new CallFunc(() => Scripting.Media.PlayFMVFullscreen(w, "gameover.vqa", () =>
 			{
 				Sound.StopMusic();
 				Game.Disconnect();
@@ -116,10 +97,11 @@ namespace OpenRA.Mods.RA
 							new OwnerInit( Players["BadGuy"] ),
 							new FacingInit( 0 ),
 							new LocationInit ( Map.Waypoints["nod0"] ),
-						});
-						a.QueueActivity( new Move( Map.Waypoints["nod1"], 2 ) );
-						a.QueueActivity( new Move( Map.Waypoints["nod2"], 2 ) );
-						a.QueueActivity( new Move( Map.Waypoints["nod3"], 2 ) );
+						});
+						var mobile = a.Trait<Mobile>();
+						a.QueueActivity( mobile.MoveTo( Map.Waypoints["nod1"], 2 ) );
+						a.QueueActivity( mobile.MoveTo( Map.Waypoints["nod2"], 2 ) );
+						a.QueueActivity( mobile.MoveTo( Map.Waypoints["nod3"], 2 ) );
 						// Todo: Queue hunt order
 					}
 				});
@@ -181,10 +163,12 @@ namespace OpenRA.Mods.RA
 		}
 		
 		void SetGunboatPath()
-		{
-			Actors["Gunboat"].QueueActivity(new Move( Map.Waypoints["gunboatLeft"] ));
-			Actors["Gunboat"].QueueActivity(new Move( Map.Waypoints["gunboatRight"] ));
-			Actors["Gunboat"].QueueActivity(new CallFunc(() => SetGunboatPath()));
+		{
+			var self = Actors[ "Gunboat" ];
+			var mobile = self.Trait<Mobile>();
+			self.QueueActivity(mobile.MoveTo( Map.Waypoints["gunboatLeft"] ));
+			self.QueueActivity(mobile.MoveTo( Map.Waypoints["gunboatRight"] ));
+			self.QueueActivity(new CallFunc(() => SetGunboatPath()));
 		}
 		
 		void ReinforceFromSea(World world, int2 startPos, int2 endPos, int2 unload, string[] items)
@@ -198,8 +182,9 @@ namespace OpenRA.Mods.RA
 					new LocationInit( startPos ),
 					new OwnerInit( Players["GoodGuy"] ),
 					new FacingInit( 0 ),
-				});
-				
+				});
+
+				var mobile = a.Trait<Mobile>();
 				var cargo = a.Trait<Cargo>();
 				foreach (var i in items)
 					cargo.Load(a, world.CreateActor(false, i.ToLowerInvariant(), new TypeDictionary
@@ -209,22 +194,23 @@ namespace OpenRA.Mods.RA
 					}));
 				
 				a.CancelActivity();
-				a.QueueActivity(new Move(endPos));
+				a.QueueActivity(mobile.MoveTo(endPos));
 				a.QueueActivity(new CallFunc(() =>
 				{
 					while (!cargo.IsEmpty(a))
 					{
 						var b = cargo.Unload(a);
 						world.AddFrameEndTask(w2 =>
-						{
+						{
+							if (b.Destroyed) return;
 							w2.Add(b);
 							b.TraitsImplementing<IMove>().FirstOrDefault().SetPosition(b, a.Location);
-							b.QueueActivity(new Move(unload, 2));
+							b.QueueActivity(mobile.MoveTo(unload, 2));
 						});
 					}
 				}));
 				a.QueueActivity(new Wait(25));
-				a.QueueActivity(new Move(startPos));
+				a.QueueActivity(mobile.MoveTo(startPos));
 				a.QueueActivity(new RemoveSelf());
 			});
 		}

OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -63,6 +63,7 @@
     <Compile Include="RenderGunboat.cs" />
     <Compile Include="RenderCargo.cs" />
     <Compile Include="CncLoadScreen.cs" />
+    <Compile Include="WithRoof.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Mods.Cnc/ProductionAirdrop.cs

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Cnc
 					new AltitudeInit( Rules.Info["c17"].Traits.Get<PlaneInfo>().CruiseAltitude ),
 				});
 				
-				a.QueueActivity(new Fly(self.Location + new int2(6,0)));
+				a.QueueActivity(Fly.ToCell(self.Location + new int2(6,0)));
 				a.QueueActivity(new Land(Target.FromActor(self)));
 				a.QueueActivity(new CallFunc(() => 
 				{
@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Cnc
 					rb.PlayCustomAnimRepeating(self, "idle");
 					self.World.AddFrameEndTask(ww => DoProduction(self, producee, exit));
 				}));
-				a.QueueActivity(new Fly(endPos));
+				a.QueueActivity(Fly.ToCell(endPos));
 				a.QueueActivity(new RemoveSelf());
 			});