Delayed unloading. Remove LocalStorage from proc.

Remove MoveFlash.

.gitignore

@@ -12,20 +12,11 @@ mods/*/*.dll
 # Red Alert binary files
 mods/*/packages/*.[mM][iI][xX]
 
-# Crap generated by OpenRa
-sheet-*.png
-log.txt
-
-*.rep
-
 #binary stuff
 /*.dll
 *.pdb
 *.mdb
 *.exe
-OpenRA
-OpenRA.app
-*.vqa
 
 # backup files by various editors
 *~
@@ -33,10 +24,8 @@ OpenRA.app
 # dependency DLLs (different for every platform!)
 cg.dll
 cgGL.dll
-glfw.dll
 
 /OpenRa.Gl.dll
-settings.ini
 
 #monodevelop
 *.pidb
@@ -55,6 +44,9 @@ packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
 temp.c
 temp.o
 temp.s
-
+OpenRA.Launcher.Mac/build/
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
+OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 *.config
 *.resources

AUTHORS

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

HACKING

@@ -5,43 +5,82 @@ There are n main sections to OpenRA: UI, Rendering, unit behaviour, ...
 All  units/structures/most things in the map are Actors. Actors contain a  collection of traits.
 Traits consist of an info class and a  class that does stuff
 
-Actor assembly is done via the mod's yaml files. A section  exists for each actor type, and within that section we list the traits  the actor should have. These get looked up in the loaded mod DLLs. Each trait can contain properties, which are automatically loaded into the corresponding fields on the trait's ITraitInfo.
+Actor assembly is done via the mod's yaml files. A section  exists for each actor type, 
+and within that section we list the traits  the actor should have. 
+These get looked up in the loaded mod DLLs. Each trait can contain properties, 
+which are automatically loaded into the corresponding fields on the trait's ITraitInfo.
 
 - Traits: look at TraitInterfaces.cs
-    We've tried to make individual traits implement as self-contained a unit of functionality as possible - all cross-trait references should be in terms of an interface from TraitInterfaces.cs.
+    We've tried to make individual traits implement as self-contained a unit of functionality 
+    as possible - all cross-trait references should be in terms of an interface from 
+    TraitInterfaces.cs.
     
-- Things an actor can be *doing* are represented as IActivity implementations. Actor has a queue of these. There's a standard set of activities in OpenRa.Game/Traits/Activities, and mods tend to define more as they need them. (RA defines various special-infantry actions as activities).
+- Things an actor can be *doing* are represented as IActivity implementations. 
+    Actor has a queue of these. There's a standard set of activities in 
+    OpenRa.Game/Traits/Activities, and mods tend to define more as they need them. (RA 
+    defines various special-infantry actions as activities).
 
-- Units offer orders they can perform (given context) through traits that implement IIssueOrder. Every trait with this interface is given a chance to generate orders for the current context.
+- Units offer orders they can perform (given context) through traits that implement IIssueOrder. 
+  Every trait with this interface is given a chance to generate orders for the current context.
 
-- For more complex things that require modal UI (like special abilities, RA-style sell/repair buttons, etc) we have IOrderGenerator implementations. This can completely replace the normal actors-provide-orders model temporarily. IOGs wiring is provided through OpenRa.Game/Controller.cs (ToggleInputMode<T>, CancelInputMode)
+- For more complex things that require modal UI (like special abilities, 
+  RA-style sell/repair buttons, etc) we have IOrderGenerator implementations. This can 
+  completely replace the normal actors-provide-orders model temporarily. IOGs wiring is 
+  provided through OpenRa.Game/Controller.cs (ToggleInputMode<T>, CancelInputMode)
 
-- Things that don't affect gameplay, or (increasingly) are just transient are implemented as IEffect, rather than real Actors. This is similar to the temp ents mechanism in many other game engines.
+- Things that don't affect gameplay, or (increasingly) are just transient are implemented as 
+  IEffect, rather than real Actors. This is similar to the temp ents mechanism in many other 
+  game engines.
 
-- Most player-level or global-level game behavior is implemented as traits on special Player and World actors. These are accessible via Player.PlayerActor and World.WorldActor. This includes production queue support, ore/tiberium growth, various palette manipulation magic.
+- Most player-level or global-level game behavior is implemented as traits on special Player 
+  and World actors. These are accessible via Player.PlayerActor and World.WorldActor. This 
+  includes production queue support, ore/tiberium growth, various palette manipulation magic.
 
-- Many traits can be modified by adding an appropriate IFooModifier implementation to the unit. This includes rendering, where IRenderModifier allows you to define an arbitrary transform on the Renderables emitted by the actor's IRender implementation(s). Examples are things like cloaking, invisibility to certain players, flying units with shadows, etc. Other modifiers can affect movement speed, damage taken, weapon firepower, etc.
+- Many traits can be modified by adding an appropriate IFooModifier implementation to the unit.
+  This includes rendering, where IRenderModifier allows you to define an arbitrary transform on 
+  the Renderables emitted by the actor's IRender implementation(s). Examples are things like 
+  cloaking, invisibility to certain players, flying units with shadows, etc. Other modifiers 
+  can affect movement speed, damage taken, weapon firepower, etc.
 
-Game code is collected into "Mod" units. Mods can be added prior to starting the game. Currently there is no dependancy mechanism, but provided you are doing additions or overrides you can add multiple mods without problem.
+Game code is collected into "Mod" units. Mods can be added prior to starting the game. 
+Currently there is no dependancy mechanism, but provided you are doing additions or overrides 
+you can add multiple mods without problem.
 Everything is a mod  (including RA - which is loaded by default). 
 
-The contents of the mod is defined in a manifest file mod.yaml. This lists the packages containing art assets (typically .mix files), yaml files defining actor defintions, and ini files containing legacy information that have yet to be ported over to the (relatively new) yaml system.
+The contents of the mod is defined in a manifest file mod.yaml. This lists the packages 
+containing art assets (typically .mix files), yaml files defining actor defintions, 
+and ini files containing legacy information that have yet to be ported over to 
+the (relatively new) yaml system.
 
-The unit artwork itself must be defined in a Sequences file (typically Sequences.xml; check mod.yaml for a list of what the mod uses); the format is self explanatory. There is also the SequenceEditor tool to make this easy.
+The unit artwork itself must be defined in a Sequences file (typically Sequences.xml; 
+check mod.yaml for a list of what the mod uses); the format is self explanatory. There is 
+also the SequenceEditor tool to make this easy.
 
-Chrome artwork is similarly defined in Chrome.xml. Chrome is already mod dependent. Sortof ;) mod-dependent *behavior* would be nice too, not just skinning. This is a property of the traits however; once we port UI into traits this will become a non-issue.
+Chrome artwork is similarly defined in Chrome.xml. Chrome is already mod dependent. Sortof ;) 
+mod-dependent *behavior* would be nice too, not just skinning. This is a property of the traits
+however; once we port UI into traits this will become a non-issue.
 
 Rendering
 OpenRa.Game/Chrome.cs is the user interface. 
-Three renderers (SpriteRenderer, LineRenderer, Rgba?Renderer) render most stuff. Don't forget to flush the renderer (if you want to see anything).
+Three renderers (SpriteRenderer, LineRenderer, Rgba?Renderer) render most stuff. Don't forget 
+to flush the renderer (if you want to see anything).
 
-UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be able to save values changed in game into settings.ini (not yet implemented)
+UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be 
+able to save values changed in game into settings.ini (not yet implemented)
 
-Bugs: There is a list of known bugs and features at http://red-bull.ijw.co.nz:3690/OpenRA . There's also a few at http://github.com/chrisforbes/OpenRA/issues (which won't be ported over, but no more bugs should be added here).
+Bugs: There is a list of known bugs and features at http://bugs.open-ra.org/ .
 
 We also have a website at http://www.open-ra.org/ . 
 
-As far as using git, get your own repository on github. You probably want to set up the gitbot to spam irc when you make commits (its nice to know). Push your changes into your git repository, and it will/might :P be merged into chrisforbes/OpenRA . Alli: setup howto for this?
+Our IRC channel is #openra on irc.freenode.net .
+
+As far as using git, get your own repository on github. You probably want to set up the gitbot
+to spam irc when you make commits (its nice to know). Push your changes into your git 
+repository, and it will/might :P be merged into http://github.com/OpenRA/OpenRA . 
+See http://help.github.com/ for working with GitHub and see http://progit.org/ for working 
+with Git.
+
+
 
 Other things we probably want to put in here:
     - A guide on how to add a generic unit via yaml using existing traits
@@ -50,6 +89,6 @@ Other things we probably want to put in here:
     - VFS (OpenRa.FileFormats.FileSystem, Package, Folder classes)
     - Trait inheritance (and the magicness of ^ActorType)
     - Removing inherited traits (prepend `-` to the trait name)
-    - Multiple instances of a trait (`@` and all subsequent characters are ignored for the purposes 
-        of looking up the trait.
+    - Multiple instances of a trait (`@` and all subsequent characters are ignored for 
+        the purposes of looking up the trait.
 

INSTALL

@@ -37,7 +37,11 @@ These need to be copied into the mods/cnc/packages/ directory.
 If you have a case-sensitive filesystem you must change the filenames to
 lower case.
 
+The files can be downloaded from:
+http://open-ra.org/get-dependency.php?file=ra-packages for the Red Alert files and
+http://open-ra.org/get-dependency.php?file=cnc-packages for the Command & Conquer files.
 
+Alternatively:
 Red Alert and C&C have been released by EA Games as freeware. They can be
 downloaded from http://www.commandandconquer.com/classic
 Unfortunately the installer is 16-bit and so won’t run on 64-bit operating
@@ -55,8 +59,7 @@ WINDOWS:
 * .NET Framework >= 3.5-SP1
 	(http://www.microsoft.com/downloads/details.aspx?FamilyID=AB99342F-5D1A-413D-8319-81DA479AB0D7&displaylang=en)
 * Tao Framework >= 2.1.0
-	(http://sourceforge.net/projects/taoframework/)
-	(required libs: Tao.OpenGL, Tao.Cg, Tao.Platform.Windows)
+	This is now bundled with OpenRA, copy the files in thirdparty/Tao to the game root directory.
 * OpenAL >= 1.1
 	(http://connect.creativelabs.com/openal/Downloads/oalinst.zip)
 * Cg Toolkit >= 2.2
@@ -83,8 +86,8 @@ UBUNTU (substitute comparable packages for other linux distros):
 OpenRA is incompatible with Compiz, please disable desktop effects when trying
 to run OpenRA or the game will crash.
 
-You will need to copy the Tao dependencies (.dll and .config) from the
-thirdparty/Tao directory into the game root, or install them permanently into
+You will need to copy the third party dependencies (.dll and .config) from the
+thirdparty and thirdparty/Tao directories into the game root, or install them permanently into
 your GAC with the following script
 
 #!/bin/sh
@@ -93,6 +96,7 @@ gacutil -i thirdparty/Tao/Tao.OpenGl.dll
 gacutil -i thirdparty/Tao/Tao.OpenAl.dll
 gacutil -i thirdparty/Tao/Tao.Sdl.dll
 gacutil -i thirdparty/Tao/Tao.FreeType.dll
+gacutil -i thirdparty/ICSharpCode.SharpZipLib.dll
 
 To compile OpenRA, run `make' from the command line.
 Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert

Makefile

@@ -1,7 +1,202 @@
-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
+CSC         = gmcs
+CSFLAGS     = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
+DEFINE      = DEBUG;TRACE
+COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll
+PHONY		= core tools package all mods clean distclean
+
+.SUFFIXES:
+core: game renderers mod_ra mod_cnc
+tools: editor ralint seqed filex tsbuild utility
+package: fixheader core editor utility winlaunch
+mods: mod_ra mod_cnc
+all: core tools winlaunch
+clean: 
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+distclean: clean
+
+#
+# Core binaries
+#
+fileformats_SRCS	= $(shell find OpenRA.FileFormats/ -iname '*.cs')
+fileformats_TARGET	= OpenRA.FileFormats.dll
+#fileformats_DEPS	= fixheader
+fileformats_KIND	= library
+fileformats_LIBS	= $(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll System.Windows.Forms.dll
+PROGRAMS 			= fileformats
+fileformats: $(fileformats_TARGET)
+
+game_SRCS			= $(shell find OpenRA.Game/ -iname '*.cs')
+game_TARGET			= OpenRA.Game.exe
+game_KIND			= winexe
+game_DEPS			= $(fileformats_TARGET) 
+game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
+						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
+game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
+PROGRAMS 			+= game
+game: $(game_TARGET)
+
+#
+# Renderer dlls
+#
+rcg_SRCS			= $(shell find OpenRA.Renderer.Cg/ -iname '*.cs')
+rcg_TARGET			= OpenRA.Renderer.Cg.dll
+rcg_KIND			= library
+rcg_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rcg_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+					$(rcg_DEPS) $(game_TARGET)
+
+rgl_SRCS			= $(shell find OpenRA.Renderer.Gl/ -iname '*.cs')
+rgl_TARGET			= OpenRA.Renderer.Gl.dll
+rgl_KIND			= library
+rgl_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rgl_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+					$(rgl_DEPS) $(game_TARGET)
+
+rnull_SRCS			= $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
+rnull_TARGET		= OpenRA.Renderer.Null.dll
+rnull_KIND			= library
+rnull_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+rnull_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+					$(rnull_DEPS) $(game_TARGET)
+PROGRAMS 			+= rcg rgl rnull
+renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET)
+
+#
+# Official Mods
+#
+# Red Alert
+mod_ra_SRCS			= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
+mod_ra_TARGET		= mods/ra/OpenRA.Mods.RA.dll
+mod_ra_KIND			= library
+mod_ra_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+mod_ra_LIBS			= $(COMMON_LIBS) $(mod_ra_DEPS)
+PROGRAMS 			+= mod_ra
+mod_ra: $(mod_ra_TARGET)
+#	mono RALint.exe ra
+
+# Command and Conquer
+mod_cnc_SRCS		= $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
+mod_cnc_TARGET		= mods/cnc/OpenRA.Mods.Cnc.dll
+mod_cnc_KIND		= library
+mod_cnc_DEPS		= $(fileformats_TARGET) $(game_TARGET) $(mod_ra_TARGET)
+mod_cnc_LIBS		= $(COMMON_LIBS) $(mod_cnc_DEPS)
+PROGRAMS 			+= mod_cnc
+mod_cnc: $(mod_cnc_TARGET)
+#	mono RALint.exe cnc
+
+#
+# Tools
+#
+# Sequence editor (defunct)
+seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
+seqed_TARGET		= SequenceEditor.exe
+seqed_KIND			= winexe
+seqed_DEPS			= $(fileformats_TARGET)
+seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
+seqed_EXTRA			= -resource:SequenceEditor.Form1.resources
+PROGRAMS 			+= seqed
+SequenceEditor.Form1.resources:
+	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
+seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
+
+# Map Editor
+editor_SRCS			= $(shell find OpenRA.Editor/ -iname '*.cs')
+editor_TARGET		= OpenRA.Editor.exe
+editor_KIND			= winexe
+editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
+editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
+PROGRAMS 			+= editor
+OpenRA.Editor.MapSelect.resources:
+	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
+OpenRA.Editor.Form1.resources:
+	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
+editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
+
+# Analyses mod yaml for easy to detect errors
+ralint_SRCS			= $(shell find RALint/ -iname '*.cs')
+ralint_TARGET		= RALint.exe
+ralint_KIND			= exe
+ralint_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+ralint_LIBS			= $(COMMON_LIBS) $(ralint_DEPS)
+PROGRAMS 			+= ralint
+ralint: $(ralint_TARGET)
+
+# Extracts files from packages (mixfiles, zips, etc)
+filex_SRCS			= $(shell find FileExtractor/ -iname '*.cs')
+filex_TARGET		= FileExtractor.exe
+filex_KIND			= exe
+filex_DEPS			= $(fileformats_TARGET)
+filex_LIBS			= $(COMMON_LIBS) $(filex_DEPS)
+PROGRAMS 			+= filex
+filex: $(filex_TARGET)
+
+# Builds and exports tilesets from a bitmap
+tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_TARGET		= TilesetBuilder.exe
+tsbuild_KIND		= winexe
+tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
+tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
+PROGRAMS 			+= tsbuild
+OpenRA.TilesetBuilder.Form1.resources:
+	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
+tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
+
+#
+# Launchers / Utilities
+#
+# Patches binary headers to work around a mono bug
+fixheader: packaging/fixheader.cs
+	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
+PHONY += fixheader
+
+# Backend for the launcher apps - queries game/mod info and applies actions to an install
+utility_SRCS		= $(shell find OpenRA.Utility/ -iname '*.cs')
+utility_TARGET		= OpenRA.Utility.exe
+utility_KIND		= exe
+utility_DEPS        = $(fileformats_TARGET) thirdparty/ICSharpCode.SharpZipLib.dll
+utility_LIBS        = $(COMMON_LIBS) $(utility_DEPS)
+PROGRAMS 			+= utility
+utility: $(utility_TARGET)
+
+# Windows launcher
+winlaunch_SRCS		= $(shell find OpenRA.Launcher/ -iname '*.cs')
+winlaunch_TARGET	= OpenRA.Launcher.exe
+winlaunch_KIND		= winexe
+winlaunch_LIBS		= $(COMMON_LIBS) System.Windows.Forms.dll
+winlaunch_EXTRA		= -resource:OpenRA.Launcher.Launcher.resources
+PROGRAMS 			+= winlaunch
+OpenRA.Launcher.Launcher.resources:
+	resgen2 OpenRA.Launcher/Launcher.resx OpenRA.Launcher.Launcher.resources 1> /dev/null
+winlaunch: OpenRA.Launcher.Launcher.resources $(winlaunch_TARGET)
+
+.PHONY: $(PHONY) $(PROGRAMS)
+
+#
+# Generate build rules for each target defined above in PROGRAMS
+#
+define BUILD_ASSEMBLY
+
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
+	@echo CSC $$(@)
+	@$(CSC) $$($(1)_LIBS:%=-r:%) \
+		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
+		-define:"$(DEFINE)" \
+		-t:"$$($(1)_KIND)" \
+		$$($(1)_EXTRA) \
+		$$($(1)_SRCS)
+	@test -e fixheader.exe && mono fixheader.exe $$(@) || ``
+endef
+
+$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
+
+
+#
+# Install / Uninstall for *nix
+#
 prefix = /usr/local
 datarootdir = $(prefix)/share
 datadir = $(datarootdir)
@@ -10,96 +205,14 @@ BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
 INSTALL_DIR = $(DESTDIR)$(datadir)/openra
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
-
-COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
-
-fileformats_SRCS	=	$(shell find OpenRA.FileFormats/ -iname '*.cs')
-fileformats_TARGET	=	OpenRA.FileFormats.dll
-fileformats_KIND	=	library
-fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll thirdparty/WindowsBase.dll
-
-gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
-gl_TARGET			= OpenRA.Gl.dll
-gl_KIND				= library
-gl_DEPS				= $(fileformats_TARGET) $(game_TARGET)
-gl_LIBS				= $(COMMON_LIBS) System.Windows.Forms.dll \
-						thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-						$(gl_DEPS) $(game_TARGET)
-
-game_SRCS			=	$(shell find OpenRA.Game/ -iname '*.cs')
-game_TARGET			= OpenRA.Game.exe
-game_KIND			= winexe
-game_DEPS			= $(fileformats_TARGET) 
-game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
-						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
-game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
-
-ra_SRCS				=	$(shell find OpenRA.Mods.RA/ -iname '*.cs')
-ra_TARGET			=	mods/ra/OpenRA.Mods.RA.dll
-ra_KIND				=	library
-ra_DEPS				= $(fileformats_TARGET) $(game_TARGET)
-ra_LIBS				= $(COMMON_LIBS) $(ra_DEPS)
-
-cnc_SRCS			=	$(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-cnc_TARGET			=	mods/cnc/OpenRA.Mods.Cnc.dll
-cnc_KIND			=	library
-cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
-cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)
-
-seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
-seqed_TARGET		= SequenceEditor.exe
-seqed_KIND			= winexe
-seqed_DEPS			= $(fileformats_TARGET)
-seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
-seqed_EXTRA			= -resource:SequenceEditor.Form1.resources
-
-editor_SRCS			= $(shell find OpenRA.Editor/ -iname '*.cs')
-editor_TARGET		= OpenRA.Editor.exe
-editor_KIND			= winexe
-editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
-editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
-
-ralint_SRCS		= $(shell find RALint/ -iname '*.cs')
-ralint_TARGET	= RALint.exe
-ralint_KIND		= winexe
-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_DEPS		= $(fileformats_TARGET)
-filex_LIBS		= $(COMMON_LIBS) $(filex_DEPS)
-
-tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET		= TilesetBuilder.exe
-tsbuild_KIND		= winexe
-tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
-tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
-tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
-
-# -platform:x86
-
-.SUFFIXES:
-.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex
-
-game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
-
-clean: 
-	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
-
-distclean: clean
-
-CORE = fileformats gl game editor
-
+CORE = fileformats rcg rgl rnull game editor utility winlaunch
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
 		
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
-	@$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc
+	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) $(INSTALL_DIR)/mods/cnc
 	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/chrome $(INSTALL_DIR)/mods/cnc
@@ -110,7 +223,7 @@ install: all
 	@cp -r mods/cnc/uibits $(INSTALL_DIR)/mods/cnc
 	
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
-	@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(INSTALL_DIR)/mods/ra
 	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/bits $(INSTALL_DIR)/mods/ra
@@ -119,10 +232,11 @@ install: all
 	@cp -r mods/ra/tilesets $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/uibits $(INSTALL_DIR)/mods/ra
 	
-	@cp -r shaders $(INSTALL_DIR)
+	@cp -r glsl $(INSTALL_DIR)
+	@cp -r cg $(INSTALL_DIR)
 	@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
@@ -130,10 +244,10 @@ install: all
 	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=~/.openra \"$$""@\"" >> openra
 	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
 	@$(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."
@@ -143,44 +257,3 @@ install: all
 uninstall:
 	@-rm -r $(INSTALL_DIR)
 	@-rm $(DESTDIR)$(bindir)/openra
-
-mod_ra: $(ra_TARGET) $(ralint_TARGET)
-	mono RALint.exe ra
-mod_cnc: $(cnc_TARGET) $(ralint_TARGET)
-	mono RALint.exe cnc
-mods: mod_ra mod_cnc
-
-OpenRA.Editor.MapSelect.resources:
-	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
-
-OpenRA.Editor.Form1.resources:
-	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
-editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
-ralint: $(ralint_TARGET)
-seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
-SequenceEditor.Form1.resources:
-	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
-filex: $(filex_TARGET)
-tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
-OpenRA.TilesetBuilder.Form1.resources:
-	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
-tools: editor ralint seqed filex tsbuild
-all: game tools
-
-fixheader: packaging/fixheader.cs
-	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
-
-define BUILD_ASSEMBLY
-
-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader
-	@echo CSC $$(@)
-	@$(CSC) $$($(1)_LIBS:%=-r:%) \
-		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
-		-define:"$(DEFINE)" \
-		-t:"$$($(1)_KIND)" \
-		$$($(1)_EXTRA) \
-		$$($(1)_SRCS)
-	@mono fixheader.exe $$(@)
-endef
-
-$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))

OpenRA.Editor/ActorTemplate.cs

@@ -18,7 +18,7 @@ namespace OpenRA.Editor
 	{
 		public Bitmap Bitmap;
 		public ActorInfo Info;
-		public bool Centered;
+		public EditorAppearanceInfo Appearance;
 	}
 
 	class BrushTemplate

OpenRA.Editor/Form1.Designer.cs

@@ -28,221 +28,204 @@
 		/// </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.statusStrip1 = new System.Windows.Forms.StatusStrip();
+			this.toolStripStatusLabelFiller = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusLabelMousePosition = new System.Windows.Forms.ToolStripStatusLabel();
+			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.statusStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// splitContainer1
+			// 
+			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer1.Name = "splitContainer1";
+			// 
+			// splitContainer1.Panel1
+			// 
+			this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.Controls.Add(this.surface1);
+			this.splitContainer1.Size = new System.Drawing.Size(985, 744);
+			this.splitContainer1.SplitterDistance = 198;
+			this.splitContainer1.TabIndex = 0;
+			// 
+			// splitContainer2
+			// 
+			this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer2.Name = "splitContainer2";
+			this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+			// 
+			// splitContainer2.Panel1
+			// 
+			this.splitContainer2.Panel1.Controls.Add(this.pmMiniMap);
+			// 
+			// splitContainer2.Panel2
+			// 
+			this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
+			this.splitContainer2.Size = new System.Drawing.Size(198, 744);
+			this.splitContainer2.SplitterDistance = 164;
+			this.splitContainer2.TabIndex = 1;
+			// 
+			// pmMiniMap
+			// 
+			this.pmMiniMap.BackColor = System.Drawing.Color.Black;
+			this.pmMiniMap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.pmMiniMap.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.pmMiniMap.Location = new System.Drawing.Point(0, 0);
+			this.pmMiniMap.Name = "pmMiniMap";
+			this.pmMiniMap.Size = new System.Drawing.Size(198, 164);
+			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, 576);
+			this.tabControl1.TabIndex = 0;
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(this.tilePalette);
+			this.tabPage1.Location = new System.Drawing.Point(4, 20);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage1.Size = new System.Drawing.Size(190, 552);
+			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, 546);
+			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, 552);
+			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, 546);
+			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, 552);
+			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, 552);
+			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 +236,267 @@
             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;
+			// 
+			// statusStrip1
+			// 
+			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelFiller,
+            this.toolStripStatusLabelMousePosition});
+			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 = 7;
+			this.statusStrip1.Text = "statusStrip1";
+			// 
+			// toolStripStatusLabelFiller
+			// 
+			this.toolStripStatusLabelFiller.Name = "toolStripStatusLabelFiller";
+			this.toolStripStatusLabelFiller.Size = new System.Drawing.Size(948, 17);
+			this.toolStripStatusLabelFiller.Spring = true;
+			// 
+			// toolStripStatusLabelMousePosition
+			// 
+			this.toolStripStatusLabelMousePosition.Name = "toolStripStatusLabelMousePosition";
+			this.toolStripStatusLabelMousePosition.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+			this.toolStripStatusLabelMousePosition.Size = new System.Drawing.Size(22, 17);
+			this.toolStripStatusLabelMousePosition.Text = "0,0";
+			// 
+			// 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.statusStrip1);
+			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.statusStrip1.ResumeLayout(false);
+			this.statusStrip1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
 		#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 +524,18 @@
 		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;
+		private System.Windows.Forms.StatusStrip statusStrip1;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelMousePosition;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelFiller;
 
 	}
 }

OpenRA.Editor/Form1.cs

@@ -11,15 +11,12 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Traits;
-using OpenRA.Widgets;
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
 namespace OpenRA.Editor
 {
@@ -38,7 +35,14 @@ namespace OpenRA.Editor
 
 			Rules.LoadRules(Game.modData.Manifest, new Map());
 
-			surface1.AfterChange += MakeDirty;
+			surface1.AfterChange += OnMapChanged;
+			surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
+		}
+
+		void OnMapChanged()
+		{
+			MakeDirty();
+			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
 		}
 
 		void MakeDirty() { dirty = true; }
@@ -56,9 +60,9 @@ namespace OpenRA.Editor
 			loadedMapName = mapname;
 
 			Game.modData = new ModData(currentMod);
-
+			
 			// load the map
-			var map = new Map(new Folder(mapname));
+			var map = new Map(mapname);
 
 			// upgrade maps that have no player definitions. editor doesnt care,
 			// but this breaks the game pretty badly.
@@ -86,10 +90,11 @@ namespace OpenRA.Editor
 			MakeDirty();
 		}
 
+		// this code is insanely stupid, and mostly my fault -- chrisf
 		void PrepareMapResources(Manifest manifest, Map map)
 		{
 			Rules.LoadRules(manifest, map);
-			tileset = Rules.TileSets[map.Theater];
+			tileset = Rules.TileSets[map.Tileset];
 			tileset.LoadTiles();
 			var palette = new Palette(FileSystem.Open(tileset.Palette), true);
 
@@ -102,7 +107,7 @@ namespace OpenRA.Editor
 			{
 				try
 				{
-					var bitmap = RenderTemplate(tileset, (ushort)t.Key, palette);
+					var bitmap = RenderUtils.RenderTemplate(tileset, (ushort)t.Key, palette);
 					var ibox = new PictureBox
 					{
 						Image = bitmap,
@@ -134,7 +139,7 @@ namespace OpenRA.Editor
 				{
 					var info = Rules.Info[a];
 					if (!info.Traits.Contains<RenderSimpleInfo>()) continue;
-					var template = RenderActor(info, tileset, palette);
+					var template = RenderUtils.RenderActor(info, tileset, palette);
 					var ibox = new PictureBox
 					{
 						Image = template.Bitmap,
@@ -166,7 +171,7 @@ namespace OpenRA.Editor
 			{
 				try
 				{
-					var template = RenderResourceType(a, tileset.Extensions, palette);
+					var template = RenderUtils.RenderResourceType(a, tileset.Extensions, palette);
 					var ibox = new PictureBox
 					{
 						Image = template.Bitmap,
@@ -199,172 +204,28 @@ namespace OpenRA.Editor
 				p.Visible = true;
 				p.ResumeLayout();
 			}
+
 			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
 		}
 
-		static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
-		{
-			var template = ts.Templates[n];
-			var tile = ts.Tiles[n];
-
-			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y);
-			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				int* q = (int*)data.Scan0.ToPointer();
-				var stride = data.Stride >> 2;
-
-				for (var u = 0; u < template.Size.X; u++)
-					for (var v = 0; v < template.Size.Y; v++)
-						if (tile.TileBitmapBytes[u + v * template.Size.X] != null)
-						{
-							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
-							for (var i = 0; i < ts.TileSize; i++)
-								for (var j = 0; j < ts.TileSize; j++)
-									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = p.GetColor(rawImage[i + ts.TileSize * j]).ToArgb();
-						}
-						else
-						{
-							for (var i = 0; i < ts.TileSize; i++)
-								for (var j = 0; j < ts.TileSize; j++)
-									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = Color.Transparent.ToArgb();
-						}
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
-		{
-			var ri = info.Traits.Get<RenderSimpleInfo>();
-			string image = null;
-			if (ri.OverrideTheater != null)
-				for (int i = 0; i < ri.OverrideTheater.Length; i++)
-					if (ri.OverrideTheater[i] == tileset.Id)
-						image = ri.OverrideImage[i];
-
-			image = image ?? ri.Image ?? info.Name;
-			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
-			{
-				var shp = new ShpReader(s);
-				var frame = shp[0];
-
-				var bitmap = new Bitmap(shp.Width, shp.Height);
-				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-				unsafe
-				{
-					int* q = (int*)data.Scan0.ToPointer();
-					var stride = data.Stride >> 2;
-
-					for (var i = 0; i < shp.Width; i++)
-						for (var j = 0; j < shp.Height; j++)
-							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
-				}
-
-				bitmap.UnlockBits(data);
-
-                try
-                {
-                    using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
-                    {
-                        shp = new ShpReader(s2);
-                        frame = shp[0];
-
-                        var bitmap2 = new Bitmap(shp.Width, shp.Height);
-                        var data2 = bitmap2.LockBits(new Rectangle(0, 0, bitmap2.Width, bitmap2.Height),
-                            ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-                        unsafe
-                        {
-                            int* q = (int*)data2.Scan0.ToPointer();
-                            var stride2 = data2.Stride >> 2;
-
-                            for (var i = 0; i < shp.Width; i++)
-                                for (var j = 0; j < shp.Height; j++)
-                                    q[j * stride2 + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
-                        }
-
-                        bitmap2.UnlockBits(data);
-                        System.Drawing.Bitmap finalImage = null;
-                        finalImage = new System.Drawing.Bitmap(bitmap2.Width, bitmap2.Height);
-
-                        using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(finalImage))
-                        {
-                            //set background color
-                            g.Clear(System.Drawing.Color.Transparent);
-
-                            //go through each image and draw it on the final image
-                            int offset = 0;
-                                g.DrawImage(bitmap,
-                                  new System.Drawing.Rectangle(offset, 0, bitmap.Width, bitmap.Height));
-                                g.DrawImage(bitmap2,
-                                  new System.Drawing.Rectangle(offset, 0, bitmap2.Width, bitmap2.Height));
-
-                        }
-                        
-                        bitmap = finalImage;
-
-                    }
-                }
-                catch (Exception ed)
-                {
-                    //
-                }
-
-
-
-				return new ActorTemplate { Bitmap = bitmap, Info = info, Centered = !info.Traits.Contains<BuildingInfo>() };
-			}
-		}
-
-		static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
-		{
-			var image = info.SpriteNames[0];
-			using (var s = FileSystem.OpenWithExts(image, exts))
-			{
-				var shp = new ShpReader(s);
-				var frame = shp[shp.ImageCount - 1];
-
-				var bitmap = new Bitmap(shp.Width, shp.Height);
-				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-				unsafe
-				{
-					int* q = (int*)data.Scan0.ToPointer();
-					var stride = data.Stride >> 2;
-
-					for (var i = 0; i < shp.Width; i++)
-						for (var j = 0; j < shp.Height; j++)
-							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
-				}
-
-				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
-			}
-		}
-
 		void ResizeClicked(object sender, EventArgs e)
 		{
 			using (var rd = new ResizeDialog())
 			{
 				rd.width.Value = surface1.Map.MapSize.X;
 				rd.height.Value = surface1.Map.MapSize.Y;
-				rd.cordonLeft.Value = surface1.Map.TopLeft.X;
-				rd.cordonTop.Value = surface1.Map.TopLeft.Y;
-				rd.cordonRight.Value = surface1.Map.BottomRight.X;
-				rd.cordonBottom.Value = surface1.Map.BottomRight.Y;
+				rd.cordonLeft.Value = surface1.Map.Bounds.Left;
+				rd.cordonTop.Value = surface1.Map.Bounds.Top;
+				rd.cordonRight.Value = surface1.Map.Bounds.Right;
+				rd.cordonBottom.Value = surface1.Map.Bounds.Bottom;
 
 				if (DialogResult.OK != rd.ShowDialog())
 					return;
 
-				surface1.Map.TopLeft = new int2((int)rd.cordonLeft.Value, (int)rd.cordonTop.Value);
-				surface1.Map.BottomRight = new int2((int)rd.cordonRight.Value, (int)rd.cordonBottom.Value);
+				surface1.Map.ResizeCordon((int)rd.cordonLeft.Value,
+				                       (int)rd.cordonTop.Value,
+				                       (int)rd.cordonRight.Value,
+				                       (int)rd.cordonBottom.Value);
 
 				if ((int)rd.width.Value != surface1.Map.MapSize.X || (int)rd.height.Value != surface1.Map.MapSize.Y)
 				{
@@ -382,8 +243,7 @@ namespace OpenRA.Editor
 				SaveAsClicked(sender, e);
 			else
 			{
-				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
-				surface1.Map.Package = new Folder(loadedMapName);
+				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;				
 				surface1.Map.Save(loadedMapName);
 				dirty = false;
 			}
@@ -392,11 +252,8 @@ namespace OpenRA.Editor
 
 		void SaveAsClicked(object sender, EventArgs e)
 		{
-			using (var nms = new MapSelect())
+			using (var nms = new MapSelect(currentMod))
 			{
-				nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
-				.Aggregate(Path.Combine);
-
 				nms.txtNew.ReadOnly = false;
 				nms.btnOk.Text = "Save";
 				nms.txtNew.Text = "unnamed";
@@ -407,18 +264,8 @@ namespace OpenRA.Editor
 					if (nms.txtNew.Text == "")
 						nms.txtNew.Text = "unnamed";
 
-					string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
-					loadedMapName = mapfoldername;
-
-					try
-					{
-						Directory.CreateDirectory(mapfoldername);
-					}
-					catch (Exception ed)
-					{
-						MessageBox.Show("Directory creation failed: {0}", ed.ToString());
-					}
-
+					// TODO: Allow the user to choose map format (directory vs oramap)
+					loadedMapName = Path.Combine(nms.MapFolderPath, nms.txtNew.Text + ".oramap");
 					SaveClicked(sender, e);
 				}
 			}
@@ -426,20 +273,14 @@ namespace OpenRA.Editor
 
 		void OpenClicked(object sender, EventArgs e)
 		{
-			using (var nms = new MapSelect())
+			using (var nms = new MapSelect(currentMod))
 			{
-				nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
-				.Aggregate(Path.Combine);
-
 				nms.txtNew.ReadOnly = true;
 				nms.txtPathOut.ReadOnly = true;
 				nms.btnOk.Text = "Open";
 
 				if (DialogResult.OK == nms.ShowDialog())
-				{
-					string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
-					LoadMap(mapfoldername);
-				}
+					LoadMap(nms.txtNew.Tag as string);
 			}
 		}
 
@@ -453,12 +294,11 @@ namespace OpenRA.Editor
 
 				if (DialogResult.OK == nmd.ShowDialog())
 				{
-					var map = new Map(nmd.theater.SelectedItem as string);
+					var map = Map.FromTileset(nmd.theater.SelectedItem as string);
 
 					map.Resize((int)nmd.width.Value, (int)nmd.height.Value);
-
-					map.TopLeft = new int2((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value);
-					map.BottomRight = new int2((int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
+					map.ResizeCordon((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value,
+						(int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
 					map.Players.Add("Neutral", new PlayerReference("Neutral", Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
 					NewMap(map);
 				}
@@ -473,6 +313,7 @@ namespace OpenRA.Editor
 				pd.desc.Text = surface1.Map.Description;
 				pd.author.Text = surface1.Map.Author;
 				pd.selectable.Checked = surface1.Map.Selectable;
+                pd.useAsShellmap.Checked = surface1.Map.UseAsShellmap;
 
 				if (DialogResult.OK != pd.ShowDialog())
 					return;
@@ -481,6 +322,7 @@ namespace OpenRA.Editor
 				surface1.Map.Description = pd.desc.Text;
 				surface1.Map.Author = pd.author.Text;
 				surface1.Map.Selectable = pd.selectable.Checked;
+                surface1.Map.UseAsShellmap = pd.useAsShellmap.Checked;
 			}
 		}
 
@@ -495,9 +337,11 @@ namespace OpenRA.Editor
 
 		void ImportLegacyMapClicked(object sender, EventArgs e)
 		{
+			var currentDirectory = Directory.GetCurrentDirectory();
 			using (var ofd = new OpenFileDialog { Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
 				if (DialogResult.OK == ofd.ShowDialog())
 				{
+					Directory.SetCurrentDirectory( currentDirectory );
 					/* massive hack: we should be able to call NewMap() with the imported Map object,
 					 * but something's not right internally in it, unless loaded via the real maploader */
 
@@ -505,7 +349,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));
 
@@ -522,7 +365,7 @@ namespace OpenRA.Editor
 		{
 			if (!dirty) return;
 
-			switch (MessageBox.Show("The map has been modified since it was last saved. Save changes now?",
+			switch (MessageBox.Show("The map has been modified since it was last saved. " + "\r\n" + "Save changes now?",
 				"Unsaved Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
 			{
 				case DialogResult.Yes: SaveClicked(null, EventArgs.Empty); break;
@@ -537,11 +380,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
@@ -569,4 +407,4 @@ namespace OpenRA.Editor
             catch { }
         }
 	}
-}
+}

OpenRA.Editor/Form1.resx

@@ -308,12 +308,12 @@
   <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>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>313, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>45</value>
   </metadata>

OpenRA.Editor/LegacyMapImporter.cs

@@ -17,6 +17,7 @@ using OpenRA;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
 using System.Drawing;
+using System.Globalization;
 
 namespace OpenRA.Editor
 {
@@ -401,7 +402,7 @@ namespace OpenRA.Editor
 				{
 					new LocationInit(new int2(loc % MapSize, loc / MapSize)),
 					new OwnerInit(parts[0]),
-					new HealthInit(float.Parse(parts[2])/256),
+					new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo)/256),
 					new FacingInit((section == "INFANTRY") ? int.Parse(parts[6]) : int.Parse(parts[4])),
 					new ActorStanceInit(stance),
 				};

OpenRA.Editor/MapSelect.Designer.cs

@@ -52,11 +52,13 @@
 			this.txtTitle = new System.Windows.Forms.TextBox();
 			this.lblMapName = new System.Windows.Forms.Label();
 			this.lblMinimap = new System.Windows.Forms.Label();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
 			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit();
 			this.pnlBottom.SuspendLayout();
 			this.splitContainer1.Panel1.SuspendLayout();
 			this.splitContainer1.Panel2.SuspendLayout();
 			this.splitContainer1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
 			this.SuspendLayout();
 			// 
 			// MapList
@@ -85,9 +87,9 @@
 			// 
 			// MapIconsList
 			// 
-			this.MapIconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("MapIconsList.ImageStream")));
+			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
 			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
-			this.MapIconsList.Images.SetKeyName(0, "mapicon");
 			// 
 			// btnCancel
 			// 
@@ -141,6 +143,7 @@
 			// 
 			// pnlBottom
 			// 
+			this.pnlBottom.Controls.Add(this.pictureBox1);
 			this.pnlBottom.Controls.Add(this.txtPathOut);
 			this.pnlBottom.Controls.Add(this.lblPathOut);
 			this.pnlBottom.Controls.Add(this.lblPath);
@@ -253,7 +256,7 @@
 			this.lblTheater.Name = "lblTheater";
 			this.lblTheater.Size = new System.Drawing.Size(47, 13);
 			this.lblTheater.TabIndex = 11;
-			this.lblTheater.Text = "Theater:";
+			this.lblTheater.Text = "Tileset:";
 			// 
 			// txtAuthor
 			// 
@@ -301,6 +304,16 @@
 			this.lblMinimap.TabIndex = 6;
 			this.lblMinimap.Text = "Map preview:";
 			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
+			this.pictureBox1.TabIndex = 7;
+			this.pictureBox1.TabStop = false;
+			this.pictureBox1.Visible = false;
+			// 
 			// MapSelect
 			// 
 			this.AcceptButton = this.btnOk;
@@ -327,6 +340,7 @@
 			this.splitContainer1.Panel2.ResumeLayout(false);
 			this.splitContainer1.Panel2.PerformLayout();
 			this.splitContainer1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
 			this.ResumeLayout(false);
 
         }
@@ -356,5 +370,6 @@
         public System.Windows.Forms.Label lblPathOut;
         public System.Windows.Forms.Label lblPath;
         public System.Windows.Forms.TextBox txtPathOut;
+		private System.Windows.Forms.PictureBox pictureBox1;
     }
 }

OpenRA.Editor/MapSelect.cs

@@ -1,14 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
-using System.Windows.Forms;
 using System.IO;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
 using OpenRA.Graphics;
+using System.Linq;
 
 namespace OpenRA.Editor
 {
@@ -16,47 +11,48 @@ namespace OpenRA.Editor
     {
         public string MapFolderPath;
 
-        public MapSelect()
+        public MapSelect(string currentMod)
         {
-            InitializeComponent();
+            MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+				.Aggregate(Path.Combine);
+			
+			InitializeComponent();
+			MapIconsList.Images.Add(pictureBox1.Image);
         }
 
-        private void MapSelect_Load(object sender, EventArgs e)
+        void MapSelect_Load(object sender, EventArgs e)
         {
-
-            DirectoryInfo directory = new DirectoryInfo(MapFolderPath);
-            DirectoryInfo[] directories = directory.GetDirectories();
             MapList.Items.Clear();
             txtPathOut.Text = MapFolderPath;
-            foreach (DirectoryInfo subDirectory in directories)
+			
+            foreach (var map in ModData.FindMapsIn(MapFolderPath))
             {
-                ListViewItem map1 = new ListViewItem(subDirectory.Name);
+                ListViewItem map1 = new ListViewItem();
+				map1.Tag = map;
+				map1.Text = Path.GetFileNameWithoutExtension(map);
                 map1.ImageIndex = 0;
                 MapList.Items.Add(map1);
-
             }
-            if (txtNew.Text == "unnamed")
-            {
-                //dumb indian code
-            }
-            else
-            {
+            
+			// hack
+			if (txtNew.Text != "unnamed")
                 MapList.Items[0].Selected = true;
-            }
-
         }
 
-        private void MapList_SelectedIndexChanged(object sender, EventArgs e)
+        void MapList_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (MapList.SelectedItems.Count == 1)
             {
                 txtNew.Text = MapList.SelectedItems[0].Text;
-                var map = new Map(new Folder(Path.Combine(MapFolderPath, MapList.SelectedItems[0].Text)));
+				txtNew.Tag = MapList.SelectedItems[0].Tag;
+
+				var map = new Map(txtNew.Tag as string);
                 txtTitle.Text = map.Title;
                 txtAuthor.Text = map.Author;
-                txtTheater.Text = map.Theater;
+                txtTheater.Text = map.Tileset;
                 txtDesc.Text = map.Description;
 				pbMinimap.Image = null;
+				
                 try
                 {
 					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
@@ -69,7 +65,7 @@ namespace OpenRA.Editor
             }
         }
 
-        private void txtPathOut_TextChanged(object sender, EventArgs e)
+        void txtPathOut_TextChanged(object sender, EventArgs e)
         {
             MapFolderPath = txtPathOut.Text;
         }

OpenRA.Editor/MapSelect.resx

@@ -120,73 +120,58 @@
   <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="MapIconsList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABW
-        DgAAAk1TRnQBSQFMAwEBAAEoAQABKAEAARgBAAEYAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABYAMA
-        ARgDAAEBAQABIAYAASQhAAEBAx8BLAM/AW8DSQGJAzYBWQMYASIDAQECDAADHQEqA0gBhQNCAXYDDwEU
-        AwEBAgMNARIDMwFSA0MBdwNRAacDDwEU/wAwAAEBAwMBBAM0BFQBwgFlAVMBUgH0AV4CWAHYA0oBjQMW
-        AR4DAgEDAwABAQMCAQMDGgElA00BlAEIAQkBJgH9A1ABpAM1AVcDQQFzA1MBugJDAVMB4wJTAVQBsgMA
-        AQH/ADAAAQEDDAEQA0IBdAFVAVQBUQHYAZkBiAGBAf8BoAGMAYUB/wF8AXABZQH4AzoBYQMKAQ4DCgEN
-        Ax0BKgM/AW0DVAG7ARkCGgH5AQABBQG/Af8BFwEbAUcB+QE5AUYBSwHrAQABBQFEAf8CCAFOAf0DDQER
-        /wAxAAMDAQQDHQEpA1ABpAFdAVMBUQHtAZsBiwGDAf8BnAGMAYQB/wGWAYQBdwH/AVsBWgFYAdgDMwFT
-        AzQBVANPAZ0CUwFSAdMCTAFOAfMBMAGeAbsB/wEUAXMBqwH/ARQBdQG/Af8BEAFmAbYB/wEXAY0BwgH/
-        AUgBYQFpAeEDAQEC/wAwAAEBAwkBDAMwAUwBVgJVAcMBewFqAWAB+gGoAZkBjwH/AZMBhAF3Af8BjAF3
-        AXAB/wGHAXEBbAH/A1YBvgNTAbwBTAFIAUYB5QF2AVsBUgH6AYMBbQFlAf8BUQFIAUcB/wEOAUsBpAH/
-        AQMBGgG4Af8BDQFRAZUB/wEZAZUBwAH/AUABagGBAesDMwFSAw0BEgMCAQP/ACUAAwEBAgMYASEDSwGP
-        A1EB3AGbAY4BhQH9AaEBkQGJAf8BhwFzAWsB/wGBAW4BZQH/AXUBZwFgAf8BUwFKAUMB/QFHAT4BOwH8
-        AZYBhgF5Af8BowGSAYoB/wFTAUoBUwH/AQMBGAHzAf8BEgFgAaYB/wEVAXYBlQH/AS8B/QH+Af8BBwEy
-        AZQB/wEVAXoByAH/AgABVAH/A00BlAMZASP/ACUAAwYBCAMtAUYDUwG8AWoBZQFiAfQBqgGbAZEB/wGJ
-        AXQBbQH/AYwBdwFuAf8BmgGJAYEB/wGLAXcBbwH/AXUBZQFeAf8BhgFxAWkB/wGVAYYBegH/AUEBPAFK
-        Af8BEwEfAYgB/wEKAREBrgH/ARwBegGVAf8BKgHfAeIB/wEOAVMBdwH/AQkBOQG8Af8BGQGBAaoB/wEK
-        ARIBqQH/ASABJQFSAfcDUQGg/wAlAAMQARUDQQFyA08B1gGTAYQBcgH9AZoBiQGDAf8BjwGAAXMB/wGW
-        AYYBeAH/AZ8BjQGEAf8BlgGFAXkB/wGUAYQBdwH/AZQBgwF3Af8BlwGHAYAB/wFqAV8BXAH/AWMBVwFW
-        Af8BYAFVAVMB/wFTAVcBWAH/ASIBYwGaAf8BDQFLAZ0B/wEgAY4BsAH/AUwBnAGvAf8BaAGaAa4B/wE7
-        AUsBWgH+A1ABn/8AJQADGAEiA00BlQF8AXUBbwH8AagBmAGOAf8BkQGBAXUB/wGNAXcBcAH/AZoBiQGB
-        Af8BkwGDAXYB/wGZAYgBgQH/AZwBiwGDAf8BlQGGAXgB/wGWAYYBeQH/AaABjwGHAf8BlgGFAXgB/wF2
-        AW8BbAH/AUwBbQGBAf8BHgE7AV0B/wEdAZ4BhAH/AVMBlwGpAf8BhgHFAd8B/wGIAb4B1wH/AUUBXwFi
-        AfsDQQFz/wAlAAMYASIDTQGVAZ0BjwGGAf8BmwGLAYMB/wGGAXEBagH/AYUBbwFoAf8BiAFzAWwB/wGJ
-        AXQBbAH/AZABdwFvAf8BlQGEAXcB/wGWAYUBeAH/AZ8BjwGGAf8BmQGLAYQB/wFtAYABhgH/AVYBkwGw
-        Af8BWgGmAccB/wFMAYMBpAH/AQUBFgGgAf8BYwGaAbAB/wGCAb8B2QH/AXEBrQHIAf8BXQFpAXIB3gMq
-        AUD/ACEAAwMBBAMmATgDUAGjAZoBjAGEAf8BpwGWAY4B/wGXAYYBegH/AZQBggF2Af8BlAGDAXcB/wGW
-        AYUBeAH/AZIBeQFyAf8BjwF5AXIB/wGVAYQBeAH/AY8BdgFrAf8BcAGAAYcB/wFaAZcBswH/AU8BmgHC
-        Af8BZQG1AdQB/wFlAaQBvgH/AR4BKgE1Af8BeAG6AdMB/wGAAbsB1QH/AYEBvwHaAf8BVQFWAVkBtQMP
-        ART/ACEAAwoBDQNBAXMDUgHPAasBmgGRAf8BmgGJAYIB/wGOAXgBcQH/AZEBgQF1Af8BlQGEAXcB/wGY
-        AYgBgAH/AYsBdQFuAf8BkQF6AXMB/wF4AW4BagH/AW8BrwHIAf8BWQGoAc0B/wFZAasBzAH/AVUBpgHJ
-        Af8BdQHDAeAB/wF6AcIB3wH/AYMBwAHbAf8BggHBAd0B/wFvAa4ByAH/AYsBvwHbAf8DSAGGAwUBB/8A
-        IQADHgErA1EBoAFSAVABTQHtAYMBbwFoAf8BgwFuAWcB/wGBAWwBZQH/AYEBbQFmAf8BiAFzAWsB/wGH
-        AXIBawH/AZQBhAF4Af8BhQF2AXMB/wFUAWwBgwH/AU0BhAGmAf8BZgGwAdAB/wFdAaoBywH/AWEBsQHR
-        Af8BdgG/Ad0B/wGFAcgB4wH/AYEBxAHfAf8BiAHHAeIB/wF3AbYB0QH/AW0BngG2Af8DPgFrAwIBA/8A
-        IQADOAFcA1UByAFrAlwB+AGRAYABdAH/AZgBiAGAAf8BlQGEAXgB/wGNAXcBcAH/AZUBhAF4Af8BmAGH
-        AYAB/wGTAYMBdwH/AWgBgAGLAf8BVgGQAbEB/wE3AUoBagH/AWMBqQHKAf8BYAGuAc8B/wFhAawBzAH/
-        AXYBvwHcAf8BiQHMAecB/wGDAcYB4gH/AYUBxQHgAf8BhwHDAd4B/wFIAYMBmwH/AzwBaAMEAQX/ACEA
-        A0kBiQFXAVYBVQHiAaQBkwGKAf8BrAGcAZMB/wGlAZUBjAH/AZYBhgF5Af8BkAF5AXQB/wGZAYgBgQH/
-        AaIBkQGJAf8BbgFdAVUB/wFkAZUBqwH/AWgBtQHVAf8BcgHBAd0B/wF0AbsB2wH/AV4BrAHOAf8BXwGt
-        AcwB/wF4AcMB4AH/AYgBywHmAf8BhQHGAeQB/wGDAcYB4gH/AYcBvwHdAf8BQwFVAWkB7gMbASb/ACUA
-        A08BpQFiAlgB7wGjAZMBigH/AZgBhwGAAf8BnwGOAYYB/wGdAYwBhAH/AZABeQFzAf8BiAFyAWsB/wGI
-        AXYBbwH/AWoBhQGPAf8BaAGwAdAB/wFvAbwB2gH/AWYBtgHWAf8BXwGxAdAB/wFdAa8B0AH/AXEBvQHa
-        Af8BcAG7AdoB/wGAAcQB3wH/AY8BzQHpAf8BigHJAeUB/wFbAZcBrAH9A0QBeQMAAQH/ACUAA1MBsQFs
-        Al8B8wGjAZIBigH/AZUBgwF4Af8BlAGCAXcB/wGUAYUBdwH/AYQBiwGNAf8BWwFzAYYB/wFcAYcBnQH/
-        AWEBrwHSAf8BbwG7AdoB/wF3AcEB3gH/AWwBuQHXAf8BYQGzAdIB/wFpAbkB1gH/AYABxQHhAf8BeAHC
-        Ad8B/wGAAcUB4QH/AYUBxAHhAf8BiQHGAeIB/wFSAXMBhAHzAzEBTv8AKQADUQHHAXsBcQFnAfgBqwGb
-        AZIB/wGQAYABdQH/AYQBbwFmAf8BcgGaAasB/wFiAasBzwH/AWQBsgHTAf8BbQG8AdoB/wFrAbgB1QH/
-        AXEBvgHbAf8BdgG/Ad0B/wFwAb4B2wH/AWgBuQHWAf8BgAHHAeEB/wGJAcsB5AH/AYoBzAHnAf8BjQHR
-        AewB/wGFAckB5gH/AW0BswHUAf8DTgGYAzABTAMAAQEDAAEB/wAhAAM+AWwBYgFfAV4ByQGJAYIBfAH1
-        AaQBkwGLAf8BhgGeAakB/wFnAa8B0gH/AXgBxAHgAf8BdgHCAd4B/wF2AcIB3gH/AXEBvwHbAf8BcwG8
-        AdoB/wFyAbsB2AH/AXQBuwHZAf8BdAG/Ad0B/wFhAZ0BwwH/AUEBYwGUAf8BbQGnAcgB/wGHAcQB4AH/
-        AYgBzQHpAf8BXwFxAXkB4AMsAUQDBwEJAwQBBgMAAQH/ACEAAwQBBQMZASMDNAFUA0oBiQFYAlsBwQFh
-        AXIBeQHiAW4BlwGoAfUBfQG0Ac8B/gGAAcUB4gH/AXIBvAHaAf8BcQG8AdoB/wFwAbsB2AH/AXUBvAHZ
-        Af8BjgHPAesB/wFtAa8B0gH/AU8BdQGkAf8BbAGrAc0B/wFuAa8BzwH/AY8BygHnAf8BWAFjAWYB0QMi
-        ATH/AD0AAwEBAgMJAQwDGgElA0IBdgFSAVwBZQHqAYEBxAHgAf4BigHHAeQB/wF5AcAB3QH/AYoBxgHi
-        Af8BlgHUAe4B/wF5AbgB1wH/AWEBoQHIAf8BaQGmAcwB/wFZAZIBvwH/AX8BwwHdAf4CRgFHAYEDAwEE
-        /wBJAAMCAQMDEAEWAzIBUANKAY0DUAGdA1IBoQFmAXUBewHgAXIBrwHFAf0BYAGXAb4B/wFgAZQBwAH/
-        AW8BqAHOAf8BQAF5AaoB/wM1AVYDAAEB/wBVAAMCAQMDBgEIAwoBDQMoAT0DQAFxAU8CUQGcAVsBYgFo
-        AdYBZQF/AZMB8gFKAX0BoQH8AyABL/8AcAABAQMIAQsDJAE2A0YBgQMDAQT/ADEAAUIBTQE+BwABPgMA
-        ASgDAAFgAwABGAMAAQEBAAEBBQABIAEBFgAD/wEAAeABOAEBCQABwAEAAQEJAAHAAQABAwkAAcABAAED
-        CQABgAsAAYALAAGACwABgAsAAYALAAGAPQABAQsAAQELAAEDIwABBwkAAfABAAEHCQAB/gEAAQcJAAH/
-        AcABDwkAAf8B/gEPCQAL
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
+        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
+        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
+        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
+        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
+        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
+        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
+        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
+        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
+        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
+        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
+        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
+        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
+        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
+        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
+        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
+        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
+        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
+        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
+        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
+        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
+        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
+        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
+        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
+        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
+        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
+        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
+        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
+        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
+        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
+        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
+        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
+        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
+        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
+        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
+        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
+        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
+        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
+        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
+        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
+        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
+        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
+        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
+        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
+        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
+        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
+        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
+        ga8AAAAASUVORK5CYII=
 </value>
   </data>
 </root>

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -221,7 +221,7 @@
 			this.label4.Name = "label4";
 			this.label4.Size = new System.Drawing.Size(44, 13);
 			this.label4.TabIndex = 14;
-			this.label4.Text = "Theater";
+			this.label4.Text = "Tileset";
 			// 
 			// theater
 			// 

OpenRA.Editor/OpenRA.Editor.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>
@@ -13,8 +13,6 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
-    <StartupObject>
-    </StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -125,6 +123,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="RenderUtils.cs" />
     <Compile Include="ResizeDialog.cs">
       <SubType>Form</SubType>
     </Compile>

OpenRA.Editor/Program.cs

@@ -11,6 +11,8 @@
 using System;
 using System.Globalization;
 using System.Windows.Forms;
+using System.Linq;
+using System.IO;
 
 namespace OpenRA.Editor
 {
@@ -19,11 +21,32 @@ namespace OpenRA.Editor
 		[STAThread]
 		static void Main( string[] args )
 		{
+			if (args.Length >= 2 && args[0] == "--convert")
+			{
+				Game.modData = new ModData(args[1]);
+				Rules.LoadRules(Game.modData.Manifest, new Map());
+				UpgradeMaps(args[1]);
+				return;
+			}
+			
 			Application.CurrentCulture = CultureInfo.InvariantCulture;
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
 
 			Application.Run(new Form1(args));
 		}
+		
+		static void UpgradeMaps(string mod)
+		{
+			var MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", mod, "maps" }
+				.Aggregate(Path.Combine);
+			
+			foreach (var path in ModData.FindMapsIn(MapFolderPath))
+            {
+                var map = new Map(path);
+				map.Save(path+".oramap");
+            }
+		}
+		
 	}
 }

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -28,119 +28,131 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.title = new System.Windows.Forms.TextBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.desc = new System.Windows.Forms.TextBox();
-			this.selectable = new System.Windows.Forms.CheckBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.author = new System.Windows.Forms.TextBox();
-			this.SuspendLayout();
-			// 
-			// button2
-			// 
-			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(196, 193);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 14;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			// 
-			// button1
-			// 
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(277, 193);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 15;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 50);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 16;
-			this.label1.Text = "Title";
-			// 
-			// title
-			// 
-			this.title.Location = new System.Drawing.Point(66, 47);
-			this.title.Name = "title";
-			this.title.Size = new System.Drawing.Size(286, 20);
-			this.title.TabIndex = 17;
-			// 
-			// label2
-			// 
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(12, 76);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(32, 13);
-			this.label2.TabIndex = 16;
-			this.label2.Text = "Desc";
-			// 
-			// desc
-			// 
-			this.desc.Location = new System.Drawing.Point(66, 73);
-			this.desc.Name = "desc";
-			this.desc.Size = new System.Drawing.Size(286, 20);
-			this.desc.TabIndex = 17;
-			// 
-			// selectable
-			// 
-			this.selectable.AutoSize = true;
-			this.selectable.Location = new System.Drawing.Point(118, 138);
-			this.selectable.Name = "selectable";
-			this.selectable.Size = new System.Drawing.Size(130, 17);
-			this.selectable.TabIndex = 18;
-			this.selectable.Text = "Show in Map Chooser";
-			this.selectable.UseVisualStyleBackColor = true;
-			// 
-			// label3
-			// 
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(12, 102);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(38, 13);
-			this.label3.TabIndex = 16;
-			this.label3.Text = "Author";
-			// 
-			// author
-			// 
-			this.author.Location = new System.Drawing.Point(66, 99);
-			this.author.Name = "author";
-			this.author.Size = new System.Drawing.Size(286, 20);
-			this.author.TabIndex = 17;
-			// 
-			// PropertiesDialog
-			// 
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(370, 228);
-			this.Controls.Add(this.selectable);
-			this.Controls.Add(this.author);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.desc);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.title);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "PropertiesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "PropertiesDialog";
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.button2 = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.title = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.desc = new System.Windows.Forms.TextBox();
+            this.selectable = new System.Windows.Forms.CheckBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.author = new System.Windows.Forms.TextBox();
+            this.useAsShellmap = new System.Windows.Forms.CheckBox();
+            this.SuspendLayout();
+            // 
+            // button2
+            // 
+            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.button2.Location = new System.Drawing.Point(196, 193);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 23);
+            this.button2.TabIndex = 14;
+            this.button2.Text = "OK";
+            this.button2.UseVisualStyleBackColor = true;
+            // 
+            // button1
+            // 
+            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.button1.Location = new System.Drawing.Point(277, 193);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 15;
+            this.button1.Text = "Cancel";
+            this.button1.UseVisualStyleBackColor = true;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 50);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(27, 13);
+            this.label1.TabIndex = 16;
+            this.label1.Text = "Title";
+            // 
+            // title
+            // 
+            this.title.Location = new System.Drawing.Point(66, 47);
+            this.title.Name = "title";
+            this.title.Size = new System.Drawing.Size(286, 20);
+            this.title.TabIndex = 17;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 76);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(32, 13);
+            this.label2.TabIndex = 16;
+            this.label2.Text = "Desc";
+            // 
+            // desc
+            // 
+            this.desc.Location = new System.Drawing.Point(66, 73);
+            this.desc.Name = "desc";
+            this.desc.Size = new System.Drawing.Size(286, 20);
+            this.desc.TabIndex = 17;
+            // 
+            // selectable
+            // 
+            this.selectable.AutoSize = true;
+            this.selectable.Location = new System.Drawing.Point(118, 138);
+            this.selectable.Name = "selectable";
+            this.selectable.Size = new System.Drawing.Size(130, 17);
+            this.selectable.TabIndex = 18;
+            this.selectable.Text = "Show in Map Chooser";
+            this.selectable.UseVisualStyleBackColor = true;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(12, 102);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(38, 13);
+            this.label3.TabIndex = 16;
+            this.label3.Text = "Author";
+            // 
+            // author
+            // 
+            this.author.Location = new System.Drawing.Point(66, 99);
+            this.author.Name = "author";
+            this.author.Size = new System.Drawing.Size(286, 20);
+            this.author.TabIndex = 17;
+            // 
+            // checkBox1
+            // 
+            this.useAsShellmap.AutoSize = true;
+            this.useAsShellmap.Location = new System.Drawing.Point(118, 161);
+            this.useAsShellmap.Name = "checkBox1";
+            this.useAsShellmap.Size = new System.Drawing.Size(105, 17);
+            this.useAsShellmap.TabIndex = 18;
+            this.useAsShellmap.Text = "Use as Shellmap";
+            this.useAsShellmap.UseVisualStyleBackColor = true;
+            // 
+            // PropertiesDialog
+            // 
+            this.AcceptButton = this.button2;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.button1;
+            this.ClientSize = new System.Drawing.Size(370, 228);
+            this.Controls.Add(this.useAsShellmap);
+            this.Controls.Add(this.selectable);
+            this.Controls.Add(this.author);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.desc);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.title);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.button2);
+            this.Controls.Add(this.button1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Name = "PropertiesDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "PropertiesDialog";
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -155,5 +167,6 @@
 		public System.Windows.Forms.CheckBox selectable;
 		private System.Windows.Forms.Label label3;
 		public System.Windows.Forms.TextBox author;
+        public System.Windows.Forms.CheckBox useAsShellmap;
 	}
 }

OpenRA.Editor/RenderUtils.cs

@@ -0,0 +1,161 @@
+#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.Drawing;
+using System.Drawing.Imaging;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	static class RenderUtils
+	{
+		public static ColorPalette MakeSystemPalette(Palette p)
+		{
+			ColorPalette pal;
+			using (var b = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
+				pal = b.Palette;
+			
+			for (var i = 0; i < 256; i++)
+				pal.Entries[i] = p.GetColor(i);
+			return pal;
+		}
+
+		public static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
+		{
+			var template = ts.Templates[n];
+			var tile = ts.Tiles[n];
+
+			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y,
+				PixelFormat.Format8bppIndexed);
+
+			bitmap.Palette = MakeSystemPalette(p);
+
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+			unsafe
+			{
+				byte* q = (byte*)data.Scan0.ToPointer();
+				var stride = data.Stride;
+
+				for (var u = 0; u < template.Size.X; u++)
+					for (var v = 0; v < template.Size.Y; v++)
+						if (tile.TileBitmapBytes[u + v * template.Size.X] != null)
+						{
+							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = rawImage[i + ts.TileSize * j];
+						}
+						else
+						{
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = 0;
+						}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		static Bitmap RenderShp(ShpReader shp, Palette p)
+		{
+			var frame = shp[0];
+
+			var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
+
+			bitmap.Palette = MakeSystemPalette(p);
+
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+			unsafe
+			{
+				byte* q = (byte*)data.Scan0.ToPointer();
+				var stride2 = data.Stride;
+
+				for (var i = 0; i < shp.Width; i++)
+					for (var j = 0; j < shp.Height; j++)
+						q[j * stride2 + i] = frame.Image[i + shp.Width * j];
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
+		{
+			var ri = info.Traits.Get<RenderSimpleInfo>();
+			string image = null;
+			if (ri.OverrideTileset != null)
+				for (int i = 0; i < ri.OverrideTileset.Length; i++)
+					if (ri.OverrideTileset[i] == tileset.Id)
+						image = ri.OverrideImage[i];
+
+			image = image ?? ri.Image ?? info.Name;
+			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			{
+				var shp = new ShpReader(s);
+				var bitmap = RenderShp(shp, p);
+
+				try
+				{
+					using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
+					{
+						var shp2 = new ShpReader(s2);
+						var roofBitmap = RenderShp(shp2, p);
+
+						using (var g = System.Drawing.Graphics.FromImage(bitmap))
+							g.DrawImage(roofBitmap, 0, 0);
+					}
+				}
+				catch { }
+
+				return new ActorTemplate
+				{
+					Bitmap = bitmap,
+					Info = info,
+					Appearance = info.Traits.GetOrDefault<EditorAppearanceInfo>()
+				};
+			}
+		}
+
+		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
+		{
+			var image = info.SpriteNames[0];
+			using (var s = FileSystem.OpenWithExts(image, exts))
+			{
+				var shp = new ShpReader(s);
+				var frame = shp[shp.ImageCount - 1];
+
+				var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
+				bitmap.Palette = MakeSystemPalette(p);
+				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+				unsafe
+				{
+					byte* q = (byte*)data.Scan0.ToPointer();
+					var stride = data.Stride;
+
+					for (var i = 0; i < shp.Width; i++)
+						for (var j = 0; j < shp.Height; j++)
+							q[j * stride + i] = frame.Image[i + shp.Width * j];
+				}
+
+				bitmap.UnlockBits(data);
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
+			}
+		}
+	}
+}

OpenRA.Editor/Surface.cs

@@ -15,6 +15,7 @@ using System.Drawing.Imaging;
 using System.Linq;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
+using OpenRA.Traits;
 
 namespace OpenRA.Editor
 {
@@ -34,6 +35,7 @@ namespace OpenRA.Editor
 
 		public bool IsPanning;
 		public event Action AfterChange = () => { };
+		public event Action<string> MousePositionChanged = _ => { };
 
 		Dictionary<string, ActorTemplate> ActorTemplates = new Dictionary<string, ActorTemplate>();
 		Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
@@ -44,6 +46,7 @@ namespace OpenRA.Editor
 			TileSet = ts;
 			Palette = p;
 			Brush = null;
+			PlayerPalettes = null;
 			Chunks.Clear();
 		}
 
@@ -87,6 +90,8 @@ namespace OpenRA.Editor
 		{
 			base.OnMouseWheel(e);
 
+			if (Map == null) return;
+
 			Zoom *= e.Delta > 0 ? 4.0f / 3.0f : .75f;
 
 			Invalidate();
@@ -114,8 +119,11 @@ namespace OpenRA.Editor
 		{
 			base.OnMouseMove(e);
 
+			if (Map == null) return;
+
 			var oldMousePos = MousePos;
 			MousePos = new int2(e.Location);
+			MousePositionChanged(GetBrushLocation().ToString());
 
 			if (e.Button == MouseButtons.Middle || (e.Button != MouseButtons.None && IsPanning))
 				Scroll(oldMousePos - MousePos);
@@ -135,6 +143,16 @@ namespace OpenRA.Editor
 		{
 			var queue = new Queue<int2>();
 			var replace = Map.MapTiles[pos.X, pos.Y];
+			var touched = new bool[Map.MapSize.X, Map.MapSize.Y];
+
+			Action<int, int> MaybeEnqueue = (x, y) =>
+				{
+					if (Map.IsInMap(x, y) && !touched[x, y])
+					{
+						queue.Enqueue(new int2(x, y));
+						touched[x, y] = true;
+					}
+				};
 
 			queue.Enqueue(pos);
 			while (queue.Count > 0)
@@ -149,10 +167,10 @@ namespace OpenRA.Editor
 				for (var x = a.X; x <= b.X; x++)
 				{
 					Map.MapTiles[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, image = (byte)0, index = (byte)0 };
-					if (Map.MapTiles[x, p.Y - 1].Equals(replace) && Map.IsInMap(x, p.Y - 1))
-						queue.Enqueue(new int2(x, p.Y - 1));
-					if (Map.MapTiles[x, p.Y + 1].Equals(replace) && Map.IsInMap(x, p.Y + 1))
-						queue.Enqueue(new int2(x, p.Y + 1));
+					if (Map.MapTiles[x, p.Y - 1].Equals(replace))
+						MaybeEnqueue(x, p.Y - 1);
+					if (Map.MapTiles[x, p.Y + 1].Equals(replace))
+						MaybeEnqueue(x, p.Y + 1);
 				}
 			}
 
@@ -167,7 +185,7 @@ namespace OpenRA.Editor
 		{
 			for (; ; )
 			{
-				var q = p+d;
+				var q = p + d;
 				if (!Map.IsInMap(q)) return p;
 				if (!Map.MapTiles[q.X, q.Y].Equals(replace)) return p;
 				p = q;
@@ -199,7 +217,7 @@ namespace OpenRA.Editor
 								{
 									type = Brush.N,
 									index = template.PickAny ? byte.MaxValue : (byte)z,
-									image = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4)*4) : (byte)z,
+									image = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z,
 								};
 
 						var ch = new int2((pos.X + u) / ChunkSize, (pos.Y + v) / ChunkSize);
@@ -332,6 +350,8 @@ namespace OpenRA.Editor
 		{
 			base.OnMouseDown(e);
 
+			if (Map == null) return;
+
 			if (!IsPanning)
 			{
 				if (e.Button == MouseButtons.Right) Erase();
@@ -401,19 +421,25 @@ namespace OpenRA.Editor
 			return new int2(vX / TileSet.TileSize, vY / TileSet.TileSize);
 		}
 
-		void DrawActor(System.Drawing.Graphics g, int2 p, ActorTemplate t)
+		void DrawActor(System.Drawing.Graphics g, int2 p, ActorTemplate t, ColorPalette cp)
 		{
-			float OffsetX = t.Centered ? t.Bitmap.Width / 2 - TileSet.TileSize/2 : 0;
+			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
+
+			float OffsetX = centered ? t.Bitmap.Width / 2 - TileSet.TileSize / 2 : 0;
 			float DrawX = TileSet.TileSize * p.X * Zoom + Offset.X - OffsetX;
 
-			float OffsetY = t.Centered ? t.Bitmap.Height / 2 - TileSet.TileSize/2 : 0;
+			float OffsetY = centered ? t.Bitmap.Height / 2 - TileSet.TileSize / 2 : 0;
 			float DrawY = TileSet.TileSize * p.Y * Zoom + Offset.Y - OffsetY;
 
 			float width = t.Bitmap.Width * Zoom;
 			float height = t.Bitmap.Height * Zoom;
 			RectangleF sourceRect = new RectangleF(0, 0, t.Bitmap.Width, t.Bitmap.Height);
 			RectangleF destRect = new RectangleF(DrawX, DrawY, width, height);
+
+			var restorePalette = t.Bitmap.Palette;
+			if (cp != null) t.Bitmap.Palette = cp;
 			g.DrawImage(t.Bitmap, destRect, sourceRect, GraphicsUnit.Pixel);
+			if (cp != null) t.Bitmap.Palette = restorePalette;
 		}
 
 		void DrawImage(System.Drawing.Graphics g, Bitmap bmp, int2 location)
@@ -433,35 +459,55 @@ namespace OpenRA.Editor
 
 		void DrawActorBorder(System.Drawing.Graphics g, int2 p, ActorTemplate t)
 		{
-			float OffsetX = t.Centered ? t.Bitmap.Width / 2 - TileSet.TileSize / 2 : 0;
+			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
+
+			float OffsetX = centered ? t.Bitmap.Width / 2 - TileSet.TileSize / 2 : 0;
 			float DrawX = TileSet.TileSize * p.X * Zoom + Offset.X - OffsetX;
 
-			float OffsetY = t.Centered ? t.Bitmap.Height / 2 - TileSet.TileSize / 2 : 0;
+			float OffsetY = centered ? t.Bitmap.Height / 2 - TileSet.TileSize / 2 : 0;
 			float DrawY = TileSet.TileSize * p.Y * Zoom + Offset.Y - OffsetY;
 
-			float width = t.Bitmap.Width * Zoom;
-			float height = t.Bitmap.Height * Zoom;
-			RectangleF sourceRect = new RectangleF(0, 0, t.Bitmap.Width, t.Bitmap.Height);
-			RectangleF destRect = new RectangleF(DrawX, DrawY, width, height);
 			g.DrawRectangle(CordonPen,
 				DrawX, DrawY,
 				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);
 		}
 
+		ColorPalette GetPaletteForPlayer(string name)
+		{
+			var pr = Map.Players[name];
+			var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
+			var remap = new PlayerColorRemap(pr.Color, pr.Color2, pcpi.PaletteFormat);
+			return RenderUtils.MakeSystemPalette(new Palette(Palette, remap));
+		}
+
+		Cache<string, ColorPalette> PlayerPalettes;
+
+		ColorPalette GetPaletteForActor(ActorReference ar)
+		{
+			if (PlayerPalettes == null)
+				PlayerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayer);
+
+			var ownerInit = ar.InitDict.GetOrDefault<OwnerInit>();
+			if (ownerInit == null)
+				return null;
+
+			return PlayerPalettes[ownerInit.PlayerName];
+		}
+
 		protected override void OnPaint(PaintEventArgs e)
 		{
 			if (Map == null) return;
 			if (TileSet == null) return;
 
-			for( var u = 0; u < Map.MapSize.X; u += ChunkSize )
+			for (var u = 0; u < Map.MapSize.X; u += ChunkSize)
 				for (var v = 0; v < Map.MapSize.Y; v += ChunkSize)
 				{
-					var x = new int2(u/ChunkSize,v/ChunkSize);
+					var x = new int2(u / ChunkSize, v / ChunkSize);
 					if (!Chunks.ContainsKey(x)) Chunks[x] = RenderChunk(u / ChunkSize, v / ChunkSize);
 
 					Bitmap bmp = Chunks[x];
 
-					float DrawX = TileSet.TileSize* 1f * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
+					float DrawX = TileSet.TileSize * 1f * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
 					float DrawY = TileSet.TileSize * 1f * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
 					RectangleF sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
 					RectangleF destRect = new RectangleF(DrawX, DrawY, bmp.Width * Zoom, bmp.Height * Zoom);
@@ -469,13 +515,14 @@ namespace OpenRA.Editor
 				}
 
 			e.Graphics.DrawRectangle(CordonPen,
-				Map.XOffset * TileSet.TileSize * Zoom + Offset.X,
-				Map.YOffset * TileSet.TileSize * Zoom + Offset.Y,
-				Map.Width * TileSet.TileSize * Zoom,
-				Map.Height * TileSet.TileSize * Zoom);
+				Map.Bounds.Left * TileSet.TileSize * Zoom + Offset.X,
+				Map.Bounds.Top * TileSet.TileSize * Zoom + Offset.Y,
+				Map.Bounds.Width * TileSet.TileSize * Zoom,
+				Map.Bounds.Height * TileSet.TileSize * Zoom);
 
 			foreach (var ar in Map.Actors)
-				DrawActor(e.Graphics, ar.Value.Location(), ActorTemplates[ar.Value.Type]);
+				DrawActor(e.Graphics, ar.Value.Location(), ActorTemplates[ar.Value.Type],
+					GetPaletteForActor(ar.Value));
 
 			foreach (var wp in Map.Waypoints)
 				e.Graphics.DrawRectangle(Pens.LimeGreen,
@@ -491,7 +538,8 @@ namespace OpenRA.Editor
 					Brush.Bitmap.Height * Zoom);
 
 			if (Actor != null)
-				DrawActor(e.Graphics, GetBrushLocation(), Actor);
+				DrawActor(e.Graphics, GetBrushLocation(), Actor, null);	/* todo: include the player 
+																		 * in the brush so we can color new buildings too */
 
 			if (Resource != null)
 				DrawImage(e.Graphics, Resource.Bitmap, GetBrushLocation());

OpenRA.FileFormats/CompressedPackage.cs

@@ -1,45 +0,0 @@
-#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.IO;
-using System.IO.Packaging;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public class CompressedPackage : IFolder
-	{
-		readonly uint[] hashes;
-		readonly Stream s;
-		readonly ZipPackage pkg;
-
-		public CompressedPackage(string filename)
-		{
-			s = FileSystem.Open(filename);
-			pkg = (ZipPackage)ZipPackage.Open(s, FileMode.Open);
-			hashes = pkg.GetParts()
-				.Select(p => PackageEntry.HashFilename(p.Uri.LocalPath)).ToArray();
-		}
-
-		public Stream GetContent(string filename)
-		{
-			return pkg.GetPart(new Uri(filename)).GetStream(FileMode.Open);
-		}
-
-		public IEnumerable<uint> AllFileHashes() { return hashes; }
-		
-		public bool Exists(string filename)
-		{
-			return hashes.Contains(PackageEntry.HashFilename(filename));
-		}
-	}
-}

OpenRA.FileFormats/Exts.cs

@@ -73,5 +73,27 @@ namespace OpenRA
 		{
 			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
 		}
+
+		public static T[] GetCustomAttributes<T>( this MemberInfo mi, bool inherit )
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes( typeof( T ), inherit );
+		}
+
+		public static T[] GetCustomAttributes<T>( this ParameterInfo mi )
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes( typeof( T ), true );
+		}
+
+		public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
+		{
+			if (val.CompareTo(min) < 0)
+				return min;
+			else if (val.CompareTo(max) > 0)
+				return max;
+			else
+				return val;
+		}
 	}
 }

OpenRA.FileFormats/FieldLoader.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Reflection;
+using System.Globalization;
 
 namespace OpenRA.FileFormats
 {
@@ -99,11 +100,19 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(float))
 			{
 				float res;
-				if (float.TryParse(x.Replace("%",""), out res))
+				if (float.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
 					return res * (x.Contains( '%' ) ? 0.01f : 1f);
 				return InvalidValueAction(x,fieldType, field);
 			}
 
+			else if (fieldType == typeof(decimal))
+			{
+				decimal res;
+				if (decimal.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
+					return res * (x.Contains( '%' ) ? 0.01m : 1m);
+				return InvalidValueAction(x,fieldType, field);
+			}
+
 			else if (fieldType == typeof(string))
 				return x;
 
@@ -111,9 +120,9 @@ namespace OpenRA.FileFormats
 			{
 				var parts = x.Split(',');
 				if (parts.Length == 3)
-					return Color.FromArgb(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]));
+					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255));
 				if (parts.Length == 4)
-					return Color.FromArgb(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
+					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255), int.Parse(parts[3]).Clamp(0, 255));
 				return InvalidValueAction(x,fieldType, field);
 			}
 
@@ -177,11 +186,12 @@ namespace OpenRA.FileFormats
 		{
 			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
 
-			foreach( var field in type.GetFields() )
+			foreach( var ff in type.GetFields() )
 			{
-				var load = (LoadAttribute[])field.GetCustomAttributes( typeof( LoadAttribute ), false );
-				var loadUsing = (LoadUsingAttribute[])field.GetCustomAttributes( typeof( LoadUsingAttribute ), false );
-				var fromYamlKey = (FieldFromYamlKeyAttribute[])field.GetCustomAttributes( typeof( FieldFromYamlKeyAttribute ), false );
+				var field = ff;
+				var load = field.GetCustomAttributes<LoadAttribute>( false );
+				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>( false );
+				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>( false );
 				if( loadUsing.Length != 0 )
 					ret[ field ] = ( _1, fieldType, yaml ) => loadUsing[ 0 ].LoaderFunc( field )( yaml );
 				else if( fromYamlKey.Length != 0 )
@@ -252,6 +262,11 @@ namespace OpenRA.FileFormats
 					FormatValue( o, f ) ) ).ToList() );
 		}
 
+		public static MiniYamlNode SaveField(object o, string field)
+		{
+			return new MiniYamlNode(field, FieldSaver.FormatValue( o, o.GetType().GetField(field) ));
+		}
+		
 		public static string FormatValue(object o, FieldInfo f)
 		{
 			var v = f.GetValue(o);
@@ -262,7 +277,10 @@ namespace OpenRA.FileFormats
 			if (f.FieldType == typeof(Color))
 			{
 				var c = (Color)v;
-				return "{0},{1},{2},{3}".F(c.A,c.R,c.G,c.B);
+				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
+					((int)c.R).Clamp(0, 255),
+					((int)c.G).Clamp(0, 255),
+					((int)c.B).Clamp(0, 255));
 			}
 
 			return f.FieldType.IsArray

OpenRA.FileFormats/FileFormats/Blast.cs

@@ -0,0 +1,274 @@
+#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.
+ *
+ * This file is based on the blast routines (version 1.1 by Mark Adler) 
+ * included in zlib/contrib
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public static class Blast
+	{
+		public static readonly int MAXBITS = 13; // maximum code length
+		public static readonly int MAXWIN = 4096; // maximum window size
+		
+		static byte[] litlen = new byte[] {
+			11, 124, 8, 7, 28, 7, 188, 13, 76, 4,
+			10, 8, 12, 10, 12, 10, 8, 23, 8, 9,
+			7, 6, 7, 8, 7, 6, 55, 8, 23, 24,
+			12, 11, 7, 9, 11, 12, 6, 7, 22, 5,
+			7, 24, 6, 11, 9, 6, 7, 22, 7, 11,
+			38, 7, 9, 8, 25, 11, 8, 11, 9, 12,
+			8, 12, 5, 38, 5, 38, 5, 11, 7, 5,
+			6, 21, 6, 10, 53, 8, 7, 24, 10, 27,
+			44, 253, 253, 253, 252, 252, 252, 13, 12, 45,
+			12, 45, 12, 61, 12, 45, 44, 173
+		};
+
+		// bit lengths of length codes 0..15
+		static byte[] lenlen = new byte[] { 2, 35, 36, 53, 38, 23 };
+
+		// bit lengths of distance codes 0..63
+		static byte[] distlen = new byte[] { 2, 20, 53, 230, 247, 151, 248 };
+
+		// base for length codes
+		static short[] lengthbase = new short[] {
+			3, 2, 4, 5, 6, 7, 8, 9, 10, 12,
+			16, 24, 40, 72, 136, 264
+		};
+
+		// extra bits for length codes
+		static byte[] extra = new byte[] {
+			0, 0, 0, 0, 0, 0, 0, 0, 1, 2,
+			3, 4, 5, 6, 7, 8
+		};
+		
+		static Huffman litcode = new Huffman(litlen, litlen.Length, 256);
+		static Huffman lencode = new Huffman(lenlen, lenlen.Length, 16);
+		static Huffman distcode = new Huffman(distlen, distlen.Length, 64);
+		
+		// Decode PKWare Compression Library stream.
+		public static byte[] Decompress(byte[] src)
+		{
+			BitReader br = new BitReader(src);
+			
+			// Are literals coded?
+			int coded = br.ReadBits(8);
+			
+			if (coded < 0 || coded > 1)
+				throw new NotImplementedException("Invalid datastream");
+			bool EncodedLiterals = (coded == 1);
+			
+			// log2(dictionary size) - 6
+			int dict = br.ReadBits(8);
+			if (dict < 4 || dict > 6)
+				throw new InvalidDataException("Invalid dictionary size");	
+			
+			// output state
+			ushort next = 0; // index of next write location in out[]
+			bool first = true; // true to check distances (for first 4K)
+			byte[] outBuffer = new byte[MAXWIN]; // output buffer and sliding window
+			var ms = new MemoryStream();
+
+			// decode literals and length/distance pairs
+			do
+			{
+				// length/distance pair
+				if (br.ReadBits(1) == 1)
+				{
+					// Length
+					int symbol = Decode(lencode, br);
+					int len = lengthbase[symbol] + br.ReadBits(extra[symbol]);
+					if (len == 519) // Magic number for "done"
+					{
+						for (int i = 0; i < next; i++)
+							ms.WriteByte(outBuffer[i]);
+						break;
+					}
+					
+					// Distance
+					symbol = len == 2 ? 2 : dict;
+					int dist = Decode(distcode, br) << symbol;
+					dist += br.ReadBits(symbol);
+					dist++;
+					
+					if (first && dist > next)
+						throw new InvalidDataException("Attempt to jump before data");
+					
+					// copy length bytes from distance bytes back
+					do
+					{
+						int dest = next;
+						int source = dest - dist;
+						
+						int copy = MAXWIN;
+						if (next < dist)
+						{
+							source += copy;
+							copy = dist;
+						}
+						
+						copy -= next;
+						if (copy > len)
+							copy = len;
+						
+						len -= copy;
+						next += (ushort)copy;
+						Array.Copy(outBuffer, source, outBuffer, dest, copy);
+						
+						// Flush window to outstream
+						if (next == MAXWIN)
+						{
+							for (int i = 0; i < next; i++)
+								ms.WriteByte(outBuffer[i]);
+							next = 0;
+							first = false;
+						}
+					} while (len != 0);
+				}
+				else // literal value
+				{
+					int symbol = EncodedLiterals ? Decode(litcode, br) : br.ReadBits(8);
+					outBuffer[next++] = (byte)symbol;
+					if (next == MAXWIN)
+					{
+						for (int i = 0; i < next; i++)
+							ms.WriteByte(outBuffer[i]);
+						next = 0;
+						first = false;
+					}
+				}
+			} while (true);
+			
+			return ms.ToArray();
+		}
+		
+		// Decode a code using huffman table h.  
+		private static int Decode(Huffman h, BitReader br)
+		{
+			int code = 0; // len bits being decoded
+			int first = 0; // first code of length len
+			int index = 0; // index of first code of length len in symbol table
+			short next = 1;
+			while (true)
+			{
+				code |= br.ReadBits(1) ^ 1; // invert code
+				int count = h.Count[next++];
+				if (code < first + count)
+					return h.Symbol[index + (code - first)];
+
+				index += count;
+				first += count;
+				first <<= 1;
+				code <<= 1;
+			}
+		}
+	}
+	
+	class BitReader
+	{
+		readonly byte[] src;
+        int offset = 0;
+		int bitBuffer = 0;
+		int bitCount = 0;
+
+		public BitReader(byte[] src)
+		{
+            this.src = src;
+		}
+		
+		public int ReadBits(int count)
+		{
+			int ret = 0;
+			int filled = 0;
+			while (filled < count)
+			{
+				if (bitCount == 0)
+				{
+					bitBuffer = src[offset++];
+					bitCount = 8;
+				}
+				
+				ret |= (bitBuffer & 1) << filled;
+				bitBuffer >>= 1;
+				bitCount--;
+				filled++;
+			}
+			return ret;
+		}
+	}
+
+	/*
+	 * Given a list of repeated code lengths rep[0..n-1], where each byte is a
+	 * count (high four bits + 1) and a code length (low four bits), generate the
+	 * list of code lengths.  This compaction reduces the size of the object code.
+	 * Then given the list of code lengths length[0..n-1] representing a canonical
+	 * Huffman code for n symbols, construct the tables required to decode those
+	 * codes.  Those tables are the number of codes of each length, and the symbols
+	 * sorted by length, retaining their original order within each length.
+	 */
+	class Huffman
+	{
+		public short[] Count; // number of symbols of each length
+		public short[] Symbol; // canonically ordered symbols
+
+		public Huffman(byte[] rep, int n, short SymbolCount)
+		{
+			short[] length = new short[256]; // code lengths
+			int s = 0; // current symbol
+			
+			// convert compact repeat counts into symbol bit length list
+			foreach (byte code in rep)
+			{
+				int num = (code >> 4) + 1; // Number of codes (top four bits plus 1)
+				byte len = (byte)(code & 15); // Code length (low four bits)
+				do
+				{
+					length[s++] = len;
+				} while (--num > 0);
+			}
+			n = s;
+			
+			// count number of codes of each length
+			Count = new short[Blast.MAXBITS + 1];
+			for (int i = 0; i < n; i++)
+				Count[length[i]]++;
+			
+			// no codes!
+			if (Count[0] == n)
+				return;
+			
+			// check for an over-subscribed or incomplete set of lengths
+			int left = 1; // one possible code of zero length
+			for (int len = 1; len <= Blast.MAXBITS; len++)
+			{
+				left <<= 1;
+				// one more bit, double codes left
+				left -= Count[len];
+				// deduct count from possible codes
+				if (left < 0)
+					throw new InvalidDataException ("over subscribed code set");
+			}
+			
+			// generate offsets into symbol table for each length for sorting
+			short[] offs = new short[Blast.MAXBITS + 1];
+			for (int len = 1; len < Blast.MAXBITS; len++)
+				offs[len + 1] = (short)(offs[len] + Count[len]);
+			
+			// put symbols in table sorted by length, by symbol order within each length
+			Symbol = new short[SymbolCount];
+			for (short i = 0; i < n; i++)
+				if (length[i] != 0)
+					Symbol[offs[length[i]]++] = i;
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Format80.cs

@@ -35,6 +35,8 @@ namespace OpenRA.FileFormats
             Array.Copy(src, this.offset, dest, offset, count);
             this.offset += count;
         }
+
+		public int Remaining() { return src.Length - offset; }
     }
 
 	public static class Format80
@@ -121,5 +123,25 @@ namespace OpenRA.FileFormats
 				}
 			}
 		}
+
+		public static int EncodeInto(byte[] src, byte[] dest)
+		{
+			/* quick & dirty format80 encoder -- only uses raw copy operator, terminated with a zero-run. */
+			/* this does not produce good compression, but it's valid format80 */
+			
+			var destIndex = 0;
+			var ctx = new FastByteReader(src);
+
+			do
+			{
+				var len = Math.Min(ctx.Remaining(), 0x3F);
+				dest[destIndex++] = (byte)(0x80 | len);
+				if (len > 0)
+					ctx.CopyTo(dest, destIndex, len);
+			}
+			while (!ctx.Done());
+
+			return destIndex;
+		}
 	}
 }

OpenRA.FileFormats/Filesystem/FileSystem.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Linq;
 
 namespace OpenRA.FileFormats
 {
@@ -33,19 +34,43 @@ namespace OpenRA.FileFormats
 			}
 		}
 
+		static int order = 0;
+
 		static IFolder OpenPackage(string filename)
 		{
-			if (filename.EndsWith(".mix"))
-				return new Package(filename);
-			else if (filename.EndsWith(".zip"))
-				return new CompressedPackage(filename);
-			else
-				return new Folder(filename);
+            return OpenPackage(filename, order++);
 		}
 
+		public static IFolder CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
+        {
+			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
+                return new MixFile(filename, order, content);
+            else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+                return new ZipFile(filename, order, content);
+            else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+                return new ZipFile(filename, order, content);
+            else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+                throw new NotImplementedException("Creating .Z archives is unsupported");
+            else
+                return new Folder(filename, order, content);
+        }
+		
+        public static IFolder OpenPackage(string filename, int order)
+        {
+            if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
+                return new MixFile(filename, order);
+            else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+                return new ZipFile(filename, order);
+            else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+                return new ZipFile(filename, order);
+            else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+                return new InstallShieldPackage(filename, order);
+            else
+                return new Folder(filename, order);
+        }
+
 		public static void Mount(string name)
 		{
-			name = name.ToLowerInvariant();
 			var optional = name.StartsWith("~");
 			if (optional) name = name.Substring(1);
 
@@ -64,6 +89,16 @@ namespace OpenRA.FileFormats
 			allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
 		}
 
+		public static bool Unmount(IFolder mount)
+		{
+			return (mountedFolders.RemoveAll(f => f == mount) > 0);
+		}
+
+		public static void Mount(IFolder mount)
+		{
+			if (!mountedFolders.Contains(mount)) mountedFolders.Add(mount);
+		}
+
 		public static void LoadFromManifest( Manifest manifest )
 		{
 			UnmountAll();
@@ -73,9 +108,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))
+				.OrderBy(x => x.Priority)
+				.FirstOrDefault();
+
+			if (folder != null)
+				return folder.GetContent(filename);
+
 			return null;
 		}
 
@@ -88,11 +128,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/Filesystem/Folder.cs

@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.IO;
+using System;
 
 namespace OpenRA.FileFormats
 {
@@ -17,7 +18,24 @@ namespace OpenRA.FileFormats
 	{
 		readonly string path;
 
-		public Folder(string path) { this.path = path; }
+		int priority;
+
+		// Create a new folder package
+		public Folder(string path, int priority, Dictionary<string, byte[]> contents)
+		{
+			this.path = path;
+			this.priority = priority;
+			if (Directory.Exists(path))
+				Directory.Delete(path);
+			
+			Write(contents);
+		}
+		
+		public Folder(string path, int priority)
+		{
+			this.path = path;
+			this.priority = priority;
+		}
 
 		public Stream GetContent(string filename)
 		{
@@ -28,12 +46,26 @@ 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 priority; }
+		}
+		
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			foreach (var file in contents)
+				using (var dataStream = File.Create(Path.Combine(path, file.Key)))
+					using (var writer = new BinaryWriter(dataStream))
+				       writer.Write(file.Value);
+		}
 	}
 }

OpenRA.FileFormats/Filesystem/InstallShieldPackage.cs

@@ -0,0 +1,126 @@
+#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.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class InstallShieldPackage : IFolder
+	{
+		readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
+		readonly Stream s;
+		readonly long dataStart = 255;
+		int priority;
+
+		public InstallShieldPackage(string filename, int priority)
+		{
+			this.priority = priority;
+			s = FileSystem.Open(filename);
+
+			// Parse package header
+			BinaryReader reader = new BinaryReader(s);
+			uint signature = reader.ReadUInt32();
+			if (signature != 0x8C655D13)
+				throw new InvalidDataException("Not an Installshield package");
+			
+			reader.ReadBytes(8);
+			/*var FileCount = */reader.ReadUInt16();
+			reader.ReadBytes(4);
+			/*var ArchiveSize = */reader.ReadUInt32();
+			reader.ReadBytes(19);
+			var TOCAddress = reader.ReadInt32();
+			reader.ReadBytes(4);
+			var DirCount = reader.ReadUInt16();
+			
+			// Parse the directory list
+			s.Seek(TOCAddress, SeekOrigin.Begin);
+			BinaryReader TOCreader = new BinaryReader(s);
+			for (var i = 0; i < DirCount; i++)
+				ParseDirectory(TOCreader);
+		}
+
+		void ParseDirectory(BinaryReader reader)
+		{
+			// Parse directory header
+			var FileCount = reader.ReadUInt16();
+			var ChunkSize = reader.ReadUInt16();
+			var NameLength = reader.ReadUInt16();
+			reader.ReadChars(NameLength); //var DirName = new String(reader.ReadChars(NameLength));
+			
+			// Skip to the end of the chunk
+			reader.ReadBytes(ChunkSize - NameLength - 6);
+			
+			// Parse files
+			for (var i = 0; i < FileCount; i++)
+				ParseFile(reader);
+		}
+		
+		uint AccumulatedData = 0;
+		void ParseFile(BinaryReader reader)
+		{
+			reader.ReadBytes(7);
+			var CompressedSize = reader.ReadUInt32();
+			reader.ReadBytes(12);
+			var ChunkSize = reader.ReadUInt16();
+			reader.ReadBytes(4);
+			var NameLength = reader.ReadByte();
+			var FileName = new String(reader.ReadChars(NameLength));
+
+			var hash = PackageEntry.HashFilename(FileName);
+			index.Add(hash, new PackageEntry(hash,AccumulatedData, CompressedSize));
+			AccumulatedData += CompressedSize;
+			
+			// Skip to the end of the chunk
+			reader.ReadBytes(ChunkSize - NameLength - 30);
+		}
+		
+		public Stream GetContent(uint hash)
+		{
+			PackageEntry e;
+			if (!index.TryGetValue(hash, out e))
+				return null;
+
+			s.Seek( dataStart + e.Offset, SeekOrigin.Begin );
+			byte[] data = new byte[ e.Length ];
+			s.Read( data, 0, (int)e.Length );
+			
+			return new MemoryStream(Blast.Decompress(data));
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return GetContent(PackageEntry.HashFilename(filename));
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			return index.Keys;
+		}
+		
+		public bool Exists(string filename)
+		{
+			return index.ContainsKey(PackageEntry.HashFilename(filename));
+		}
+
+
+		public int Priority
+		{
+			get { return 2000 + priority; }
+		}
+		
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			throw new NotImplementedException("Cannot save InstallShieldPackages.");
+		}
+	}
+}

OpenRA.FileFormats/Filesystem/MixFile.cs

@@ -20,17 +20,32 @@ namespace OpenRA.FileFormats
 		Stream GetContent(string filename);
 		bool Exists(string filename);
 		IEnumerable<uint> AllFileHashes();
+		void Write(Dictionary<string, byte[]> contents);
+		int Priority { get; }
 	}
 
-	public class Package : IFolder
+	public class MixFile : IFolder
 	{
 		readonly Dictionary<uint, PackageEntry> index;
 		readonly bool isRmix, isEncrypted;
 		readonly long dataStart;
 		readonly Stream s;
-
-		public Package(string filename)
+		int priority;
+		
+		// Create a new MixFile
+		public MixFile(string filename, int priority, Dictionary<string, byte[]> contents)
 		{
+			this.priority = priority;
+			if (File.Exists(filename))
+				File.Delete(filename);
+			
+			s = File.Create(filename);
+			Write(contents);
+		}
+
+		public MixFile(string filename, int priority)
+		{
+			this.priority = priority;
 			s = FileSystem.Open(filename);
 
 			BinaryReader reader = new BinaryReader(s);
@@ -149,6 +164,51 @@ namespace OpenRA.FileFormats
 		{
 			return index.ContainsKey(PackageEntry.HashFilename(filename));
 		}
+
+
+		public int Priority
+		{
+			get { return 1000 + priority; }
+		}
+		
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			// Cannot modify existing mixfile - rename existing file and
+			// create a new one with original content plus modifications
+			FileSystem.Unmount(this);
+			
+			// TODO: Add existing data to the contents list
+			if (index.Count > 0)
+				throw new NotImplementedException("Updating mix files unfinished");
+		
+			// Construct a list of entries for the file header
+			uint dataSize = 0;
+			var items = new List<PackageEntry>();
+			foreach (var kv in contents)
+			{
+				uint length = (uint)kv.Value.Length;
+				uint hash = PackageEntry.HashFilename(Path.GetFileName(kv.Key));
+				items.Add(new PackageEntry(hash, dataSize, length));
+				dataSize += length;
+			}
+
+			// Write the new file
+			s.Seek(0,SeekOrigin.Begin);
+			using (var writer = new BinaryWriter(s))
+			{
+				// Write file header
+				writer.Write((ushort)items.Count);
+				writer.Write(dataSize);
+				foreach (var item in items)
+					item.Write(writer);
+
+				writer.Flush();
+
+				// Copy file data
+				foreach (var file in contents)
+					s.Write(file.Value);
+			}
+		}
 	}
 
 	[Flags]

OpenRA.FileFormats/Filesystem/ZipFile.cs

@@ -0,0 +1,117 @@
+#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.Collections.Generic;
+using System.IO;
+using ICSharpCode.SharpZipLib.Zip;
+using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
+
+namespace OpenRA.FileFormats
+{
+	public class ZipFile : IFolder
+	{
+		string filename;
+		SZipFile pkg;
+		int priority;
+
+		public ZipFile(string filename, int priority)
+		{
+			this.filename = filename;
+			this.priority = priority;
+			try
+			{
+				// pull the file into memory, dont keep it open.
+				pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
+			}
+			catch (ZipException e)
+			{
+				Log.Write("debug", "Couldn't load zip file: {0}", e.Message);
+			}
+		}
+
+		// Create a new zip with the specified contents
+		public ZipFile(string filename, int priority, Dictionary<string, byte[]> contents)
+		{
+			this.priority = priority;
+			this.filename = filename;
+
+			if (File.Exists(filename))
+				File.Delete(filename);
+			
+			pkg = SZipFile.Create(filename);
+			Write(contents);
+		}
+
+		public Stream GetContent(string filename)
+		{
+
+			using (var z = pkg.GetInputStream(pkg.GetEntry(filename)))
+			{
+				var ms = new MemoryStream();
+				int bufSize = 2048;
+				byte[] buf = new byte[bufSize];
+				while ((bufSize = z.Read(buf, 0, buf.Length)) > 0)
+					ms.Write(buf, 0, bufSize);
+
+				ms.Seek(0, SeekOrigin.Begin);
+				return ms;
+			}
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			foreach(ZipEntry entry in pkg)
+				yield return PackageEntry.HashFilename(entry.Name);
+		}
+		
+		public bool Exists(string filename)
+		{
+			return pkg.GetEntry(filename) != null;
+		}
+
+		public int Priority
+		{
+			get { return 500 + priority; }
+		}
+		
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			pkg.Close();
+
+			pkg = SZipFile.Create(filename);
+
+			pkg.BeginUpdate();
+			// TODO: Clear existing content?
+
+			foreach (var kvp in contents)
+				pkg.Add(new StaticMemoryDataSource(kvp.Value), kvp.Key);
+
+			pkg.CommitUpdate();
+
+			pkg.Close();
+
+			pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
+		}
+	}
+
+	class StaticMemoryDataSource : IStaticDataSource
+	{
+		byte[] data;
+		public StaticMemoryDataSource (byte[] data)
+		{
+			this.data = data;
+		}
+		
+		public Stream GetSource()
+		{
+			return new MemoryStream(data);
+		}
+	}
+}

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -33,14 +33,12 @@ namespace OpenRA.FileFormats.Graphics
 		IIndexBuffer CreateIndexBuffer( int length );
 		ITexture CreateTexture( Bitmap bitmap );
 		ITexture CreateTexture();
-		IShader CreateShader( Stream stream );
+		IShader CreateShader( string name );
 
 		Size WindowSize { get; }
 
-		void Begin();
-		void End();
 		void Clear( Color color );
-		void Present();
+		void Present( IInputHandler inputHandler );
 
 		void DrawIndexedPrimitives( PrimitiveType type, Range<int> vertexRange, Range<int> indexRange );
 		void DrawIndexedPrimitives( PrimitiveType type, int vertexPool, int numPrimitives );
@@ -52,13 +50,13 @@ namespace OpenRA.FileFormats.Graphics
 	public interface IVertexBuffer<T>
 	{
 		void Bind();
-		void SetData( T[] vertices );
+		void SetData( T[] vertices, int length );
 	}
 
 	public interface IIndexBuffer
 	{
 		void Bind();
-		void SetData( ushort[] indices );
+		void SetData( ushort[] indices, int length );
 	}
 
 	public interface IShader

OpenRA.FileFormats/Graphics/IInputHandler.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#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 
@@ -9,16 +9,33 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace OpenRA
 {
+	public interface IInputHandler
+	{
+		void ModifierKeys( Modifiers mods );
+		void OnKeyInput( KeyInput input );
+		void OnMouseInput( MouseInput input );
+	}
+
 	public struct MouseInput
 	{
 		public MouseInputEvent Event;
-		public int2 Location;
 		public MouseButton Button;
+		public int2 Location;
 		public Modifiers Modifiers;
+
+		public MouseInput( MouseInputEvent ev, MouseButton button, int2 location, Modifiers mods )
+		{
+			this.Event = ev;
+			this.Button = button;
+			this.Location = location;
+			this.Modifiers = mods;
+		}
 	}
 
 	public enum MouseInputEvent { Down, Move, Up };

OpenRA.FileFormats/Manifest.cs

@@ -18,15 +18,15 @@ namespace OpenRA.FileFormats
 	public class Manifest
 	{
 		public readonly string[]
-			Folders, Packages, Rules,
+			Mods, Folders, Packages, Rules, ServerTraits,
 			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
 			Weapons, Voices, Music, Movies, TileSets;
-
-		public readonly string ShellmapUid, LoadScreen;
+		public readonly string LoadScreen;
 		public readonly int TileSize = 24;
 
 		public Manifest(string[] mods)
 		{
+			Mods = mods;
 			var yaml = mods
 				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
 				.Aggregate(MiniYaml.Merge);
@@ -35,6 +35,7 @@ namespace OpenRA.FileFormats
 			Folders = YamlList(yaml, "Folders");
 			Packages = YamlList(yaml, "Packages");
 			Rules = YamlList(yaml, "Rules");
+			ServerTraits = YamlList(yaml, "ServerTraits");
 			Sequences = YamlList(yaml, "Sequences");
 			Cursors = YamlList(yaml, "Cursors");
 			Chrome = YamlList(yaml, "Chrome");
@@ -46,7 +47,6 @@ namespace OpenRA.FileFormats
 			Movies = YamlList(yaml, "Movies");
 			TileSets = YamlList(yaml, "TileSets");
 
-			ShellmapUid = yaml.First( x => x.Key == "ShellmapUid" ).Value.Value;
 			LoadScreen = yaml.First( x => x.Key == "LoadScreen" ).Value.Value;
 			
 			if (yaml.FirstOrDefault( x => x.Key == "TileSize" ) != null)

OpenRA.FileFormats/Map/MapStub.cs

@@ -12,18 +12,22 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Security.Cryptography;
 
 namespace OpenRA.FileFormats
 {
 	public class MapStub
 	{
-		public readonly IFolder Package;
+		protected IFolder Container;
+		public string Path {get; protected set;}
 		
 		// Yaml map data
-		public readonly string Uid;
-		[FieldLoader.Load] public bool Selectable;
+		public string Uid { get; protected set; }
+		[FieldLoader.Load] public bool Selectable;
+        [FieldLoader.Load] public bool UseAsShellmap;
 
 		[FieldLoader.Load] public string Title;
+		[FieldLoader.Load] public string Type = "Conquest";
 		[FieldLoader.Load] public string Description;
 		[FieldLoader.Load] public string Author;
 		[FieldLoader.Load] public int PlayerCount;
@@ -35,18 +39,33 @@ namespace OpenRA.FileFormats
 		
 		[FieldLoader.Load] public int2 TopLeft;
 		[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(IFolder package)
+		public Rectangle Bounds;
+		
+		public MapStub() {} // Hack for the editor - not used for anything important
+		
+		public MapStub(string path)
 		{
-			Package = package;
-			var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
+			Path = path;
+			Container = FileSystem.OpenPackage(path, int.MaxValue);
+			var yaml = MiniYaml.FromStream(Container.GetContent("map.yaml"));
 			FieldLoader.Load( this, new MiniYaml( null, yaml ) );
-			
-			Uid = Package.GetContent("map.uid").ReadAllText();
+			
+			Bounds = Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y);
+            Uid = ComputeHash();
 		}
 
+        string ComputeHash()
+        {
+            // UID is calculated by taking an SHA1 of the yaml and binary data
+            // Read the relevant data into a buffer
+            var data = Container.GetContent("map.yaml").ReadAllBytes()
+                .Concat(Container.GetContent("map.bin").ReadAllBytes()).ToArray();
+
+            // Take the SHA1
+            using (var csp = SHA1.Create())
+                return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
+        }
+
 		static object LoadWaypoints( MiniYaml y )
 		{
 			var ret = new Dictionary<string, int2>();

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

@@ -225,7 +225,7 @@ namespace OpenRA.FileFormats
 		{
 			return string.Join("\n", y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
 		}
-
+		
 		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
 		{
 			foreach (var kv in y)

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,6 +45,7 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
       <SpecificVersion>False</SpecificVersion>
@@ -53,20 +54,22 @@
     <Reference Include="WindowsBase">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Evaluator.cs" />
     <Compile Include="Exts.cs" />
     <Compile Include="FieldLoader.cs" />
-    <Compile Include="FileSystem.cs" />
-    <Compile Include="Folder.cs" />
     <Compile Include="Graphics\IGraphicsDevice.cs" />
+    <Compile Include="Graphics\IInputHandler.cs" />
     <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" />
     <Compile Include="Palette.cs" />
     <Compile Include="PlayerColorRemap.cs" />
     <Compile Include="Primitives\DisposableAction.cs" />
@@ -98,8 +101,13 @@
     <Compile Include="Map\MapStub.cs" />
     <Compile Include="Map\SmudgeReference.cs" />
     <Compile Include="Map\PlayerReference.cs" />
-    <Compile Include="CompressedPackage.cs" />
     <Compile Include="Graphics\VqaReader.cs" />
+    <Compile Include="Filesystem\MixFile.cs" />
+    <Compile Include="Filesystem\FileSystem.cs" />
+    <Compile Include="Filesystem\Folder.cs" />
+    <Compile Include="Filesystem\InstallShieldPackage.cs" />
+    <Compile Include="FileFormats\Blast.cs" />
+    <Compile Include="Filesystem\ZipFile.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -109,4 +117,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <Folder Include="Filesystem\" />
+  </ItemGroup>
 </Project>

OpenRA.FileFormats/PackageWriter.cs

@@ -1,48 +0,0 @@
-#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.Collections.Generic;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public static class PackageWriter
-	{
-		public static void CreateMix(string filename, List<string> contents)
-		{
-			// Construct a list of entries for the file header
-			uint dataSize = 0;
-			var items = new List<PackageEntry>();
-			foreach (var file in contents)
-			{
-				uint length = (uint)new FileInfo(file).Length;
-				uint hash = PackageEntry.HashFilename(Path.GetFileName(file));
-				items.Add(new PackageEntry(hash, dataSize, length));
-				dataSize += length;
-			}
-
-			using (var s = File.Create(filename))
-			using (var writer = new BinaryWriter(s))
-			{
-				// Write file header
-				writer.Write((ushort)items.Count);
-				writer.Write(dataSize);
-				foreach (var item in items)
-					item.Write(writer);
-
-				writer.Flush();
-
-				// Copy file data
-				foreach (var file in contents)
-					s.Write(File.ReadAllBytes(file));
-			}
-		}
-	}
-}

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

@@ -32,7 +32,7 @@ namespace OpenRA.FileFormats
 				.ToDictionary(u => u.First, u => u.Second);
 		}
 
-		static Color ColorLerp(float t, Color c1, Color c2)
+		public static Color ColorLerp(float t, Color c1, Color c2)
 		{
 			return Color.FromArgb(255,
 				(int)(t * c2.R + (1 - t) * c1.R),
@@ -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/float2.cs

@@ -62,7 +62,8 @@ namespace OpenRA
 				Constrain(Y, min.Y, max.Y));
 		}
 
-		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+        public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+        public static float2 operator *(float2 b, float a) { return new float2(a * b.X, a * b.Y); }
 		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
 		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
 

OpenRA.FileFormats/Primitives/int2.cs

@@ -25,6 +25,9 @@ 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 int2 operator -(int2 a) { return new int2(-a.X, -a.Y); }
 
 		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 +62,21 @@ 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;
+		}
+		
+		public int2 Clamp(Rectangle r)
+		{
+			return new int2(Math.Min(r.Right, Math.Max(X, r.Left)),
+			                Math.Min(r.Bottom, Math.Max(Y, r.Top)));
+		}
 	}
 }

OpenRA.FileFormats/Thirdparty/Random.cs

@@ -18,6 +18,8 @@ namespace OpenRA.Thirdparty
 	{
 		uint[] mt = new uint[624];
 		int index = 0;
+		
+		public int Last;
 
 		public Random() : this(Environment.TickCount) { }
 		
@@ -39,7 +41,8 @@ namespace OpenRA.Thirdparty
 			y ^= y >> 18;
 
 			index = (index + 1) % 624;
-			return (int)(y % int.MaxValue);
+			Last = (int)(y % int.MaxValue);
+			return Last;
 		}
 
 		public int Next(int low, int high) { return low + Next() % (high - low); }

OpenRA.Game/Actor.cs

@@ -6,17 +6,16 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using OpenRA.Support;
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Support;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA
 {
@@ -27,11 +26,12 @@ 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;
 
-		IActivity currentActivity;
+		private IActivity currentActivity;
 		public Group Group;
 
 		internal Actor(World world, string name, TypeDictionary initDict )
@@ -53,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>();
@@ -64,44 +61,25 @@ namespace OpenRA
 
 				// auto size from render
 				var firstSprite = TraitsImplementing<IRender>().SelectMany(x => x.Render(this)).FirstOrDefault();
-				if (firstSprite.Sprite == null) return float2.Zero;
-				return firstSprite.Sprite.size;
+				if (firstSprite.Sprite == null) return float2.Zero;
+                return firstSprite.Sprite.size * firstSprite.Scale;
 			});
 		}
 
 		public void Tick()
 		{
-			var wasIdle = currentActivity is Idle;
-			while (currentActivity != null)
-			{
-				var a = currentActivity;
-				
-				var sw = new Stopwatch();
-				currentActivity = a.Tick(this) ?? new Idle();
-				var dt = sw.ElapsedTime();
-				if(dt > Game.Settings.Debug.LongTickThreshold)
-					Log.Write("perf", "[{2}] Activity: {0} ({1:0.000} ms)", a, dt * 1000, Game.LocalTick);
-				
-				if (a == currentActivity) break;
+			if (currentActivity == null)
+				foreach (var ni in TraitsImplementing<INotifyIdle>())
+					ni.TickIdle(this);
 
-				if (currentActivity is Idle)
-				{
-					if (!wasIdle)
-						foreach (var ni in TraitsImplementing<INotifyIdle>())
-							ni.Idle(this);
-
-					break;
-				}
-			}
+			currentActivity = Util.RunActivity( this, currentActivity );
 		}
 
 		public bool IsIdle
 		{
-			get { return currentActivity == null || currentActivity is Idle; }
+			get { return currentActivity == null; }
 		}
 
-		public float2 CenterLocation;
-
         OpenRA.FileFormats.Lazy<float2> Size;
 
 		public IEnumerable<Renderable> Render()
@@ -111,30 +89,12 @@ namespace OpenRA
 			return mods.Aggregate(sprites, (m, p) => p.ModifyRender(this, m));
 		}
 
-		public Order Order( int2 xy, MouseInput mi, Actor underCursor )
-		{
-			if (Owner != World.LocalPlayer)
-				return null;
-
-			if (!World.Map.IsInMap(xy.X, xy.Y))
-				return null;
-
-			if (Destroyed)
-				return null;
-			
-			return TraitsImplementing<IIssueOrder>()
-				.OrderByDescending( x => x.OrderPriority( this, xy, mi, underCursor ) )
-				.Select( x => x.IssueOrder( this, xy, mi, underCursor ) )
-				.FirstOrDefault( x => x != null );
-		}
-
 		public RectangleF GetBounds(bool useAltitude)
 		{
-			var si = Info.Traits.GetOrDefault<SelectableInfo>();
-
 			var size = Size.Value;
-			var loc = CenterLocation - 0.5f * size;
+			var loc = CenterLocation - 0.5f * size;
 			
+			var si = Info.Traits.GetOrDefault<SelectableInfo>();
 			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
 				loc += new float2(si.Bounds[2], si.Bounds[3]);
 
@@ -147,21 +107,21 @@ namespace OpenRA
 			return new RectangleF(loc.X, loc.Y, size.X, size.Y);
 		}
 
-		public bool IsInWorld { get; internal set; }
+		public bool IsInWorld { get; internal set; }
+
+		public void QueueActivity( bool queued, IActivity nextActivity )
+		{
+			if( !queued )
+				CancelActivity();
+			QueueActivity( nextActivity );
+		}
 
 		public void QueueActivity( IActivity nextActivity )
 		{
 			if( currentActivity == null )
-			{
 				currentActivity = nextActivity;
-				return;
-			}
-			var act = currentActivity;
-			while( act.NextActivity != null )
-			{
-				act = act.NextActivity;
-			}
-			act.NextActivity = nextActivity;
+			else
+				currentActivity.Queue( nextActivity );
 		}
 
 		public void CancelActivity()
@@ -170,7 +130,6 @@ namespace OpenRA
 				currentActivity.Cancel( this );
 		}
 
-		// For pathdebug, et al
 		public IActivity GetCurrentActivity()
 		{
 			return currentActivity;
@@ -223,10 +182,24 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask( w =>
 			{
+				if (Destroyed) return;
+
 				World.Remove( this );
 				World.traitDict.RemoveActor( this );
 				Destroyed = true;
 			} );
 		}
+
+		// todo: move elsewhere.
+		public void ChangeOwner(Player newOwner)
+		{
+			World.AddFrameEndTask(w =>
+			{
+				// momentarily remove from world so the ownership queries don't get confused
+				w.Remove(this);
+				Owner = newOwner;
+				w.Add(this);
+			});
+		}
 	}
 }

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)
 		{
-			Game.Renderer.SpriteRenderer.DrawSprite(sequence.GetSprite(frame), pos - sequence.Hotspot, sequence.Palette);
+			sequence.GetSprite(frame).DrawAt(wr, pos - sequence.Hotspot, sequence.Palette);
 		}
 	}
 }

OpenRA.Game/Effects/MoveFlash.cs

@@ -1,46 +0,0 @@
-#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.Collections.Generic;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Effects
-{
-	public class MoveFlash : IEffect
-	{
-		Animation anim = new Animation("moveflsh");
-		float2 pos;
-
-		
-		public MoveFlash( World world, int2 cell )
-		{
-			this.pos = Game.CellSize * (cell + new float2(0.5f, 0.5f));
-			anim.PlayThen( "idle", 
-				() => world.AddFrameEndTask( 
-					w => w.Remove( this ) ) );
-		}
-		
-		public MoveFlash( World world, float2 pos )
-		{
-			this.pos = pos;
-			anim.PlayThen( "idle", 
-				() => world.AddFrameEndTask( 
-					w => w.Remove( this ) ) );
-		}
-
-		public void Tick( World world ) { anim.Tick(); }
-
-		public IEnumerable<Renderable> Render()
-		{
-			yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "shadow", (int)pos.Y);
-		}
-	}
-}

OpenRA.Game/Exts.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Support;
-using OpenRA.Traits;
 
 namespace OpenRA
 {
@@ -34,17 +33,17 @@ namespace OpenRA
 			return xs.Aggregate(1f, (a, x) => a * x);
 		}
 
-		public static V GetOrAdd<K, V>( this Dictionary<K, V> d, K k )
+		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
 			where V : new()
 		{
-			return d.GetOrAdd( k, _ => new V() );
+			return d.GetOrAdd(k, _ => new V());
 		}
 
-		public static V GetOrAdd<K, V>( this Dictionary<K, V> d, K k, Func<K, V> createFn )
+		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
 		{
 			V ret;
-			if( !d.TryGetValue( k, out ret ) )
-				d.Add( k, ret = createFn( k ) );
+			if (!d.TryGetValue(k, out ret))
+				d.Add(k, ret = createFn(k));
 			return ret;
 		}
 
@@ -54,18 +53,18 @@ namespace OpenRA
 			return xs[r.Next(xs.Length)];
 		}
 
-		public static void DoTimed<T>( this IEnumerable<T> e, Action<T> a, string text, double time )
+		public static void DoTimed<T>(this IEnumerable<T> e, Action<T> a, string text, double time)
 		{
 			var sw = new Stopwatch();
 
-			e.Do( x =>
+			e.Do(x =>
 			{
 				var t = sw.ElapsedTime();
-				a( x );
+				a(x);
 				var dt = sw.ElapsedTime() - t;
-				if( dt > time )
+				if (dt > time)
 					Log.Write("perf", text, x, dt * 1000, Game.LocalTick);
-			} );
+			});
 		}
 	}
 }

OpenRA.Game/Game.cs

@@ -6,23 +6,23 @@
  * 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.Net;
+using System.Windows.Forms;
 using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Graphics;
-using OpenRA.Network;
-using OpenRA.Server;
-using OpenRA.Support;
-using OpenRA.Traits;
-using OpenRA.Widgets;
-
-using Timer = OpenRA.Support.Timer;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Network;
+using OpenRA.Server;
+using OpenRA.Support;
+using OpenRA.Widgets;
+
 using XRandom = OpenRA.Thirdparty.Random;
 
 namespace OpenRA
@@ -32,189 +32,162 @@ 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;
 
 		internal static OrderManager orderManager;
+		static Server.Server server;
 
 		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 = null;	// trying to access the old world will NRE, rather than silently doing it wrong.
-			world = new World(modData.Manifest, map);
-		}
-
-		public static void MoveViewport(int2 loc)
+		public static void MoveViewport(float2 loc)
 		{
 			viewport.Center(loc);
 		}
 
-		internal static string CurrentHost = "";
-		internal static int CurrentPort = 0;
-
-		internal static void JoinServer(string host, int port)
+		public static void JoinServer(string host, int port)
 		{
-			if (orderManager != null) orderManager.Dispose();
+			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 ) );
 
-			CurrentHost = host;
-			CurrentPort = port;
-
-			lastConnectionState = ConnectionState.PreConnecting;
-			ConnectionStateChanged();
-
-			orderManager = new OrderManager(new NetworkConnection(host, port), ChooseReplayFilename());
-		}
+			JoinInner(new OrderManager(host, port, 
+				new ReplayRecorderConnection(new NetworkConnection(host, port), replayFile)));
+		}		
 
 		static string ChooseReplayFilename()
 		{
-			return DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddThhmmssZ.rep");
+			return DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddTHHmmssZ.rep");
+		}
+
+		static void JoinInner(OrderManager om)
+		{
+			if (orderManager != null) orderManager.Dispose();
+			orderManager = om;
+			lastConnectionState = ConnectionState.PreConnecting;
+			ConnectionStateChanged(orderManager);
+		}
+
+		public static void JoinReplay(string replayFile)
+		{
+			JoinInner(new OrderManager("<no server>", -1, new ReplayConnection(replayFile)));
 		}
 
 		static void JoinLocal()
 		{
-			lastConnectionState = ConnectionState.PreConnecting;
-			ConnectionStateChanged();
-
-			if (orderManager != null) orderManager.Dispose();
-			orderManager = new OrderManager(new EchoConnection());
+			JoinInner(new OrderManager("<no server>", -1, new EchoConnection()));
 		}
 
-		static int lastTime = Environment.TickCount;
-
-		static void ResetTimer()
-		{
-			lastTime = Environment.TickCount;
-		}
-
-		internal static int RenderFrame = 0;
-		internal static int LocalTick = 0;
+		public static int RenderFrame = 0;
+		public static int NetFrameNumber { get { return orderManager.NetFrameNumber; } }
+		public 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;
+
+		public static event Action<OrderManager> ConnectionStateChanged = _ => { };
+		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
 		public static int LocalClientId { get { return orderManager.Connection.LocalClientId; } }
 
-		static void Tick()
+		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;
-
-						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, new DefaultInputHandler( orderManager.world ));
 				Sound.SetListenerPosition(viewport.Location + .5f * new float2(viewport.Width, viewport.Height));
 			}
 
 			PerfHistory.items["render"].Tick();
 			PerfHistory.items["batches"].Tick();
-			PerfHistory.items["text"].Tick();
-			PerfHistory.items["cursor"].Tick();
 
 			MasterServerQuery.Tick();
 		}
 
-		internal static event Action LobbyInfoChanged = () => { };
-
-		internal static void SyncLobbyInfo(string data)
+		private static void Tick( OrderManager orderManager )
 		{
-			LobbyInfo = Session.Deserialize(data);
+			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(); } );
 
-			if( !world.GameHasStarted )
-				world.SharedRandom = new XRandom( LobbyInfo.GlobalSettings.RandomSeed );
+					if (world != null)
+					{
+						var isNetTick = LocalTick % NetTickScale == 0;
 
-			if (orderManager.Connection.ConnectionState == ConnectionState.Connected)
-				world.SetLocalPlayer(orderManager.Connection.LocalClientId);
+						if (!isNetTick || orderManager.IsReadyForNextFrame)
+						{
+							++orderManager.LocalFrameNumber;
 
-			if (orderManager.FramesAhead != LobbyInfo.GlobalSettings.OrderLatency
-				&& !orderManager.GameStarted)
-			{
-				orderManager.FramesAhead = LobbyInfo.GlobalSettings.OrderLatency;
-				Debug("Order lag is now {0} frames.".F(LobbyInfo.GlobalSettings.OrderLatency));
-			}
+							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();
+
+							PerfHistory.Tick();
+						}
+						else
+							if (orderManager.NetFrameNumber == 0)
+								orderManager.LastTickTime = Environment.TickCount;
+					}
+				}
+		}
+
+		public static event Action LobbyInfoChanged = () => { };
+
+		internal static void SyncLobbyInfo()
+		{
 			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)
 		{
 			BeforeGameStart();
-			LoadMap(map);
+
+			var map = modData.PrepareMap(mapUID);
+			viewport = new Viewport(new int2(Renderer.Resolution), map.Bounds, Renderer);
+			orderManager.world = new World(modData.Manifest, map, orderManager);
+			worldRenderer = new WorldRenderer(orderManager.world);
+
 			if (orderManager.GameStarted) return;
-			Widget.SelectedWidget = null;
+			Widget.SelectedWidget = null;
 
-			orderManager.StartGame();
-			viewport.RefreshPalette();
-			AfterGameStart();
-		}
-
-		public static void DispatchMouseInput(MouseInputEvent ev, MouseEventArgs e, Modifiers modifierKeys)
-		{
-			if (world == null)
-				return;
-			
-			int sync = world.SyncHash();
-			var initialWorld = world;
-
-			var mi = new MouseInput
-			{
-				Button = (MouseButton)(int)e.Button,
-				Event = ev,
-				Location = new int2(e.Location),
-				Modifiers = modifierKeys,
-			};
-			Widget.HandleInput(world, mi);
-
-			if (sync != world.SyncHash() && world == initialWorld)
-				throw new InvalidOperationException("Desync in DispatchMouseInput");
+			orderManager.LocalFrameNumber = 0;
+			orderManager.StartGame();
+			worldRenderer.RefreshPalette();
+			AfterGameStart( orderManager.world );
 		}
 
 		public static bool IsHost
@@ -222,118 +195,128 @@ 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)
-		{
-			if (world == null)
-				return;
-			
-			int sync = world.SyncHash();
-
-			if (Widget.HandleKeyPress(e))
-				return;
-
-			if (sync != Game.world.SyncHash())
-				throw new InvalidOperationException("Desync in OnKeyPress");
-		}
-
 		static Modifiers modifiers;
 		public static Modifiers GetModifierKeys() { return modifiers; }
-		public static void HandleModifierKeys(Modifiers mods) {	modifiers = mods; }
+		internal static void HandleModifierKeys(Modifiers mods) { modifiers = mods; }
 
 		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);
+
+			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 );
 			Renderer.SheetSize = Settings.Game.SheetSize;
 			Renderer = new Renderer();
 			
-			LobbyInfo.GlobalSettings.Mods = Settings.Game.Mods;
-			modData = new ModData( LobbyInfo.GlobalSettings.Mods );
+			Console.WriteLine("Available mods:");
+			foreach(var mod in Mod.AllMods)
+				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
 			
+			// Discard any invalid mods
+			var mods = Settings.Game.Mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
+			Console.WriteLine("Loading mods: {0}",string.Join(",",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;
-
-			
-			JoinLocal();
 
-
+			JoinLocal();
+
+			StartGame(ChooseShellmap());
+
+			// TODO: unhardcode this
+			modData.WidgetLoader.LoadWidget( new Dictionary<string,object>(), Widget.RootWidget, "PERF_BG" );
+			Widget.OpenWindow("MAINMENU_BG");
+
+			Game.orderManager.LastTickTime = Environment.TickCount;
 		}
 
+        static string ChooseShellmap()
+        {
+            var shellmaps =  modData.AvailableMaps
+                .Where(m => m.Value.UseAsShellmap);
+			
+			if (shellmaps.Count() == 0)
+				throw new InvalidDataException("No valid shellmaps available");
+			
+			return shellmaps.Random(CosmeticRandom).Key;
+        }
+
 		static bool quit;
 		internal static void Run()
 		{
 			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)
-		{
+		public static void Debug(string s, params object[] args)
+		{
+			AddChatLine(Color.White, "Debug", String.Format(s,args)); 
 		}
 
 		public static void Disconnect()
 		{
+			if (IsHost && server != null)
+				server.Shutdown();
+
 			orderManager.Dispose();
-			orderManager.Dispose();
-			var shellmap = modData.Manifest.ShellmapUid;
-			LobbyInfo = new Session();
+			var shellmap = ChooseShellmap();
 			JoinLocal();
 			StartGame(shellmap);
 
-
-			Widget.RootWidget.CloseWindow();
-			Widget.RootWidget.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);
-
+			Widget.CloseWindow();
+			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);
+
+				baseSupportDir = dir + Path.DirectorySeparatorChar;
 			}
-			}
+			get { return baseSupportDir; }
 		}
 
 		public static T CreateObject<T>( string name )
 		{
 			return modData.ObjectCreator.CreateObject<T>( name );
 		}
+
+		public static void CreateAndJoinServer(Settings settings, string map)
+		{
+			server = new Server.Server(modData, settings, map);
+			JoinServer(IPAddress.Loopback.ToString(), settings.Server.ListenPort);
+		}
 	}
-	}
+}

OpenRA.Game/GameRules/ActorInfo.cs

@@ -66,21 +66,21 @@ namespace OpenRA
 			var ret = new List<ITraitInfo>();
 			var t = Traits.WithInterface<ITraitInfo>().ToList();
 			int index = 0;
-			while( t.Count != 0 )
+			while (t.Count != 0)
 			{
-				if( index >= t.Count )
-					throw new InvalidOperationException( "Trait prerequisites not satisfied (or prerequisite loop) Actor={0} Unresolved={1}".F(
-						Name, string.Join( ",", t.Select( x => x.GetType().Name ).ToArray())));
-
-				var prereqs = PrerequisitesOf( t[ index ] );
-				if( prereqs.Count == 0 || prereqs.All( n => ret.Any( x => x.GetType() == n || x.GetType().IsSubclassOf( n ) ) ) )
+				var prereqs = PrerequisitesOf(t[index]);
+				var unsatisfied = prereqs.Where(n => !ret.Any(x => x.GetType() == n || x.GetType().IsSubclassOf(n)));
+				if (!unsatisfied.Any())
 				{
-					ret.Add( t[ index ] );
-					t.RemoveAt( index );
+					ret.Add(t[index]);
+					t.RemoveAt(index);
 					index = 0;
 				}
-				else
-					++index;
+				else if (++index >= t.Count)
+					throw new InvalidOperationException("Trait prerequisites not satisfied (or prerequisite loop) Actor={0} Unresolved={1} Missing={2}".F(
+						Name,
+						string.Join(",", t.Select(x => x.GetType().Name).ToArray()),
+						string.Join(",", unsatisfied.Select(x => x.Name).ToArray())));
 			}
 
 			return ret;

OpenRA.Game/GameRules/Rules.cs

@@ -27,9 +27,10 @@ namespace OpenRA
 
 		public static void LoadRules(Manifest m, Map map)
 		{
+			// Added support to extend the list of rules (add it to m.LocalRules)
 			Info = LoadYamlRules(m.Rules, map.Rules, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
-			Weapons = LoadYamlRules(m.Weapons, new List<MiniYamlNode>(), (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
-			Voices = LoadYamlRules(m.Voices, new List<MiniYamlNode>(), (k, _) => new VoiceInfo(k.Value));
+			Weapons = LoadYamlRules(m.Weapons, map.Weapons, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+			Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new VoiceInfo(k.Value));
 			Music = LoadYamlRules(m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
 			Movies = LoadYamlRules(m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
 			

OpenRA.Game/GameRules/Settings.cs

@@ -8,13 +8,14 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;
-using System;
+using OpenRA.Server;
 
 namespace OpenRA.GameRules
 {
@@ -24,23 +25,23 @@ namespace OpenRA.GameRules
 		public int ListenPort = 1234;
 		public int ExternalPort = 1234;
 		public bool AdvertiseOnline = true;
-		public string MasterServer = "http://open-ra.org/master/";
+		public string MasterServer = "http://master.open-ra.org/";
 		public bool AllowCheats = false;
 	}
 	
 	public class DebugSettings
 	{
+		public bool BotDebug = false;
 		public bool PerfGraph = false;
-		public bool RecordSyncReports = true;
-		public bool ShowCollisions = false;
 		public float LongTickThreshold = 0.001f;
 	}
-	
+
 	public class GraphicSettings
 	{
+		public string Renderer = "Gl";
 		public WindowMode Mode = WindowMode.PseudoFullscreen;
-		public int2 FullscreenSize = new int2(Screen.PrimaryScreen.Bounds.Width,Screen.PrimaryScreen.Bounds.Height);
-		public int2 WindowedSize = new int2(1024,768);
+		public int2 FullscreenSize = new int2(Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height);
+		public int2 WindowedSize = new int2(1024, 768);
 		public readonly int2 MinResolution = new int2(800, 600);
 	}
 	
@@ -66,9 +67,13 @@ 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;
+		public float ViewportEdgeScrollStep = 10f;
 
 		// Internal game settings
 		public int Timestep = 40;
@@ -106,12 +111,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)
@@ -123,7 +128,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;
@@ -133,16 +138,11 @@ namespace OpenRA.GameRules
 		{
 			var root = new List<MiniYamlNode>();
 			foreach( var kv in Sections )
-				root.Add( new MiniYamlNode( kv.Key, SectionYaml( kv.Value ) ) );
+				root.Add( new MiniYamlNode( kv.Key, FieldSaver.SaveDifferences(kv.Value, Activator.CreateInstance(kv.Value.GetType())) ) );
 			
 			root.WriteToFile(SettingsFile);
 		}
 		
-		MiniYaml SectionYaml(object section)
-		{
-			return FieldSaver.SaveDifferences(section, Activator.CreateInstance(section.GetType()));
-		}
-		
 		void LoadSectionYaml(MiniYaml yaml, object section)
 		{
 			object defaults = Activator.CreateInstance(section.GetType());

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/GameRules/WeaponInfo.cs

@@ -32,6 +32,7 @@ namespace OpenRA.GameRules
 		[FieldLoader.Load] public readonly int Damage = 0;									// how much (raw) damage to deal
 		[FieldLoader.Load] public readonly int Delay = 0;									// delay in ticks before dealing the damage. 0=instant (old model)
 		[FieldLoader.Load] public readonly DamageModel DamageModel = DamageModel.Normal;	// which damage model to use
+		[FieldLoader.Load] public readonly bool PreventProne = false;						// whether we should prevent prone response in infantry.
 
 		public float EffectivenessAgainst(Actor self)
 		{
@@ -92,6 +93,7 @@ namespace OpenRA.GameRules
 		[FieldLoader.Load] public readonly bool Underwater = false;
 		[FieldLoader.Load] public readonly string[] ValidTargets = { "Ground" };
 		[FieldLoader.Load] public readonly int BurstDelay = 5;
+		[FieldLoader.Load] public readonly float MinRange = 0;
 
 		[FieldLoader.LoadUsing( "LoadProjectile" )] public IProjectileInfo Projectile;
 		[FieldLoader.LoadUsing( "LoadWarheads" )] public List<WarheadInfo> Warheads;

OpenRA.Game/Graphics/Animation.cs

@@ -56,13 +56,14 @@ namespace OpenRA.Graphics
 			PlayThen( sequenceName, () => PlayRepeating( CurrentSequence.Name ) );
 		}
 
-		public void ReplaceAnim(string sequenceName)
+		public bool ReplaceAnim(string sequenceName)
 		{
 			if (!HasSequence(sequenceName))
-				return;
+				return false;
 
 			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
 			frame %= CurrentSequence.Length;
+			return true;
 		}
 
 		public void PlayThen( string sequenceName, Action after )
@@ -124,14 +125,15 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public void ChangeImage(string newImage)
+		public void ChangeImage(string newImage, string newAnimIfMissing)
 		{
 			newImage = newImage.ToLowerInvariant();
 			
 			if (name != newImage)
 			{
 				name = newImage.ToLowerInvariant();
-				ReplaceAnim(CurrentSequence.Name);
+				if (!ReplaceAnim(CurrentSequence.Name))
+					ReplaceAnim(newAnimIfMissing);
 			}
 		}
 

OpenRA.Game/Graphics/CursorSheetBuilder.cs

@@ -27,7 +27,7 @@ namespace OpenRA.Graphics
 		}
 
 		Sprite[] LoadCursors(string filename)
-		{
+        {
 			try
 			{
 				var shp = new Dune2ShpReader(FileSystem.OpenWithExts(filename, exts));

OpenRA.Game/Graphics/LineRenderer.cs

@@ -13,45 +13,46 @@ using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Graphics
 {
-	public class LineRenderer
+	public class LineRenderer : Renderer.IBatchRenderer
 	{
 		Renderer renderer;
-		IVertexBuffer<Vertex> vertexBuffer;
-		IIndexBuffer indexBuffer;            /* kindof a waste of space, but the GPU likes indexing, oh well */
 
-		const int linesPerBatch = 1024;
-
-		Vertex[] vertices = new Vertex[ 2 * linesPerBatch ];
-		ushort[] indices = new ushort[ 2 * linesPerBatch ];
-		int lines = 0;
+		Vertex[] vertices = new Vertex[ Renderer.TempBufferSize ];
+		ushort[] indices = new ushort[ Renderer.TempBufferSize ];
 		int nv = 0, ni = 0;
 
 		public LineRenderer( Renderer renderer )
 		{
 			this.renderer = renderer;
-			vertexBuffer = renderer.Device.CreateVertexBuffer(vertices.Length );
-			indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
 		}
 
 		public void Flush()
 		{
-			if( lines > 0 )
+			if( ni > 0 )
 			{
 				renderer.LineShader.Render( () =>
 				{
-					vertexBuffer.SetData( vertices );
-					indexBuffer.SetData( indices );
-					renderer.DrawBatch( vertexBuffer, indexBuffer,
+					var vb = renderer.GetTempVertexBuffer();
+					var ib = renderer.GetTempIndexBuffer();
+					vb.SetData( vertices, nv );
+					ib.SetData( indices, ni );
+					renderer.DrawBatch( vb, ib,
 					nv, ni / 2, PrimitiveType.LineList );
 				} );
 
 				nv = 0; ni = 0;
-				lines = 0;
 			}
 		}
 
 		public void DrawLine( float2 start, float2 end, Color startColor, Color endColor )
 		{
+			Renderer.CurrentBatchRenderer = this;
+
+			if( ni + 2 > Renderer.TempBufferSize )
+				Flush();
+			if( nv + 2 > Renderer.TempBufferSize )
+				Flush();
+
 			indices[ ni++ ] = (ushort)nv;
 
 			vertices[ nv++ ] = new Vertex( start,
@@ -63,9 +64,6 @@ namespace OpenRA.Graphics
 			vertices[ nv++ ] = new Vertex( end,
 			new float2( endColor.R / 255.0f, endColor.G / 255.0f ),
 			new float2( endColor.B / 255.0f, endColor.A / 255.0f ) );
-
-			if( ++lines >= linesPerBatch )
-				Flush();
 		}
 		
 		public void FillRect( RectangleF r, Color color )

OpenRA.Game/Graphics/Minimap.cs

@@ -28,12 +28,12 @@ namespace OpenRA.Graphics
 		public static Bitmap TerrainBitmap(Map map, bool actualSize)
 		{
 			var tileset = Rules.TileSets[map.Tileset];
-			var width = map.Width;
-			var height = map.Height;
+			var width = map.Bounds.Width;
+			var height = map.Bounds.Height;
 			
 			if (!actualSize)
 			{
-				width = height = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+				width = height = Util.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			}
 			
 			Bitmap terrain = new Bitmap(width, height);
@@ -45,11 +45,11 @@ namespace OpenRA.Graphics
 			{
 				int* c = (int*)bitmapData.Scan0;
 
-				for (var x = 0; x < map.Width; x++)
-					for (var y = 0; y < map.Height; y++)
+				for (var x = 0; x < map.Bounds.Width; x++)
+					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;
+						var mapX = x + map.Bounds.Left;
+						var mapY = y + map.Bounds.Top;
 						var type = tileset.GetTerrainType(map.MapTiles[mapX, mapY]);
 						if (!tileset.Terrain.ContainsKey(type))
 							throw new InvalidDataException("Tileset {0} lacks terraintype {1}".F(tileset.Id, type));
@@ -75,11 +75,11 @@ namespace OpenRA.Graphics
 			{
 				int* c = (int*)bitmapData.Scan0;
 
-				for (var x = 0; x < map.Width; x++)
-					for (var y = 0; y < map.Height; y++)
+				for (var x = 0; x < map.Bounds.Width; x++)
+					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;	
+						var mapX = x + map.Bounds.Left;
+						var mapY = y + map.Bounds.Top;	
 						if (map.MapResources[mapX, mapY].type == 0)
 							continue;
 					
@@ -100,7 +100,7 @@ namespace OpenRA.Graphics
 		public static Bitmap CustomTerrainBitmap(World world)
 		{
 			var map = world.Map;
-			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			var size = Util.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			Bitmap bitmap = new Bitmap(size, size);
 			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
@@ -109,11 +109,11 @@ namespace OpenRA.Graphics
 			{
 				int* c = (int*)bitmapData.Scan0;
 
-				for (var x = 0; x < map.Width; x++)
-					for (var y = 0; y < map.Height; y++)
+				for (var x = 0; x < map.Bounds.Width; x++)
+					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;
+						var mapX = x + map.Bounds.Left;
+						var mapY = y + map.Bounds.Top;
 						var custom = map.CustomTerrain[mapX,mapY];
 						if (custom == null)
 							continue;
@@ -127,7 +127,7 @@ namespace OpenRA.Graphics
 		public static Bitmap ActorsBitmap(World world)
 		{	
 			var map = world.Map;
-			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			var size = Util.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			Bitmap bitmap = new Bitmap(size, size);
 			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
@@ -135,16 +135,16 @@ namespace OpenRA.Graphics
 			unsafe
 			{
 				int* c = (int*)bitmapData.Scan0;
-				
-				foreach (var t in world.Queries.WithTraitMultiple<IRadarSignature>())
+
+				foreach (var t in world.Queries.WithTrait<IRadarSignature>())
 				{
-					if (!t.Actor.IsVisible(world.LocalPlayer))
+					if (!world.LocalShroud.IsVisible(t.Actor))
 						continue;
 					
 					var color = t.Trait.RadarSignatureColor(t.Actor);
 					foreach (var cell in t.Trait.RadarSignatureCells(t.Actor))
 						if (world.Map.IsInMap(cell))
-							*(c + ((cell.Y - world.Map.TopLeft.Y) * bitmapData.Stride >> 2) + cell.X - world.Map.TopLeft.X) = color.ToArgb();
+							*(c + ((cell.Y - world.Map.Bounds.Top) * bitmapData.Stride >> 2) + cell.X - world.Map.Bounds.Left) = color.ToArgb();
 				}
 			}
 
@@ -155,26 +155,29 @@ namespace OpenRA.Graphics
 		public static Bitmap ShroudBitmap(World world)
 		{	
 			var map = world.Map;
-			var size = Util.NextPowerOf2(Math.Max(map.Width, map.Height));
+			var size = Util.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			Bitmap bitmap = new Bitmap(size, size);
+			if (world.LocalShroud.Disabled)
+				return bitmap;
+			
 			var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
 
 			var shroud = Color.Black.ToArgb();
 			var fog = Color.FromArgb(128, Color.Black).ToArgb();
-						
+	
 			unsafe
 			{
 				int* c = (int*)bitmapData.Scan0;
 				
-				for (var x = 0; x < map.Width; x++)
-					for (var y = 0; y < map.Height; y++)
+				for (var x = 0; x < map.Bounds.Width; x++)
+					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.TopLeft.X;
-						var mapY = y + map.TopLeft.Y;
-						if (!world.LocalPlayer.Shroud.IsExplored(mapX, mapY))
+						var mapX = x + map.Bounds.Left;
+						var mapY = y + map.Bounds.Top;
+						if (!world.LocalShroud.IsExplored(mapX, mapY))
 							*(c + (y * bitmapData.Stride >> 2) + x) = shroud;
-						else if (!world.LocalPlayer.Shroud.IsVisible(mapX,mapY))					
+						else if (!world.LocalShroud.IsVisible(mapX,mapY))					
 							*(c + (y * bitmapData.Stride >> 2) + x) = fog;
 					}
 			}

OpenRA.Game/Graphics/Renderer.cs

@@ -9,13 +9,14 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
+using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;
 using OpenRA.Support;
-using System.Windows.Forms;
 
 namespace OpenRA.Graphics
 {
@@ -23,10 +24,10 @@ namespace OpenRA.Graphics
 	{
 		internal static int SheetSize;
 
-		public IShader SpriteShader { get; private set; }    /* note: shared shader params */
-		public IShader LineShader { get; private set; }
-		public IShader RgbaSpriteShader { get; private set; }
-		public IShader WorldSpriteShader { get; private set; }
+		internal IShader SpriteShader { get; private set; }    /* note: shared shader params */
+		internal IShader LineShader { get; private set; }
+		internal IShader RgbaSpriteShader { get; private set; }
+		internal IShader WorldSpriteShader { get; private set; }
 
 		public SpriteRenderer SpriteRenderer { get; private set; }
 		public SpriteRenderer RgbaSpriteRenderer { get; private set; }
@@ -35,14 +36,20 @@ namespace OpenRA.Graphics
 
 		public ITexture PaletteTexture;
 
-		public readonly SpriteFont RegularFont, BoldFont, TitleFont;
+        public readonly SpriteFont RegularFont, BoldFont, TitleFont, TinyFont;
+
+		internal const int TempBufferSize = 8192;
+		const int TempBufferCount = 8;
+
+		Queue<IVertexBuffer<Vertex>> tempBuffersV = new Queue<IVertexBuffer<Vertex>>();
+		Queue<IIndexBuffer> tempBuffersI = new Queue<IIndexBuffer>();
 
 		public Renderer()
 		{
-			SpriteShader = device.CreateShader(FileSystem.Open("shaders/world-shp.fx"));
-			LineShader = device.CreateShader(FileSystem.Open("shaders/line.fx"));
-			RgbaSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-rgba.fx"));
-			WorldSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-shp.fx"));
+			SpriteShader = device.CreateShader("world-shp");
+			LineShader = device.CreateShader("world-line");
+			RgbaSpriteShader = device.CreateShader("chrome-rgba");
+			WorldSpriteShader = device.CreateShader("chrome-shp");
 
 			SpriteRenderer = new SpriteRenderer( this, SpriteShader );
 			RgbaSpriteRenderer = new SpriteRenderer( this, RgbaSpriteShader );
@@ -52,13 +59,19 @@ namespace OpenRA.Graphics
 			RegularFont = new SpriteFont("FreeSans.ttf", 14);
 			BoldFont = new SpriteFont("FreeSansBold.ttf", 14);
 			TitleFont = new SpriteFont("titles.ttf", 48);
+            TinyFont = new SpriteFont("FreeSans.ttf", 10);
+
+			for( int i = 0 ; i < TempBufferCount ; i++ )
+			{
+				tempBuffersV.Enqueue( device.CreateVertexBuffer( TempBufferSize ) );
+				tempBuffersI.Enqueue( device.CreateIndexBuffer( TempBufferSize ) );
+			}
 		}
 
-		public IGraphicsDevice Device { get { return device; } }
+		internal IGraphicsDevice Device { get { return device; } }
 
 		public void BeginFrame(float2 scroll)
 		{
-			device.Begin();
 			device.Clear(Color.Black);
 
 			float2 r1 = new float2(2f/Resolution.Width, -2f/Resolution.Height);
@@ -73,16 +86,16 @@ namespace OpenRA.Graphics
 		private void SetShaderParams( IShader s, float2 r1, float2 r2, float2 scroll )
 		{
 			s.SetValue( "Palette", PaletteTexture );
-			s.SetValue( "Scroll", scroll.X, scroll.Y );
+			s.SetValue( "Scroll", (int) scroll.X, (int) scroll.Y );
 			s.SetValue( "r1", r1.X, r1.Y );
 			s.SetValue( "r2", r2.X, r2.Y );
 			s.Commit();
 		}
 
-		public void EndFrame()
+		public void EndFrame( IInputHandler inputHandler )
 		{
-			device.End();
-			device.Present();
+			Flush();
+			device.Present( inputHandler );
 		}
 
 		public void DrawBatch<T>(IVertexBuffer<T> vertices, IIndexBuffer indices,
@@ -111,15 +124,9 @@ namespace OpenRA.Graphics
 		
 		public void Flush()
 		{
-			WorldSpriteRenderer.Flush();
-			RgbaSpriteRenderer.Flush();
-			LineRenderer.Flush();
+			CurrentBatchRenderer = null;
 		}
 
-
-
-
-
 		static IGraphicsDevice device;
 
 		public static Size Resolution { get { return device.WindowSize; } }
@@ -127,14 +134,14 @@ namespace OpenRA.Graphics
 		internal static void Initialize( OpenRA.FileFormats.Graphics.WindowMode windowMode )
 		{
 			var resolution = GetResolution( windowMode );
-			device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRA.Gl.dll" ) ), resolution.Width, resolution.Height, windowMode, false );
+			device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRA.Renderer.{0}.dll".F(Game.Settings.Graphics.Renderer) ) ), resolution.Width, resolution.Height, windowMode, false );
 		}
 
 		static Size GetResolution(WindowMode windowmode)
 		{
-			var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
+			var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
 			var customSize = (windowmode == WindowMode.Windowed) ? Game.Settings.Graphics.WindowedSize : Game.Settings.Graphics.FullscreenSize;
-			
+			
 			if (customSize.X > 0 && customSize.Y > 0)
 			{
 				desktopResolution.Width = customSize.X;
@@ -154,5 +161,49 @@ namespace OpenRA.Graphics
 			}
 			throw new NotImplementedException();
 		}
+
+		internal IVertexBuffer<Vertex> GetTempVertexBuffer()
+		{
+			var ret = tempBuffersV.Dequeue();
+			tempBuffersV.Enqueue( ret );
+			return ret;
+		}
+
+		internal IIndexBuffer GetTempIndexBuffer()
+		{
+			var ret = tempBuffersI.Dequeue();
+			tempBuffersI.Enqueue( ret );
+			return ret;
+		}
+
+		public interface IBatchRenderer
+		{
+			void Flush();
+		}
+
+		static IBatchRenderer currentBatchRenderer;
+		public static IBatchRenderer CurrentBatchRenderer
+		{
+			get { return currentBatchRenderer; }
+			set
+			{
+				if( currentBatchRenderer == value ) return;
+				if( currentBatchRenderer != null )
+					currentBatchRenderer.Flush();
+				currentBatchRenderer = value;
+			}
+		}
+
+		public void EnableScissor(int left, int top, int width, int height)
+		{
+			Flush();
+			Device.EnableScissor( left, top, width, height );
+		}
+
+		public void DisableScissor()
+		{
+			Flush();
+			Device.DisableScissor();
+		}
 	}
 }

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -21,15 +21,13 @@ namespace OpenRA.Graphics
 	{
 		static Dictionary<string, Dictionary<string, Sequence>> units;
 
-		public static void Initialize(string[] sequenceFiles)
+		public static void Initialize(string[] sequenceFiles, List<MiniYamlNode> sequenceNodes)
 		{
 			units = new Dictionary<string, Dictionary<string, Sequence>>();
 			if (sequenceFiles.Length == 0)
 				return;
 
-			var sequences = sequenceFiles
-				.Select(s => MiniYaml.FromFile(s))
-				.Aggregate(MiniYaml.Merge);
+			var sequences = sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(sequenceNodes, MiniYaml.Merge);
 
 			foreach (var s in sequences)
 				LoadSequencesForUnit(s.Key, s.Value);

OpenRA.Game/Graphics/ShroudRenderer.cs

@@ -0,0 +1,161 @@
+#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.Traits;
+
+namespace OpenRA.Graphics
+{
+	public class ShroudRenderer
+	{
+		Traits.Shroud shroud;
+		Sprite[] shadowBits = SpriteSheetBuilder.LoadAllSprites("shadow");
+		Sprite[,] sprites, fogSprites;
+		
+		bool dirty = true;
+		Map map;
+
+		public ShroudRenderer(World world)
+		{
+			this.shroud = world.LocalShroud;
+			this.map = world.Map;
+			
+			sprites = new Sprite[map.MapSize.X, map.MapSize.Y];
+			fogSprites = new Sprite[map.MapSize.X, map.MapSize.Y];
+			shroud.Dirty += () => dirty = true;
+		}
+
+		static readonly byte[][] SpecialShroudTiles =
+		{
+			new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+			new byte[] { 32, 32, 25, 25, 19, 19, 20, 20 },
+			new byte[] { 33, 33, 33, 33, 26, 26, 26, 26, 21, 21, 21, 21, 23, 23, 23, 23 },
+			new byte[] { 36, 36, 36, 36, 30, 30, 30, 30 },
+			new byte[] { 34, 16, 34, 16, 34, 16, 34, 16, 27, 22, 27, 22, 27, 22, 27, 22 },
+			new byte[] { 44 },
+			new byte[] { 37, 37, 37, 37, 37, 37, 37, 37, 31, 31, 31, 31, 31, 31, 31, 31 },
+			new byte[] { 40 },
+			new byte[] { 35, 24, 17, 18 },
+			new byte[] { 39, 39, 29, 29 },
+			new byte[] { 45 },
+			new byte[] { 43 },
+			new byte[] { 38, 28 },
+			new byte[] { 42 },
+			new byte[] { 41 },
+			new byte[] { 46 },
+		};
+				
+		Sprite ChooseShroud(int i, int j)
+		{
+			if( !shroud.IsExplored( i, j ) ) return shadowBits[ 0xf ];
+
+			// bits are for unexploredness: up, right, down, left
+			var v = 0;
+			// bits are for unexploredness: TL, TR, BR, BL
+			var u = 0;
+
+			if( !shroud.IsExplored( i, j - 1 ) ) { v |= 1; u |= 3; }
+			if( !shroud.IsExplored( i + 1, j ) ) { v |= 2; u |= 6; }
+			if( !shroud.IsExplored( i, j + 1 ) ) { v |= 4; u |= 12; }
+			if( !shroud.IsExplored( i - 1, j ) ) { v |= 8; u |= 9; }
+
+			var uSides = u;
+
+			if( !shroud.IsExplored( i - 1, j - 1 ) ) u |= 1;
+			if( !shroud.IsExplored( i + 1, j - 1 ) ) u |= 2;
+			if( !shroud.IsExplored( i + 1, j + 1 ) ) u |= 4;
+			if( !shroud.IsExplored( i - 1, j + 1 ) ) u |= 8;
+
+			return shadowBits[ SpecialShroudTiles[ u ^ uSides ][ v ] ];
+		}
+				
+		Sprite ChooseFog(int i, int j)
+		{
+			if (!shroud.IsVisible(i,j)) return shadowBits[0xf];
+			if (!shroud.IsExplored(i, j)) return shadowBits[0xf];
+
+			// bits are for unexploredness: up, right, down, left
+			var v = 0;
+			// bits are for unexploredness: TL, TR, BR, BL
+			var u = 0;
+
+			if (!shroud.IsVisible(i, j - 1)) { v |= 1; u |= 3; }
+			if (!shroud.IsVisible(i + 1, j)) { v |= 2; u |= 6; }
+			if (!shroud.IsVisible(i, j + 1)) { v |= 4; u |= 12; }
+			if (!shroud.IsVisible(i - 1, j)) { v |= 8; u |= 9; }
+
+			var uSides = u;
+
+			if (!shroud.IsVisible(i - 1, j - 1)) u |= 1;
+			if (!shroud.IsVisible(i + 1, j - 1)) u |= 2;
+			if (!shroud.IsVisible(i + 1, j + 1)) u |= 4;
+			if (!shroud.IsVisible(i - 1, j + 1)) u |= 8;
+
+			return shadowBits[SpecialShroudTiles[u ^ uSides][v]];
+		}
+
+		internal void Draw( WorldRenderer wr )
+		{			
+			if (dirty)
+			{
+				dirty = false;
+				for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
+					for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
+						sprites[i, j] = ChooseShroud(i, j);
+				
+				for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
+					for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
+						fogSprites[i, j] = ChooseFog(i, j);
+			}
+
+			var clipRect = Game.viewport.WorldBounds(wr.world);
+			DrawShroud( wr, clipRect, fogSprites, "fog" );
+			DrawShroud( wr, clipRect, sprites, "shroud" );
+		}
+
+		void DrawShroud( WorldRenderer wr, Rectangle clip, Sprite[,] s, string pal )
+		{
+			var shroudPalette = wr.GetPaletteIndex(pal);
+
+			for (var j = clip.Top; j < clip.Bottom; j++)
+			{
+				var starti = clip.Left;
+				var last = shadowBits[0x0f];
+				for (var i = clip.Left; i < clip.Right; i++)
+				{
+					if ((s[i, j] == shadowBits[0x0f] && last == shadowBits[0x0f])
+						|| (s[i, j] == shadowBits[0] && last == shadowBits[0]))
+						continue;
+
+					if (starti != i)
+					{
+						s[starti, j].DrawAt(
+							Game.CellSize * new float2(starti, j),
+							shroudPalette,
+							new float2(Game.CellSize * (i - starti), Game.CellSize));
+						starti = i + 1;
+					}
+
+					s[i, j].DrawAt(
+						Game.CellSize * new float2(i, j),
+						shroudPalette);
+					starti = i + 1;
+					last = s[i, j];
+				}
+
+				if (starti < clip.Right)
+					s[starti, j].DrawAt(
+						Game.CellSize * new float2(starti, j),
+						shroudPalette,
+						new float2(Game.CellSize * (clip.Right - starti), Game.CellSize));
+			}
+		}
+	}
+}

OpenRA.Game/Graphics/Sprite.cs

@@ -49,6 +49,26 @@ namespace OpenRA.Graphics
 		{
 			return uvhax[ k ];
 		}
+
+		public void DrawAt( WorldRenderer wr, float2 location, string palette )
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite( this, location, wr, palette, this.size );
+		}
+
+		public void DrawAt( float2 location, int paletteIndex )
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, this.size );
+		}
+
+        public void DrawAt(float2 location, int paletteIndex, float scale)
+        {
+            Game.Renderer.SpriteRenderer.DrawSprite(this, location, paletteIndex, this.size * scale);
+        }
+
+		public void DrawAt( float2 location, int paletteIndex, float2 size )
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, size );
+		}
 	}
 
 	public enum TextureChannel

OpenRA.Game/Graphics/SpriteFont.cs

@@ -80,17 +80,20 @@ namespace OpenRA.Graphics
 		GlyphInfo CreateGlyph(Pair<char,Color> c)
 		{
 			var index = FT.FT_Get_Char_Index(face, (uint)c.First);
-			FT.FT_Load_Glyph(face, index, FT.FT_LOAD_RENDER);
+			if (0 != FT.FT_Load_Glyph(face, index, FT.FT_LOAD_RENDER))
+				throw new InvalidOperationException( "FT_Load_Glyph failed." );
 
 			var _face = (FT_FaceRec)Marshal.PtrToStructure(face, typeof(FT_FaceRec));
 			var _glyph = (FT_GlyphSlotRec)Marshal.PtrToStructure(_face.glyph, typeof(FT_GlyphSlotRec));
 
-			var s = builder.Allocate(new Size(_glyph.metrics.width >> 6, _glyph.metrics.height >> 6));
+			var s = builder.Allocate(
+				new Size(_glyph.metrics.width.ToInt32() >> 6, 
+					_glyph.metrics.height.ToInt32() >> 6));
 
 			var g = new GlyphInfo
 			{
 				Sprite = s,
-				Advance = _glyph.metrics.horiAdvance / 64f,
+				Advance = _glyph.metrics.horiAdvance.ToInt32() / 64f,
 				Offset = { X = _glyph.bitmap_left, Y = -_glyph.bitmap_top }
 			};
 

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -12,28 +12,20 @@ using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Graphics
 {
-	public class SpriteRenderer
+	public class SpriteRenderer : Renderer.IBatchRenderer
 	{
-		IVertexBuffer<Vertex> vertexBuffer;
-		IIndexBuffer indexBuffer;
 		Renderer renderer;
 		IShader shader;
 
-		const int spritesPerBatch = 1024;
-
-		Vertex[] vertices = new Vertex[4 * spritesPerBatch];
-		ushort[] indices = new ushort[6 * spritesPerBatch];
+		Vertex[] vertices = new Vertex[Renderer.TempBufferSize];
+		ushort[] indices = new ushort[Renderer.TempBufferSize];
 		Sheet currentSheet = null;
-		int sprites = 0;
 		int nv = 0, ni = 0;
 
 		public SpriteRenderer(Renderer renderer, IShader shader)
 		{
 			this.renderer = renderer;
 			this.shader = shader;
-
-			vertexBuffer = renderer.Device.CreateVertexBuffer( vertices.Length );
-			indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
 		}
 
 		public SpriteRenderer(Renderer renderer)
@@ -41,14 +33,16 @@ namespace OpenRA.Graphics
 
 		public void Flush()
 		{
-			if (sprites > 0)
+			if (ni > 0)
 			{
 				shader.SetValue( "DiffuseTexture", currentSheet.Texture );
 				shader.Render(() =>
 				{
-					vertexBuffer.SetData(vertices);
-					indexBuffer.SetData(indices);
-					renderer.DrawBatch(vertexBuffer, indexBuffer,
+					var vb = renderer.GetTempVertexBuffer();
+					var ib = renderer.GetTempIndexBuffer();
+					vb.SetData(vertices, nv);
+					ib.SetData(indices, ni);
+					renderer.DrawBatch(vb, ib,
 						new Range<int>(0, nv),
 						new Range<int>(0, ni),
 						PrimitiveType.TriangleList,
@@ -57,30 +51,34 @@ namespace OpenRA.Graphics
 
 				nv = 0; ni = 0;
 				currentSheet = null;
-				sprites = 0;
 			}
 		}
 				
-		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)
 		{
+			Renderer.CurrentBatchRenderer = this;
+
 			if (s.sheet != currentSheet)
 				Flush();
 
+			if( nv + 4 > Renderer.TempBufferSize )
+				Flush();
+			if( ni + 6 > Renderer.TempBufferSize )
+				Flush();
+
 			currentSheet = s.sheet;
 			Util.FastCreateQuad(vertices, indices, location.ToInt2(), s, paletteIndex, nv, ni, size);
 			nv += 4; ni += 6;
-			if (++sprites >= spritesPerBatch)
-				Flush();
 		}
 		
 		

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -34,15 +34,16 @@ namespace OpenRA.Graphics
 			var tileMapping = new Cache<TileReference<ushort,byte>, Sprite>(
 				x => Game.modData.SheetBuilder.Add(world.TileSet.GetBytes(x), tileSize));
 
-			Vertex[] vertices = new Vertex[4 * map.Height * map.Width];
-			ushort[] indices = new ushort[6 * map.Height * map.Width];
+			Vertex[] vertices = new Vertex[4 * map.Bounds.Height * map.Bounds.Width];
+			ushort[] indices = new ushort[6 * map.Bounds.Height * map.Bounds.Width];
 
-			terrainSheet = tileMapping[map.MapTiles[map.TopLeft.X, map.TopLeft.Y]].sheet;
+			terrainSheet = tileMapping[map.MapTiles[map.Bounds.Left, map.Bounds.Top]].sheet;
 
 			int nv = 0;
 			int ni = 0;
-			for( int j = map.TopLeft.Y ; j < map.BottomRight.Y; j++ )
-				for( int i = map.TopLeft.X ; i < map.BottomRight.X; i++ )
+			
+			for( int j = map.Bounds.Top; j < map.Bounds.Bottom; j++ )
+				for( int i = map.Bounds.Left; i < map.Bounds.Right; i++ )
 				{
 					Sprite tile = tileMapping[map.MapTiles[i, j]];
 					// TODO: The zero below should explicitly refer to the terrain palette, but this code is called
@@ -56,36 +57,36 @@ namespace OpenRA.Graphics
 				}
 
 			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer( vertices.Length );
-			vertexBuffer.SetData( vertices );
+			vertexBuffer.SetData( vertices, nv );
 
 			indexBuffer = Game.Renderer.Device.CreateIndexBuffer( indices.Length );
-			indexBuffer.SetData( indices );
+			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;
+			int indicesPerRow = map.Bounds.Width * 6;
+			int verticesPerRow = map.Bounds.Width * 4;
 
 			int visibleRows = (int)(viewport.Height * 1f / Game.CellSize + 2);
 
-			int firstRow = (int)(viewport.Location.Y * 1f / Game.CellSize - map.YOffset);
+			int firstRow = (int)(viewport.Location.Y * 1f / Game.CellSize - map.Bounds.Top);
 			int lastRow = firstRow + visibleRows;
 
-			if (lastRow < 0 || firstRow > map.Height)
+			if (lastRow < 0 || firstRow > map.Bounds.Height)
 				return;
 
 			if (firstRow < 0) firstRow = 0;
-			if (lastRow > map.Height) lastRow = map.Height;
+			if (lastRow > map.Bounds.Height) lastRow = map.Bounds.Height;
 
-			if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.Disabled && world.LocalPlayer.Shroud.Bounds.HasValue)
+			if (world.LocalPlayer != null && !world.LocalShroud.Disabled && world.LocalShroud.Bounds.HasValue)
 			{
-				var r = world.LocalPlayer.Shroud.Bounds.Value;
-				if (firstRow < r.Top - map.YOffset)
-					firstRow = r.Top - map.YOffset;
+				var r = world.LocalShroud.Bounds.Value;
+				if (firstRow < r.Top - map.Bounds.Top)
+					firstRow = r.Top - map.Bounds.Top;
 
-				if (firstRow > r.Bottom - map.YOffset)
-					firstRow = r.Bottom - map.YOffset;
+				if (firstRow > r.Bottom - map.Bounds.Top)
+					firstRow = r.Bottom - map.Bounds.Top;
 			}
 
 			if( lastRow < firstRow ) lastRow = firstRow;
@@ -98,7 +99,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

@@ -8,10 +8,10 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Support;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
@@ -19,16 +19,15 @@ namespace OpenRA.Graphics
 {
 	public class Viewport
 	{
-		readonly float2 screenSize;
-		float2 scrollPosition;
+		readonly int2 screenSize;
+		int2 scrollPosition;
 		readonly Renderer renderer;
-		readonly int2 mapStart;
-		readonly int2 mapEnd;
+		readonly Rectangle adjustedMapBounds;
 
 		public float2 Location { get { return scrollPosition; } }
 
-		public int Width { get { return (int)screenSize.X; } }
-		public int Height { get { return (int)screenSize.Y; } }
+		public int Width { get { return screenSize.X; } }
+		public int Height { get { return screenSize.Y; } }
 
 		float cursorFrame = 0f;
 
@@ -42,7 +41,8 @@ namespace OpenRA.Graphics
 		
 		public void Scroll(float2 delta, bool ignoreBorders)
 		{
-			float2 newScrollPosition = scrollPosition + delta;
+			var d = delta.ToInt2();
+			var newScrollPosition = scrollPosition + d;
 			
 			if(!ignoreBorders)
 				newScrollPosition = this.NormalizeScrollPosition(newScrollPosition);
@@ -50,80 +50,52 @@ namespace OpenRA.Graphics
 			scrollPosition = newScrollPosition;
 		}
 		
-		private float2 NormalizeScrollPosition(float2 newScrollPosition)
+		private int2 NormalizeScrollPosition(int2 newScrollPosition)
 		{
-			float2 topLeftBorder = (Game.CellSize* mapStart).ToFloat2();
-			float2 bottomRightBorder = (Game.CellSize* mapEnd).ToFloat2();
-		  
-			if(newScrollPosition.Y < topLeftBorder.Y - screenSize.Y/2)
-				newScrollPosition.Y = topLeftBorder.Y - screenSize.Y/2;
-			if(newScrollPosition.X < topLeftBorder.X - screenSize.X/2)
-				newScrollPosition.X = topLeftBorder.X - screenSize.X/2;
-			if(newScrollPosition.Y > bottomRightBorder.Y - screenSize.Y/2)
-				newScrollPosition.Y = bottomRightBorder.Y - screenSize.Y/2;
-			if(newScrollPosition.X > bottomRightBorder.X - screenSize.X/2)
-				newScrollPosition.X = bottomRightBorder.X - screenSize.X/2;
-			
-			return newScrollPosition;
+			return newScrollPosition.Clamp(adjustedMapBounds);
 		}
 		
 		public ScrollDirection GetBlockedDirections()
 		{
-			int2 topLeftBorder = (Game.CellSize* mapStart);
-			int2 bottomRightBorder = (Game.CellSize* mapEnd);
-			
 			ScrollDirection blockedDirections = ScrollDirection.None;
-			
-			if(scrollPosition.Y <= topLeftBorder.Y - screenSize.Y/2)
+			if(scrollPosition.Y <= adjustedMapBounds.Top)
 				blockedDirections = blockedDirections.Set(ScrollDirection.Up, true);
-			if(scrollPosition.X <= topLeftBorder.X - screenSize.X/2)
+			if(scrollPosition.X <= adjustedMapBounds.Left)
 				blockedDirections = blockedDirections.Set(ScrollDirection.Left, true);
-			if(scrollPosition.Y >= bottomRightBorder.Y - screenSize.Y/2)
+			if(scrollPosition.Y >= adjustedMapBounds.Bottom)
 				blockedDirections = blockedDirections.Set(ScrollDirection.Down, true);
-		  	if(scrollPosition.X >= bottomRightBorder.X - screenSize.X/2)
+		  	if(scrollPosition.X >= adjustedMapBounds.Right)
 				blockedDirections = blockedDirections.Set(ScrollDirection.Right, true);
 			
 			return blockedDirections;
 		}
 
-		public Viewport(float2 screenSize, int2 mapStart, int2 mapEnd, Renderer renderer)
+		public Viewport(int2 screenSize, Rectangle mapBounds, Renderer renderer)
 		{
 			this.screenSize = screenSize;
 			this.renderer = renderer;
-			this.mapStart = mapStart;
-			this.mapEnd = mapEnd;
-
-			this.scrollPosition = Game.CellSize* mapStart;
+			this.adjustedMapBounds = new Rectangle(Game.CellSize*mapBounds.X - screenSize.X/2,
+			                                       Game.CellSize*mapBounds.Y - screenSize.Y/2,
+			                                       Game.CellSize*mapBounds.Width,
+			                                       Game.CellSize*mapBounds.Height);
+			this.scrollPosition = new int2(adjustedMapBounds.Location) + new int2(adjustedMapBounds.Size)/2;
 		}
 		
-		public void DrawRegions( World world )
+		public void DrawRegions( WorldRenderer wr, IInputHandler inputHandler )
 		{
 			renderer.BeginFrame(scrollPosition);
-			world.WorldRenderer.Draw();
-
-			Widget.DoDraw(world);
-
+			
+			wr.Draw();
+			Widget.DoDraw( wr );
 			var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-			var c = new Cursor(cursorName);
-			c.Draw((int)cursorFrame, Viewport.LastMousePos + Location); 
+			new Cursor(cursorName).Draw(wr, (int)cursorFrame, Viewport.LastMousePos + Location); 
 
-			renderer.RgbaSpriteRenderer.Flush();
-			renderer.SpriteRenderer.Flush();
-			renderer.WorldSpriteRenderer.Flush();
-
-			renderer.EndFrame();
-		}
-
-		public void RefreshPalette()
-		{
-			Game.world.WorldRenderer.palette.Update(
-				Game.world.WorldActor.TraitsImplementing<IPaletteModifier>());
+			renderer.EndFrame( inputHandler );
 		}
 
 		public void Tick()
 		{
 			cursorFrame += 0.5f;
-			RefreshPalette();
 		}
 
 		public float2 ViewToWorld(int2 loc)
@@ -135,9 +107,9 @@ namespace OpenRA.Graphics
 			return ViewToWorld(mi.Location);
 		}
 		
-		public void Center(int2 loc)
+		public void Center(float2 loc)
 		{
-			scrollPosition = this.NormalizeScrollPosition(Game.CellSize*loc - .5f * new float2(Width, Height));
+			scrollPosition = this.NormalizeScrollPosition((Game.CellSize*loc - screenSize / 2).ToInt2());
 		}
 
 		public void Center(IEnumerable<Actor> actors)
@@ -148,15 +120,40 @@ namespace OpenRA.Graphics
 				.Select(a => a.CenterLocation)
 				.Aggregate((a, b) => a + b);
 
-			scrollPosition = this.NormalizeScrollPosition((avgPos - .5f * new float2(Width, Height)));
+			scrollPosition = this.NormalizeScrollPosition((avgPos.ToInt2() - screenSize / 2));
+		}
+		
+		public Rectangle ViewBounds(World world)
+		{
+			var r = WorldBounds(world);
+			var left = (int)(Game.CellSize * r.Left - Game.viewport.Location.X);
+			var top = (int)(Game.CellSize * r.Top - Game.viewport.Location.Y);
+			var right = left + (int)(Game.CellSize * r.Width);
+			var bottom = top + (int)(Game.CellSize * r.Height);
+			
+			if (left < 0) left = 0;
+			if (top < 0) top = 0;
+			if (right > Game.viewport.Width) right = Game.viewport.Width;
+			if (bottom > Game.viewport.Height) bottom = Game.viewport.Height;
+			return new Rectangle(left, top, right - left, bottom - top);
 		}
 
-		public Rectangle? ShroudBounds()
+		int2 cachedScroll = new int2(int.MaxValue, int.MaxValue);
+		Rectangle cachedRect;
+		
+		public Rectangle WorldBounds(World world)
 		{
-			var localPlayer = Game.world.LocalPlayer;
-			if (localPlayer == null) return null;
-			if (localPlayer.Shroud.Disabled) return null;
-			return localPlayer.Shroud.Bounds;
+			if (cachedScroll != scrollPosition)
+			{
+				int2 boundary = new int2(1,1); // Add a curtain of cells around the viewport to account for rounding errors
+				var tl = ViewToWorld(int2.Zero).ToInt2() - boundary;
+				var br = ViewToWorld(new int2(Width, Height)).ToInt2() + boundary;
+				cachedRect = Rectangle.Intersect(Rectangle.FromLTRB(tl.X, tl.Y, br.X, br.Y), world.Map.Bounds);
+				cachedScroll = scrollPosition;
+			}
+			
+			var b = world.LocalShroud.Bounds;
+			return (b.HasValue) ? Rectangle.Intersect(cachedRect, b.Value) : cachedRect;
 		}
 	}
 }

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -19,9 +19,11 @@ namespace OpenRA.Graphics
 {
 	public class WorldRenderer
 	{
-		readonly World world;
+		public readonly World world;
 		internal readonly TerrainRenderer terrainRenderer;
-		internal readonly UiOverlay uiOverlay;
+		internal readonly ShroudRenderer shroudRenderer;
+
+		public readonly UiOverlay uiOverlay;
 		internal readonly HardwarePalette palette;
 
 		internal WorldRenderer(World world)
@@ -29,8 +31,12 @@ namespace OpenRA.Graphics
 			this.world = world;
 
 			terrainRenderer = new TerrainRenderer(world, this);
+			shroudRenderer = new ShroudRenderer(world);
 			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); }
@@ -45,32 +51,9 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		Rectangle GetBoundsRect()
+		IEnumerable<Renderable> SpritesToRender()
 		{
-			if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.Disabled && world.LocalPlayer.Shroud.Bounds.HasValue)
-			{
-				var r = world.LocalPlayer.Shroud.Bounds.Value;
-
-				var left = (int)(Game.CellSize * r.Left - Game.viewport.Location.X);
-				var top = (int)(Game.CellSize * r.Top - Game.viewport.Location.Y);
-				var right = left + (int)(Game.CellSize * r.Width);
-				var bottom = top + (int)(Game.CellSize * r.Height);
-
-				if (left < 0) left = 0;
-				if (top < 0) top = 0;
-				if (right > Game.viewport.Width) right = Game.viewport.Width;
-				if (bottom > Game.viewport.Height) bottom = Game.viewport.Height;
-
-				return new Rectangle(left, top, right - left, bottom - top);
-			}
-			else
-				return new Rectangle(0, 0, Game.viewport.Width, Game.viewport.Height);
-		}
-
-		Renderable[] worldSprites = { };
-		public void Tick()
-		{
-			var bounds = GetBoundsRect();
+			var bounds = Game.viewport.ViewBounds(world);
 			var comparer = new SpriteComparer();
 
 			bounds.Offset((int)Game.viewport.Location.X, (int)Game.viewport.Location.Y);
@@ -84,38 +67,52 @@ namespace OpenRA.Graphics
 
 			var effects = world.Effects.SelectMany(e => e.Render());
 
-			worldSprites = renderables.Concat(effects).ToArray();
+			return renderables.Concat(effects);
 		}
 
 		public void Draw()
 		{
-			var bounds = GetBoundsRect();
-			Game.Renderer.Device.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
+			RefreshPalette();
+			var bounds = Game.viewport.ViewBounds(world);
+			Game.Renderer.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
 
-			terrainRenderer.Draw(Game.viewport);
+			terrainRenderer.Draw(this, Game.viewport);
+			foreach (var a in world.traitDict.ActorsWithTraitMultiple<IRenderAsTerrain>(world))
+				foreach (var r in a.Trait.RenderAsTerrain(a.Actor))
+					r.Sprite.DrawAt(r.Pos, this.GetPaletteIndex(r.Palette), r.Scale);
+
+			foreach (var a in world.Selection.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
+						t.RenderBeforeWorld(this, a);
+			
+			Game.Renderer.Flush();
+			
+			if (world.OrderGenerator != null)
+				world.OrderGenerator.RenderBeforeWorld(this, world);
+
+            foreach (var image in SpritesToRender() )
+                image.Sprite.DrawAt(image.Pos, this.GetPaletteIndex(image.Palette), image.Scale);
+		    uiOverlay.Draw(this, world);
+
+			// added for contrails
+			foreach (var a in world.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPostRender>())
+						t.RenderAfterWorld(this, a);
 
 			if (world.OrderGenerator != null)
-				world.OrderGenerator.RenderBeforeWorld(world);
+				world.OrderGenerator.RenderAfterWorld(this, world);
 
-			Game.Renderer.SpriteRenderer.Flush();
-			Game.Renderer.LineRenderer.Flush();
+			shroudRenderer.Draw( this );
+			Game.Renderer.DisableScissor();
+			
+			foreach (var a in world.Selection.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
+						t.RenderAfterWorld(this, a);
 
-			foreach (var image in worldSprites)
-				Game.Renderer.SpriteRenderer.DrawSprite(image.Sprite, image.Pos, image.Palette);
-			uiOverlay.Draw(world);
-			Game.Renderer.SpriteRenderer.Flush();
-
-			if (world.OrderGenerator != null)
-				world.OrderGenerator.RenderAfterWorld(world);
-
-			if (world.LocalPlayer != null)
-				world.LocalPlayer.Shroud.Draw();
-
-			Game.Renderer.SpriteRenderer.Flush();
-
-			Game.Renderer.Device.DisableScissor();
-
-			Game.Renderer.LineRenderer.Flush();
+			Game.Renderer.Flush();
 		}
 
 		void DrawBox(RectangleF r, Color color)
@@ -129,20 +126,6 @@ namespace OpenRA.Graphics
 			Game.Renderer.LineRenderer.DrawLine(a, a + c, color, color);
 		}
 
-		void DrawBins(RectangleF bounds)
-		{
-			DrawBox(bounds, Color.Red);
-			if (world.LocalPlayer != null)
-				DrawBox(world.LocalPlayer.Shroud.Bounds.Value, Color.Blue);
-
-			for (var j = 0; j < world.Map.MapSize.Y;
-				j += world.WorldActor.Info.Traits.Get<SpatialBinsInfo>().BinSize)
-			{
-				Game.Renderer.LineRenderer.DrawLine(new float2(0, j * Game.CellSize), new float2(world.Map.MapSize.X * Game.CellSize, j * Game.CellSize), Color.Black, Color.Black);
-				Game.Renderer.LineRenderer.DrawLine(new float2(j * Game.CellSize, 0), new float2(j * Game.CellSize, world.Map.MapSize.Y * Game.CellSize), Color.Black, Color.Black);
-			}
-		}
-
 		public void DrawSelectionBox(Actor selectedUnit, Color c)
 		{
 			var bounds = selectedUnit.GetBounds(true);
@@ -183,7 +166,7 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public void DrawRangeCircle(Color c, float2 location, int range)
+		public void DrawRangeCircle(Color c, float2 location, float range)
 		{
 			var prev = location + Game.CellSize * range * float2.FromAngle(0);
 			for (var i = 1; i <= 32; i++)
@@ -193,5 +176,10 @@ namespace OpenRA.Graphics
 				prev = pos;
 			}
 		}
+
+		public void RefreshPalette()
+		{
+			palette.Update( world.WorldActor.TraitsImplementing<IPaletteModifier>() );
+		}
 	}
 }

OpenRA.Game/InputHandler.cs

@@ -0,0 +1,52 @@
+#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 OpenRA.Widgets;
+
+namespace OpenRA
+{
+	public class NullInputHandler : IInputHandler
+	{
+		// ignore all input
+		public void ModifierKeys( Modifiers mods ) { }
+		public void OnKeyInput( KeyInput input ) { }
+		public void OnMouseInput( MouseInput input ) { }
+	}
+
+	public class DefaultInputHandler : IInputHandler
+	{
+		readonly World world;
+		public DefaultInputHandler( World world )
+		{
+			this.world = world;
+		}
+
+		public void ModifierKeys( Modifiers mods )
+		{
+			Game.HandleModifierKeys( mods );
+		}
+
+		public void OnKeyInput( KeyInput input )
+		{
+			Sync.CheckSyncUnchanged( world, () =>
+			{
+				Widget.HandleKeyPress( input );
+			} );
+		}
+
+		public void OnMouseInput( MouseInput input )
+		{
+			Sync.CheckSyncUnchanged( world, () =>
+			{
+				Widget.HandleInput( input );
+			} );
+		}
+	}
+}

OpenRA.Game/Map.cs

@@ -16,76 +16,65 @@ using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
 using OpenRA.FileFormats;
+using System.Text;
 
 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
+
+		// Rules overrides
 		public List<MiniYamlNode> Rules = new List<MiniYamlNode>();
 
+		// Sequences overrides
+		public List<MiniYamlNode> Sequences = new List<MiniYamlNode>();
+
+		// Weapon overrides
+		public List<MiniYamlNode> Weapons = new List<MiniYamlNode>();
+
+		// Voices overrides
+		public List<MiniYamlNode> Voices = new List<MiniYamlNode>();
+
 		// Binary map data
 		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;
 		public string [,] CustomTerrain;
 
-		// 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()
 		{
 			// Do nothing; not a valid map (editor hack)
 		}
 		
-		public Map(string tileset)
+		public static Map FromTileset(string tileset)
 		{
-			MapSize = new int2(1, 1);
-			Tileset = tileset;
-			MapResources = new TileReference<byte, byte>[1, 1];
-			
-			var tile = OpenRA.Rules.TileSets[Tileset].Templates.First();
-			MapTiles = new TileReference<ushort, byte>[1, 1] 
+			var tile = OpenRA.Rules.TileSets[tileset].Templates.First();
+			Map map = new Map()
+			{
+				Title = "Name your map here",
+				Description = "Describe your map here",
+				Author = "Your name here",
+				MapSize = new int2(1, 1),
+				PlayerCount = 0,
+				Tileset = tileset,
+				MapResources = new TileReference<byte, byte>[1, 1],
+				MapTiles = new TileReference<ushort, byte>[1, 1] 
 				{ { new TileReference<ushort, byte> { 
 					type = tile.Key, 
 					image = (byte)(tile.Value.PickAny ? 0xffu : 0), 
-					index = (byte)(tile.Value.PickAny ? 0xffu : 0) } } };
-
-			PlayerCount = 0;
-			TopLeft = new int2(0, 0);
-			BottomRight = new int2(0, 0);
-
-			Title = "Name your map here";
-			Description = "Describe your map here";
-			Author = "Your name here";
+					index = (byte)(tile.Value.PickAny ? 0xffu : 0) }
+				} },
+			};
+			
+			return map;
 		}
 
 		class Format2ActorReference
@@ -95,21 +84,15 @@ namespace OpenRA
 			public int2 Location = int2.Zero;
 			public string Owner = null;
 		}
-
-		public Map(IFolder package)
+		
+		public Map(string path)
+			: base(path)
 		{
-			Package = package;
-			var yaml = new MiniYaml( null, MiniYaml.FromStream( Package.GetContent( "map.yaml" ) ) );
+			var yaml = new MiniYaml( null, MiniYaml.FromStream( Container.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.
@@ -198,19 +181,29 @@ namespace OpenRA
 			// Rules
 			Rules = yaml.NodesDict["Rules"].Nodes;
 
+			// Sequences
+			Sequences = (yaml.NodesDict.ContainsKey("Sequences")) ? yaml.NodesDict["Sequences"].Nodes : new List<MiniYamlNode>();
+
+			// Weapons
+			Weapons = (yaml.NodesDict.ContainsKey("Weapons")) ? yaml.NodesDict["Weapons"].Nodes : new List<MiniYamlNode>();
+			
+			// Voices
+			Voices = (yaml.NodesDict.ContainsKey("Voices")) ? yaml.NodesDict["Voices"].Nodes : new List<MiniYamlNode>();
+
 			CustomTerrain = new string[MapSize.X, MapSize.Y];			
-			LoadUid();
 			LoadBinaryData();
 		}
 
-		public void Save(string filepath)
-		{
+		public void Save(string toPath)
+		{			
+			Console.WriteLine("Saving map to path {0}",toPath);
+			// Todo: save to a zip file in the support dir by default
 			MapFormat = 3;
 			
 			var root = new List<MiniYamlNode>();
-			foreach (var field in new string[] {"Selectable", "MapFormat", "Title", "Description", "Author", "PlayerCount", "Tileset", "MapSize", "TopLeft", "BottomRight"})
+			foreach (var field in new string[] {"Selectable", "MapFormat", "Title", "Description", "Author", "PlayerCount", "Tileset", "MapSize", "TopLeft", "BottomRight", "UseAsShellmap", "Type"})
 			{
-				FieldInfo f = this.GetType().GetField(field);
+				var f = this.GetType().GetField(field);
 				if (f.GetValue(this) == null) continue;
 				root.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
 			}
@@ -225,13 +218,30 @@ namespace OpenRA
 					x.Key,
 					x.Value.Save() ) ).ToList() ) );
 
-			root.Add( new MiniYamlNode( "Waypoints", MiniYaml.FromDictionary<string, int2>( Waypoints ) ) );
-			root.Add( new MiniYamlNode( "Smudges", MiniYaml.FromList<SmudgeReference>( Smudges ) ) );
-			root.Add( new MiniYamlNode( "Rules", null, Rules ) );
-
-			SaveBinaryData(Path.Combine(filepath, "map.bin"));
-			root.WriteToFile(Path.Combine(filepath, "map.yaml"));
-			SaveUid(Path.Combine(filepath, "map.uid"));
+			root.Add(new MiniYamlNode("Waypoints", MiniYaml.FromDictionary<string, int2>( Waypoints )));
+			root.Add(new MiniYamlNode("Smudges", MiniYaml.FromList<SmudgeReference>( Smudges )));
+			root.Add(new MiniYamlNode("Rules", null, Rules));
+			root.Add(new MiniYamlNode("Sequences", null, Sequences));
+			root.Add(new MiniYamlNode("Weapons", null, Weapons));
+			root.Add(new MiniYamlNode("Voices", null, Voices));
+			
+			Dictionary<string, byte[]> entries = new Dictionary<string, byte[]>();
+			entries.Add("map.bin", SaveBinaryData());
+			var s = root.WriteToString();
+			entries.Add("map.yaml", Encoding.UTF8.GetBytes(s));
+			
+			// Saving the map to a new location
+			if (toPath != Path)
+			{
+				Path = toPath;
+				
+				// Create a new map package
+				// TODO: Add other files (resources, rules) to the entries list
+				Container = FileSystem.CreatePackage(Path, int.MaxValue, entries);
+			}
+			
+			// Update existing package
+			Container.Write(entries);
 		}
 
 		static byte ReadByte(Stream s)
@@ -252,7 +262,7 @@ namespace OpenRA
 
 		public void LoadBinaryData()
 		{
-			using (var dataStream = Package.GetContent("map.bin"))
+			using (var dataStream = Container.GetContent("map.bin"))
 			{
 				if (ReadByte(dataStream) != 1)
 					throw new InvalidDataException("Unknown binary map format");
@@ -284,9 +294,9 @@ namespace OpenRA
 			}
 		}
 
-		public void SaveBinaryData(string filepath)
+		public byte[] SaveBinaryData()
 		{
-			using (var dataStream = File.Create(filepath + ".tmp"))
+			MemoryStream dataStream = new MemoryStream();
 			using (var writer = new BinaryWriter(dataStream))
 			{
 				// File header consists of a version byte, followed by 2 ushorts for width and height
@@ -310,27 +320,7 @@ namespace OpenRA
 						writer.Write(MapResources[i, j].index);
 					}
 			}
-			File.Delete(filepath);
-			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
-			// Read the relevant data into a buffer
-			var data = Package.GetContent("map.yaml").ReadAllBytes()
-				.Concat(Package.GetContent("map.bin").ReadAllBytes()).ToArray();
-
-			// Take the SHA1
-			using (var csp = SHA1.Create())
-				Uid = new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
-
-			File.WriteAllText(filename, Uid);
+			return dataStream.ToArray();
 		}
 
 		public bool IsInMap(int2 xy)
@@ -340,7 +330,7 @@ namespace OpenRA
 
 		public bool IsInMap(int x, int y)
 		{
-			return (x >= TopLeft.X && y >= TopLeft.Y && x < BottomRight.X && y < BottomRight.Y);
+			return Bounds.Contains(x,y);
 		}
 
 		static T[,] ResizeArray<T>(T[,] ts, T t, int width, int height)
@@ -359,5 +349,12 @@ namespace OpenRA
 			MapResources = ResizeArray(MapResources, MapResources[0, 0], width, height);
 			MapSize = new int2(width, height);
 		}
+		
+		public void ResizeCordon(int left, int top, int right, int bottom)
+		{
+			TopLeft = new int2(left, top);
+			BottomRight = new int2(right, bottom);
+			Bounds = Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y);
+		}
 	}
 }

OpenRA.Game/ModData.cs

@@ -13,7 +13,6 @@ using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Support;
 
 namespace OpenRA
 {
@@ -21,37 +20,64 @@ namespace OpenRA
 	{
 		public readonly Manifest Manifest;
 		public readonly ObjectCreator ObjectCreator;
-		public readonly SheetBuilder SheetBuilder;
-		public readonly CursorSheetBuilder CursorSheetBuilder;
 		public readonly Dictionary<string, MapStub> AvailableMaps;
+		public readonly WidgetLoader WidgetLoader;
 		public ILoadScreen LoadScreen = null;
-		
+		public SheetBuilder SheetBuilder;
+		public CursorSheetBuilder CursorSheetBuilder;
+
 		public ModData( params string[] mods )
-		{
+		{		
 			Manifest = new Manifest( mods );
 			ObjectCreator = new ObjectCreator( Manifest );
 			LoadScreen = ObjectCreator.CreateObject<ILoadScreen>(Manifest.LoadScreen);
 			LoadScreen.Init();
 			LoadScreen.Display();
 			
+            // all this manipulation of static crap here is nasty and breaks 
+            // horribly when you use ModData in unexpected ways.
+
 			FileSystem.LoadFromManifest( Manifest );
 			ChromeProvider.Initialize( Manifest.Chrome );
 			SheetBuilder = new SheetBuilder( TextureChannel.Red );
 			CursorSheetBuilder = new CursorSheetBuilder( this );
 			AvailableMaps = FindMaps( mods );
+			WidgetLoader = new WidgetLoader( this );
 		}
 		
-		// TODO: Do this nicer
+        public static IEnumerable<string> FindMapsIn(string dir)
+        {
+            string[] NoMaps = { };
+
+            if (!Directory.Exists(dir))
+                return NoMaps;
+
+            // todo: look for compressed maps too.
+            return Directory.GetDirectories(dir)
+                .Concat(Directory.GetFiles(dir, "*.zip"))
+                .Concat(Directory.GetFiles(dir, "*.oramap"));
+        }
+
 		Dictionary<string, MapStub> FindMaps(string[] mods)
 		{
-			var paths = new[] { "maps/" }.Concat(mods.Select(m => "mods/" + m + "/maps/"))
-				.Where(p => Directory.Exists(p))
-				.SelectMany(p => Directory.GetDirectories(p)).ToList();
+            var paths = mods.SelectMany(p => FindMapsIn("mods/" + p + "/maps/"));
 
-			return paths.Select(p => new MapStub(new Folder(p))).ToDictionary(m => m.Uid);
+			Dictionary<string, MapStub> ret = new Dictionary<string, MapStub>();
+			foreach (var path in paths)
+			{
+				var map = new MapStub(path);
+				if (ret.ContainsKey(map.Uid))
+					System.Console.WriteLine("Ignoring duplicate map: {0}", path);
+				else
+					ret.Add(map.Uid, map);
+			}
+			return ret;
 		}
 		
-		string cachedTheatre = null;
+		string cachedTileset = null;
+		bool previousMapHadSequences = true;
+		IFolder previousMapMount = null;
+
 		public Map PrepareMap(string uid)
 		{
 			LoadScreen.Display();
@@ -59,16 +85,32 @@ namespace OpenRA
 			if (!AvailableMaps.ContainsKey(uid))
 				throw new InvalidDataException("Invalid map uid: {0}".F(uid));
 			
-			var map = new Map(AvailableMaps[uid].Package);
-			
+			var map = new Map(AvailableMaps[uid].Path);
+
+			// unload the previous map mount if we have one
+			if (previousMapMount != null) FileSystem.Unmount(previousMapMount);
+
+			// Adds the map its container to the FileSystem
+			// allowing the map to use custom assets
+			// Container should have the lowest priority of all (ie int max)
+			// Store a reference so we can unload it next time
+			previousMapMount = FileSystem.OpenPackage(map.Path, int.MaxValue);
+			FileSystem.Mount(previousMapMount);
 			Rules.LoadRules(Manifest, map);
-			if (map.Theater != cachedTheatre)
+
+			if (map.Tileset != cachedTileset
+				|| previousMapHadSequences || map.Sequences.Count > 0)
 			{
+				SheetBuilder = new SheetBuilder( TextureChannel.Red );
 				SpriteSheetBuilder.Initialize( Rules.TileSets[map.Tileset] );
-				SequenceProvider.Initialize(Manifest.Sequences);
+				CursorSheetBuilder = new CursorSheetBuilder( this );
 				CursorProvider.Initialize(Manifest.Cursors);
-				cachedTheatre = map.Theater;
+				SequenceProvider.Initialize(Manifest.Sequences, map.Sequences);
+				cachedTileset = map.Tileset;
 			}
+
+			previousMapHadSequences = map.Sequences.Count > 0;
+
 			return map;
 		}
 	}

OpenRA.Game/Network/Connection.cs

@@ -18,7 +18,7 @@ using OpenRA.Support;
 
 namespace OpenRA.Network
 {
-	enum ConnectionState
+    public enum ConnectionState
 	{
 		PreConnecting,
 		NotConnected,
@@ -26,11 +26,13 @@ namespace OpenRA.Network
 		Connected,
 	}
 
-	interface IConnection
+    public 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,26 +157,42 @@ 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 */ }
+			catch (InvalidOperationException) { /* ditto */ }
 		}
 
 		bool disposed = false;
 
-		public void Dispose ()
+		public override void Dispose ()
 		{
 			if (disposed) return;
 			disposed = true;
@@ -160,48 +207,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/Handshake.cs

@@ -0,0 +1,73 @@
+#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.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+
+namespace OpenRA.Network
+{
+	public class HandshakeRequest
+	{
+		[FieldLoader.Load] public string[] Mods;
+		[FieldLoader.Load] public string Map;
+		
+		public string Serialize()
+		{
+			var data = new List<MiniYamlNode>();
+			data.Add(new MiniYamlNode("Handshake", FieldSaver.Save(this)));
+			return data.WriteToString();
+		}
+
+		public static HandshakeRequest Deserialize(string data)
+		{
+			var handshake = new HandshakeRequest();
+			FieldLoader.Load(handshake, MiniYaml.FromString(data).First().Value);
+			return handshake;
+		}
+	}
+	
+	public class HandshakeResponse
+	{
+		[FieldLoader.Load] public string[] Mods;
+		[FieldLoader.Load] public string Password;
+		public Session.Client Client;
+		
+		public string Serialize()
+		{
+			var data = new List<MiniYamlNode>();
+			data.Add( new MiniYamlNode( "Handshake", null,
+				new string[]{ "Mods", "Password" }.Select( p => FieldSaver.SaveField(this, p) ).ToList() ) );
+			data.Add(new MiniYamlNode("Client", FieldSaver.Save(Client)));
+			
+			return data.WriteToString();
+		}
+
+		public static HandshakeResponse Deserialize(string data)
+		{
+			var handshake = new HandshakeResponse();
+			handshake.Client = new Session.Client();
+			
+			var ys = MiniYaml.FromString(data);
+			foreach (var y in ys)
+				switch (y.Key)
+				{
+					case "Handshake":
+						FieldLoader.Load(handshake, y.Value);
+					break;
+					case "Client":
+						FieldLoader.Load(handshake.Client, y.Value);
+					break;
+				}
+			return handshake;
+		}
+	}
+}

OpenRA.Game/Network/Order.cs

@@ -11,23 +11,43 @@
 using System;
 using System.IO;
 using System.Linq;
+using OpenRA.Network;
 
 namespace OpenRA
 {
+	[Flags]
+	enum OrderFields : byte
+	{
+		TargetActor = 0x01, 
+		TargetLocation = 0x02, 
+		TargetString = 0x04, 
+		Queued = 0x08, 
+		ExtraLocation = 0x10,
+	}
+
+	static class OrderFieldsExts
+	{
+		public static bool HasField(this OrderFields of, OrderFields f)
+		{
+			return (of & f) != 0;
+		}
+	}
+
 	public sealed class Order
 	{
 		public readonly string OrderString;
 		public readonly Actor Subject;
-		public readonly Actor TargetActor;
-		public readonly int2 TargetLocation;
-		public readonly string TargetString;
 		public readonly bool Queued;
+		public Actor TargetActor;
+		public int2 TargetLocation;
+		public string TargetString;
+		public int2 ExtraLocation;
 		public bool IsImmediate;
 		
 		public Player Player { get { return Subject.Owner; } }
 
-		public Order(string orderString, Actor subject, 
-			Actor targetActor, int2 targetLocation, string targetString, bool queued)
+		Order(string orderString, Actor subject, 
+			Actor targetActor, int2 targetLocation, string targetString, bool queued, int2 extraLocation)
 		{
 			this.OrderString = orderString;
 			this.Subject = subject;
@@ -35,24 +55,15 @@ namespace OpenRA
 			this.TargetLocation = targetLocation;
 			this.TargetString = targetString;
 			this.Queued = queued;
+			this.ExtraLocation = extraLocation;
 		}
 
-		public Order(string orderString, Actor subject) 
-			: this(orderString, subject, null, int2.Zero, null, false) { }
-		public Order(string orderString, Actor subject, Actor targetActor)
-			: this(orderString, subject, targetActor, int2.Zero, null, false) { }
-		public Order(string orderString, Actor subject, int2 targetLocation)
-			: this(orderString, subject, null, targetLocation, null, false) { }
-		public Order(string orderString, Actor subject, int2 targetLocation, bool queued)
-			: this(orderString, subject, null, targetLocation, null, queued) { }
-		public Order(string orderString, Actor subject, string targetString)
-			: this(orderString, subject, null, int2.Zero, targetString, false) { }
-		public Order(string orderString, Actor subject, Actor targetActor, int2 targetLocation)
-			: this(orderString, subject, targetActor, targetLocation, null, false) { }
-		public Order(string orderString, Actor subject, Actor targetActor, string targetString)
-			: this(orderString, subject, targetActor, int2.Zero, targetString, false) { }
-		public Order(string orderString, Actor subject, int2 targetLocation, string targetString)
-			: this(orderString, subject, null, targetLocation, targetString, false) { }
+		// For scripting special powers
+		public Order() 
+			: this(null, null, null, int2.Zero, null, false, int2.Zero) { }
+		
+		public Order(string orderString, Actor subject, bool queued) 
+			: this(orderString, subject, null, int2.Zero, null, queued, int2.Zero) { }
 
 		public byte[] Serialize()
 		{
@@ -80,13 +91,25 @@ namespace OpenRA
 						w.Write( (byte)0xFF );
 						w.Write(OrderString);
 						w.Write(UIntFromActor(Subject));
-						w.Write(UIntFromActor(TargetActor));
-						w.Write(TargetLocation.X);
-						w.Write(TargetLocation.Y);
-						w.Write(TargetString != null);
+
+						OrderFields fields = 0;
+						if (TargetActor != null) fields |= OrderFields.TargetActor;
+						if (TargetLocation != int2.Zero) fields |= OrderFields.TargetLocation;
+						if (TargetString != null) fields |= OrderFields.TargetString;
+						if (Queued) fields |= OrderFields.Queued;
+						if (ExtraLocation != int2.Zero) fields |= OrderFields.ExtraLocation;
+
+						w.Write((byte)fields);
+
+						if (TargetActor != null)
+							w.Write(UIntFromActor(TargetActor));
+						if (TargetLocation != int2.Zero)
+							w.Write(TargetLocation);
 						if (TargetString != null)
 							w.Write(TargetString);
-						w.Write(Queued);
+						if (ExtraLocation != int2.Zero)
+							w.Write(ExtraLocation);
+
 						return ret.ToArray();
 					}
 			}
@@ -100,19 +123,19 @@ namespace OpenRA
 					{
 						var order = r.ReadString();
 						var subjectId = r.ReadUInt32();
-						var targetActorId = r.ReadUInt32();
-						var targetLocation = new int2(r.ReadInt32(), 0);
-						targetLocation.Y = r.ReadInt32();
-						var targetString = null as string;
-						if (r.ReadBoolean())
-							targetString = r.ReadString();
-						var queued = r.ReadBoolean();
+						var flags = (OrderFields)r.ReadByte();
+						
+						var targetActorId = flags.HasField(OrderFields.TargetActor) ?  r.ReadUInt32() : 0xffffffff;
+						var targetLocation = flags.HasField(OrderFields.TargetLocation) ? r.ReadInt2() : int2.Zero;
+						var targetString = flags.HasField(OrderFields.TargetString) ? r.ReadString() : null;
+						var queued = flags.HasField(OrderFields.Queued);
+						var extraLocation = flags.HasField(OrderFields.ExtraLocation) ? r.ReadInt2() : int2.Zero;
 
 						Actor subject, targetActor;
 						if( !TryGetActorFromUInt( world, subjectId, out subject ) || !TryGetActorFromUInt( world, targetActorId, out targetActor ) )
 							return null;
 
-						return new Order( order, subject, targetActor, targetLocation, targetString, queued);
+						return new Order( order, subject, targetActor, targetLocation, targetString, queued, extraLocation);
 					}
 
 				case 0xfe:
@@ -120,7 +143,7 @@ namespace OpenRA
 						var name = r.ReadString();
 						var data = r.ReadString();
 
-						return new Order( name, null, data ) { IsImmediate = true };
+						return new Order( name, null, false ) { IsImmediate = true, TargetString = data };
 					}
 
 				default:
@@ -130,9 +153,9 @@ namespace OpenRA
 		
 		public override string ToString()
 		{
-			return "OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." +
-				"\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n".F(
-			    		OrderString, Subject, TargetActor.Info.Name , TargetLocation, TargetString, IsImmediate, Player.PlayerName);
+			return ("OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." +
+				"\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n").F(
+				OrderString, Subject, TargetActor != null ? TargetActor.Info.Name : null , TargetLocation, TargetString, IsImmediate, Player != null ? Player.PlayerName : null);
 		}
 
 		static uint UIntFromActor(Actor a)
@@ -164,32 +187,37 @@ namespace OpenRA
 		// Now that Orders are resolved by individual Actors, these are weird; you unpack orders manually, but not pack them.
 		public static Order Chat(string text)
 		{
-			return new Order("Chat", null, text) { IsImmediate = true };
+			return new Order("Chat", null, false) { IsImmediate = true, TargetString = text};
 		}
 
 		public static Order TeamChat(string text)
 		{
-			return new Order("TeamChat", null, text) { IsImmediate = true };
+			return new Order("TeamChat", null, false) { IsImmediate = true, TargetString = text };
+		}
+		
+		public static Order HandshakeResponse(string text)
+		{
+			return new Order("HandshakeResponse", null, false) { IsImmediate = true, TargetString = text };
 		}
 		
 		public static Order Command(string text)
 		{
-			return new Order("Command", null, text) { IsImmediate = true };	
+			return new Order("Command", null, false) { IsImmediate = true, TargetString = text };
 		}
 
 		public static Order StartProduction(Actor subject, string item, int count)
 		{
-			return new Order("StartProduction", subject, new int2( count, 0 ), item );
+			return new Order("StartProduction", subject, false) { TargetLocation = new int2(count, 0), TargetString = item };
 		}
 
 		public static Order PauseProduction(Actor subject, string item, bool pause)
 		{
-			return new Order("PauseProduction", subject, new int2( pause ? 1 : 0, 0 ), item);
+			return new Order("PauseProduction", subject, false) { TargetLocation = new int2(pause ? 1 : 0, 0), TargetString = item };
 		}
 
-		public static Order CancelProduction(Actor subject, string item)
+		public static Order CancelProduction(Actor subject, string item, int count)
 		{
-			return new Order("CancelProduction", subject, item);
+			return new Order("CancelProduction", subject, false) { TargetLocation = new int2(count, 0), TargetString = item };
 		}
 	}
 }

OpenRA.Game/Network/OrderIO.cs

@@ -8,36 +8,18 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace OpenRA.Network
 {
-	static class OrderIO
+	public static class OrderIO
 	{
 		public static void Write(this Stream s, byte[] buf)
 		{
 			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,17 +34,29 @@ 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 );
 			}
 			return ms.ToArray();
 		}
+
+		public static int2 ReadInt2(this BinaryReader r)
+		{
+			var x = r.ReadInt32();
+			var y = r.ReadInt32();
+			return new int2(x, y);
+		}
+
+		public static void Write(this BinaryWriter w, int2 p)
+		{
+			w.Write(p.X);
+			w.Write(p.Y);
+		}
 	}
 }

OpenRA.Game/Network/OrderManager.cs

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

OpenRA.Game/Network/Session.cs

@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using OpenRA.FileFormats;
 
 namespace OpenRA.Network
@@ -20,10 +21,21 @@ 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,
-			Ready
+			Ready,
+			Disconnected = 1000
 		}
 
 		public class Client
@@ -44,47 +56,52 @@ namespace OpenRA.Network
 			public int Index;
 			public string Bot;	// trait name of the bot to initialize in this slot, or null otherwise.
 			public bool Closed;	// host has explicitly closed this slot.
-			public string MapPlayer;	// playerReference to bind against.
-			
+			public string MapPlayer;	// playerReference to bind against.
+			public bool Spectator = false; // Spectating or not
 			// todo: more stuff?
 		}
 
 		public class Global
 		{
+			public string ServerName;
 			public string Map;
 			public string[] Mods = { "ra" };	// mod names
 			public int OrderLatency = 3;
 			public int RandomSeed = 0;
-			public bool LockTeams = false;	// don't allow team changes after game start.
+			public bool LockTeams = true;	// don't allow team changes after game start.
 			public bool AllowCheats = false;
 		}
 
+		public Session(string[] mods)
+		{
+			this.GlobalSettings.Mods = mods.ToArray();
+		}
+
 		public string Serialize()
 		{
 			var clientData = new List<MiniYamlNode>();
 
-			foreach( var client in Clients )
-				clientData.Add( new MiniYamlNode( "Client@{0}".F( client.Index ), FieldSaver.Save( client ) ) );
+			foreach (var client in Clients)
+				clientData.Add(new MiniYamlNode("Client@{0}".F(client.Index), FieldSaver.Save(client)));
 
-			foreach( var slot in Slots )
-				clientData.Add( new MiniYamlNode( "Slot@{0}".F( slot.Index ), FieldSaver.Save( slot ) ) );
+			foreach (var slot in Slots)
+				clientData.Add(new MiniYamlNode("Slot@{0}".F(slot.Index), FieldSaver.Save(slot)));
 
-			clientData.Add( new MiniYamlNode( "GlobalSettings", FieldSaver.Save( GlobalSettings ) ) );
+			clientData.Add(new MiniYamlNode("GlobalSettings", FieldSaver.Save(GlobalSettings)));
 
 			return clientData.WriteToString();
 		}
 
 		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)
 			{
 				var yy = y.Key.Split('@');
 
-				switch( yy[0] )
+				switch (yy[0])
 				{
 					case "GlobalSettings":
 						FieldLoader.Load(session.GlobalSettings, y.Value);
@@ -95,7 +112,7 @@ namespace OpenRA.Network
 						break;
 
 					case "Slot":
-						session.Slots.Add(FieldLoader.Load<Session.Slot>(y.Value ));
+						session.Slots.Add(FieldLoader.Load<Session.Slot>(y.Value));
 						break;
 				}
 			}

OpenRA.Game/Network/SyncReport.cs

@@ -1,63 +1,93 @@
-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.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Network
 {
 	class SyncReport
 	{
-		Queue<Pair<int, string>> syncReports = new Queue<Pair<int, string>>();
+		readonly OrderManager orderManager;
 		const int numSyncReports = 5;
+		Report[] syncReports = new Report[numSyncReports];
+		int curIndex = 0;
 
+		public SyncReport( OrderManager orderManager )
+		{
+			this.orderManager = orderManager;
+			for (var i = 0; i < numSyncReports; i++)
+				syncReports[i] = new SyncReport.Report();
+		}
+		
 		internal void UpdateSyncReport()
 		{
-			if (!Game.Settings.Debug.RecordSyncReports)
-				return;
-
-			while (syncReports.Count >= numSyncReports) syncReports.Dequeue();
-			syncReports.Enqueue(Pair.New(Game.orderManager.FrameNumber, GenerateSyncReport()));
+			GenerateSyncReport(syncReports[curIndex]);
+			curIndex = ++curIndex % numSyncReports;
 		}
-
-		string GenerateSyncReport()
+		
+		void GenerateSyncReport(Report report)
 		{
-			var sb = new StringBuilder();
-			sb.AppendLine("Actors:");
-			foreach (var a in Game.world.Actors)
-				sb.AppendLine("\t {0} {1} {2} ({3})".F(
-					a.ActorID,
-					a.Info.Name,
-					(a.Owner == null) ? "null" : a.Owner.InternalName,
-					Sync.CalculateSyncHash(a)));
-
-			sb.AppendLine("Tick Actors:");
-			foreach (var a in Game.world.Queries.WithTraitMultiple<object>())
+			report.Frame = orderManager.NetFrameNumber;
+			report.SyncedRandom = orderManager.world.SharedRandom.Last;
+			report.Traits.Clear();
+			foreach (var a in orderManager.world.Queries.WithTrait<object>())
 			{
 				var sync = Sync.CalculateSyncHash(a.Trait);
 				if (sync != 0)
-					sb.AppendLine("\t {0} {1} {2} {3} ({4})".F(
-						a.Actor.ActorID,
-						a.Actor.Info.Name,
-						(a.Actor.Owner == null) ? "null" : a.Actor.Owner.InternalName,
-						a.Trait.GetType().Name,
-						sync));
+					report.Traits.Add(new TraitReport()
+					{
+						ActorID = a.Actor.ActorID,
+						Type = a.Actor.Info.Name,
+						Owner = (a.Actor.Owner == null) ? "null" : a.Actor.Owner.PlayerName,
+						Trait = a.Trait.GetType().Name,
+						Hash = sync
+					});
 			}
-
-			return sb.ToString();
 		}
 
 		internal void DumpSyncReport(int frame)
 		{
-			var f = syncReports.FirstOrDefault(a => a.First == frame);
-			if (f == default(Pair<int, string>))
-			{
-				Log.Write("sync", "No sync report available!");
-				return;
-			}
-
-			Log.Write("sync", "Sync for net frame {0} -------------", f.First);
-			Log.Write("sync", "{0}", f.Second);
+			foreach (var r in syncReports)
+				if (r.Frame == frame)
+				{
+					Log.Write("sync", "Sync for net frame {0} -------------", r.Frame);
+					Log.Write("sync", "SharedRandom: "+r.SyncedRandom);
+					Log.Write("sync", "Synced Traits:");
+					foreach (var a in r.Traits)
+						Log.Write("sync", "\t {0} {1} {2} {3} ({4})".F(
+							a.ActorID,
+							a.Type,
+							a.Owner,
+					        a.Trait,
+					        a.Hash
+						));
+					return;
+				}
+			Log.Write("sync", "No sync report available!");
 		}
+	
+		class Report
+		{
+			public int Frame;
+			public int SyncedRandom;
+			public List<TraitReport> Traits = new List<TraitReport>();
+		}
+		
+		struct TraitReport
+		{
+			public uint ActorID;
+			public string Type;
+			public string Owner;
+			public string Trait;
+			public int Hash;
+		}
+
 	}
 }

OpenRA.Game/Network/UnitOrders.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#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 
@@ -11,97 +11,210 @@
 using System.Drawing;
 using System.Linq;
 using OpenRA.Traits;
+using System;
+using OpenRA.FileFormats;
 
 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(int id)
+		public static void ProcessOrder(OrderManager orderManager, World world, int clientId, Order order)
 		{
-			/* todo: find the interactive player. */
-			return Game.world.players.Values.FirstOrDefault(p => p.ClientIndex == id);
-		}
-
-		public static void ProcessOrder( World world, int clientId, Order order )
-		{
-			// Drop exploiting orders
-			if (order.Subject != null && order.Subject.Owner.ClientIndex != clientId)
+			if (world != null)
 			{
-				Game.Debug("Detected exploit order from {0}: {1}".F(clientId, order.OrderString));
-				return;
+				if (!world.WorldActor.TraitsImplementing<IValidateOrder>().All(vo =>
+					vo.OrderValidation(orderManager, world, clientId, order)))
+					return;
 			}
-			
-			switch( order.OrderString )
+
+			switch (order.OrderString)
 			{
 			case "Chat":
-				{
-					var client = FindClientById(clientId);
-					if (client != null)
 					{
-						var player = 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);
-					}
-					break;
-				}
-			case "TeamChat":
-				{
-					var client = FindClientById(clientId);
-					if (client != null)
-					{
-						var player = 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)
+						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
+						if (client != null)
 						{
-							var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : " (Team)";
+							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;
 					}
-					break;
-				}
-			case "StartGame":
+				case "Disconnected": /* reports that the target player disconnected */
+					{
+						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
+						if (client != null)
+						{
+							client.State = Session.ClientState.Disconnected;
+						}
+						break;
+					}
+				case "TeamChat":
+					{
+						var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
+
+						if (client != null)
+						{
+							if (world == null)
+							{
+								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;
+					}
+				case "StartGame":
+					{
+						Game.AddChatLine(Color.White, "Server", "The game has started.");
+						Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map);
+						break;
+					}
+				
+				case "HandshakeRequest":
 				{
-					Game.AddChatLine(Color.White, "Server", "The game has started.");
-					Game.StartGame(Game.LobbyInfo.GlobalSettings.Map);
-					break;
-				}
-			case "SyncInfo":
-				{
-					Game.SyncLobbyInfo(order.TargetString);
-					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;
+					var request = HandshakeRequest.Deserialize(order.TargetString);
+				
+					// Check valid mods/versions
+					var serverMods = request.Mods;
+					var localMods = orderManager.LobbyInfo.GlobalSettings.Mods;
 					
-					if (targetPlayer == world.LocalPlayer)
-						world.WorldActor.Trait<Shroud>().UpdatePlayerStance(world, order.Player, oldStance, order.Player.Stances[targetPlayer]);
+					bool valid = true;
+					if (localMods.Length != serverMods.Length)
+						valid = false;
+					else
+						foreach (var m in serverMods)
+						{
+							var parts = m.Split('@');
+							if (!localMods.Contains(parts[0]))
+							{
+								valid = false;
+								break;
+							}
+							if (parts[1] == "{DEV_VERSION}" || Mod.AllMods[parts[0]].Version == "{DEV_VERSION}")
+								continue;
 					
-					Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F(
-						order.Player.PlayerName, targetPlayer.PlayerName, order.Player.Stances[targetPlayer]));
-					break;
-				}
-			default:
-				{
-					if( !order.IsImmediate )
-						foreach (var t in order.Subject.TraitsImplementing<IResolveOrder>())
-							t.ResolveOrder(order.Subject, order);
+							if (parts[1] != Mod.AllMods[parts[0]].Version)
+							{
+								valid = false;
+								break;
+							}
+						}
+
+					if (!valid)
+						throw new InvalidOperationException("Mod/Version mismatch. Client: `{0}`, Server: `{1}`".F(
+					                                           string.Join(",",localMods.Select(m => "{0}@{1}".F(m, Mod.AllMods[m].Version)).ToArray()),
+					                                           string.Join(",",serverMods)));
+					
+					// Check that the map exists on the client
+					if (!Game.modData.AvailableMaps.ContainsKey(request.Map))
+						throw new InvalidOperationException("Missing map {0}".F(request.Map));
+					
+					var info = new Session.Client()
+					{
+						Name = Game.Settings.Player.Name,
+						Color1 = Game.Settings.Player.Color1,
+						Color2 = Game.Settings.Player.Color2,
+						Country = "random",
+						SpawnPoint = 0,
+						Team = 0,
+						State = Session.ClientState.NotReady
+					};
+				
+					var response = new HandshakeResponse()
+					{
+						Client = info,
+						Mods = localMods,
+						Password = "Foo"
+					};
+				
+					orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize()));
 					break;
 				}
+				
+				case "SyncInfo":
+					{
+						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 newStance = (Stance)order.TargetLocation.Y;
+
+						SetPlayerStance(world, order.Player, targetPlayer, newStance);
+
+						Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F(
+							order.Player.PlayerName, targetPlayer.PlayerName, newStance));
+				
+						// automatically declare war reciprocally
+						if (newStance == Stance.Enemy && targetPlayer.Stances[order.Player] == Stance.Ally)
+						{
+							SetPlayerStance(world, targetPlayer, order.Player, newStance);
+							Game.Debug("{0} has reciprocated",targetPlayer.PlayerName);
+						}
+
+						break;
+					}
+				default:
+					{
+						if( !order.IsImmediate )
+						{
+							var self = order.Subject;
+							var health = self.TraitOrDefault<Health>();
+							if( health == null || !health.IsDead )
+								foreach( var t in self.TraitsImplementing<IResolveOrder>() )
+									t.ResolveOrder( self, order );
+						}
+						break;
+					}
 			}
 		}
+
+		static void SetPlayerStance(World w, Player p, Player target, Stance s)
+		{
+			var oldStance = p.Stances[target];
+			p.Stances[target] = s;
+			if (target == w.LocalPlayer)
+				w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, p, oldStance, s);
+		}
 	}
 }

OpenRA.Game/ObjectCreator.cs

@@ -1,4 +1,15 @@
-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.IO;
 using System.Linq;
 using System.Reflection;
@@ -30,19 +41,63 @@ namespace OpenRA
 		public static Action<string> MissingTypeAction = 
 			s => { throw new InvalidOperationException("Cannot locate type: {0}".F(s)); };
 
-		public T CreateObject<T>(string classname)
+		public T CreateObject<T>(string className)
 		{
-			foreach (var mod in ModAssemblies)
-			{
-				var fullTypeName = mod.Second + "." + classname;
-				var obj = mod.First.CreateInstance(fullTypeName);
-				if (obj != null)
-					return (T)obj;
-			}
+			return CreateObject<T>( className, new Dictionary<string, object>() );
+		}
 
-			MissingTypeAction(classname);
+		public T CreateObject<T>( string className, Dictionary<string, object> args )
+		{
+			foreach( var mod in ModAssemblies )
+			{
+				var type = mod.First.GetType( mod.Second + "." + className, false );
+				if( type == null ) continue;
+				var ctors = type.GetConstructors( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance ).Where( x => x.HasAttribute<UseCtorAttribute>() ).ToList();
+				if( ctors.Count == 0 )
+					return (T)CreateBasic( type );
+				else if( ctors.Count == 1 )
+					return (T)CreateUsingArgs( ctors[ 0 ], args );
+				else
+					throw new InvalidOperationException( "ObjectCreator: UseCtor on multiple constructors; invalid." );
+			}
+			MissingTypeAction(className);
 			return default(T);
 		}
 
+		public object CreateBasic( Type type )
+		{
+			return type.GetConstructor( new Type[ 0 ] ).Invoke( new object[ 0 ] );
+		}
+
+		public object CreateUsingArgs( ConstructorInfo ctor, Dictionary<string, object> args )
+		{
+			var p = ctor.GetParameters();
+			var a = new object[ p.Length ];
+			for( int i = 0 ; i < p.Length ; i++ )
+			{
+				var attrs = p[ i ].GetCustomAttributes<ParamAttribute>();
+				if( attrs.Length != 1 ) throw new InvalidOperationException( "ObjectCreator: argument in [UseCtor] doesn't have [Param]" );
+				a[ i ] = args[ attrs[ 0 ].ParamName ?? p[i].Name ];
+			}
+			return ctor.Invoke( a );
+		}
+
+		[AttributeUsage( AttributeTargets.Parameter )]
+		public class ParamAttribute : Attribute
+		{
+			public string ParamName { get; private set; }
+
+			public ParamAttribute() { }
+
+			public ParamAttribute( string paramName )
+			{
+				ParamName = paramName;
+			}
+		}
+
+		[AttributeUsage( AttributeTargets.Constructor )]
+		public class UseCtorAttribute : Attribute
+		{
+		}
 	}
 }

OpenRA.Game/OpenRA.Game.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -75,27 +75,18 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="GameRules\WeaponInfo.cs" />
     <Compile Include="Group.cs" />
     <Compile Include="Orders\GenericSelectTarget.cs" />
     <Compile Include="Server\ProtocolVersion.cs" />
-    <Compile Include="Traits\BaseBuilding.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\World\Shroud.cs" />
     <Compile Include="Widgets\ChatEntryWidget.cs" />
-    <Compile Include="Widgets\Delegates\ConnectionDialogsDelegate.cs" />
-    <Compile Include="Widgets\Delegates\CreateServerMenuDelegate.cs" />
-    <Compile Include="Widgets\Delegates\DiplomacyDelegate.cs" />
-    <Compile Include="Widgets\Delegates\MainMenuButtonsDelegate.cs" />
-    <Compile Include="Widgets\Delegates\ServerBrowserDelegate.cs" />
-    <Compile Include="Widgets\Delegates\SettingsMenuDelegate.cs" />
     <Compile Include="Widgets\MapPreviewWidget.cs" />
     <Compile Include="Widgets\WidgetUtils.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
     <Compile Include="Effects\FlashTarget.cs" />
-    <Compile Include="Effects\MoveFlash.cs" />
     <Compile Include="Exts.cs" />
     <Compile Include="GameRules\ActorInfo.cs" />
     <Compile Include="GameRules\VoiceInfo.cs" />
@@ -107,23 +98,19 @@
     <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" />
     <Compile Include="Server\MasterServerQuery.cs" />
     <Compile Include="Server\Server.cs" />
     <Compile Include="Server\ServerOrder.cs" />
-    <Compile Include="ShroudRenderer.cs" />
     <Compile Include="Sound.cs" />
     <Compile Include="Support\PerfHistory.cs" />
     <Compile Include="Sync.cs" />
-    <Compile Include="Traits\CustomSellValue.cs" />
     <Compile Include="Traits\World\SpatialBins.cs" />
     <Compile Include="Traits\World\Country.cs" />
     <Compile Include="Actor.cs" />
     <Compile Include="Cursor.cs" />
-    <Compile Include="GameRules\Footprint.cs" />
     <Compile Include="GameRules\Rules.cs" />
     <Compile Include="Graphics\Animation.cs" />
     <Compile Include="Game.cs" />
@@ -131,21 +118,14 @@
     <Compile Include="Graphics\CursorSheetBuilder.cs" />
     <Compile Include="Graphics\LineRenderer.cs" />
     <Compile Include="Graphics\WorldRenderer.cs" />
-    <Compile Include="Traits\Activities\Idle.cs" />
-    <Compile Include="Traits\Activities\RemoveSelf.cs" />
-    <Compile Include="Traits\Activities\Sell.cs" />
     <Compile Include="Orders\IOrderGenerator.cs" />
-    <Compile Include="Orders\PlaceBuildingOrderGenerator.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" />
     <Compile Include="Graphics\SheetBuilder.cs" />
     <Compile Include="Graphics\HardwarePalette.cs" />
-    <Compile Include="MainWindow.cs">
-    </Compile>
     <Compile Include="Support\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Graphics\Renderer.cs" />
@@ -153,25 +133,12 @@
     <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\Buildable.cs" />
-    <Compile Include="Traits\Building.cs" />
-    <Compile Include="Traits\World\BuildingInfluence.cs" />
-    <Compile Include="Traits\Player\PlaceBuilding.cs" />
     <Compile Include="Traits\World\PlayerColorPalette.cs" />
     <Compile Include="Traits\World\ResourceLayer.cs" />
     <Compile Include="Traits\World\ResourceType.cs" />
-    <Compile Include="Traits\SupportPower.cs" />
-    <Compile Include="Traits\ProvidesRadar.cs" />
     <Compile Include="Traits\Selectable.cs" />
-    <Compile Include="Traits\Player\ProductionQueue.cs" />
-    <Compile Include="Traits\Mobile.cs" />
-    <Compile Include="Traits\Production.cs" />
-    <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
-    <Compile Include="Traits\Turreted.cs" />
     <Compile Include="Traits\World\UnitInfluence.cs" />
     <Compile Include="Network\UnitOrders.cs" />
     <Compile Include="Traits\Util.cs" />
@@ -179,32 +146,22 @@
     <Compile Include="Graphics\Util.cs" />
     <Compile Include="Graphics\Viewport.cs" />
     <Compile Include="Orders\UnitOrderGenerator.cs" />
-    <Compile Include="Widgets\WorldTooltipWidget.cs" />
     <Compile Include="World.cs" />
     <Compile Include="WorldUtils.cs" />
     <Compile Include="Traits\Player\EvaAlerts.cs" />
     <Compile Include="Traits\World\ScreenShaker.cs" />
-    <Compile Include="Traits\LineBuild.cs" />
     <Compile Include="Widgets\WidgetLoader.cs" />
     <Compile Include="Widgets\ButtonWidget.cs" />
     <Compile Include="Widgets\Widget.cs" />
     <Compile Include="Widgets\BackgroundWidget.cs" />
     <Compile Include="Widgets\LabelWidget.cs" />
     <Compile Include="Widgets\CheckboxWidget.cs" />
-    <Compile Include="Traits\World\BibLayer.cs" />
-    <Compile Include="Traits\World\SmudgeLayer.cs" />
-    <Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" />
     <Compile Include="Widgets\PerfGraphWidget.cs" />
-    <Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
-    <Compile Include="Widgets\Delegates\LobbyDelegate.cs" />
     <Compile Include="Widgets\ColorBlockWidget.cs" />
     <Compile Include="GameRules\MusicInfo.cs" />
     <Compile Include="Widgets\ImageWidget.cs" />
-    <Compile Include="Traits\SharesCell.cs" />
     <Compile Include="Widgets\TextFieldWidget.cs" />
     <Compile Include="Widgets\ChatDisplayWidget.cs" />
-    <Compile Include="Widgets\Delegates\MapChooserDelegate.cs" />
-    <Compile Include="Widgets\ListBoxWidget.cs" />
     <Compile Include="Widgets\SliderWidget.cs" />
     <Compile Include="Widgets\TimerWidget.cs" />
     <Compile Include="Widgets\ShpImageWidget.cs" />
@@ -213,20 +170,17 @@
     <Compile Include="Widgets\ViewportScrollControllerWidget.cs" />
     <Compile Include="Traits\Player\DeveloperMode.cs" />
     <Compile Include="Traits\RevealsShroud.cs" />
-    <Compile Include="Traits\Targetable.cs" />
     <Compile Include="Traits\Health.cs" />
-    <Compile Include="Traits\RepairableBuilding.cs" />
-    <Compile Include="Traits\Activities\Drag.cs" />
     <Compile Include="Widgets\VqaPlayerWidget.cs" />
-    <Compile Include="Widgets\Delegates\VideoPlayerDelegate.cs" />
-    <Compile Include="Traits\MPStartLocations.cs" />
     <Compile Include="GameRules\Settings.cs" />
     <Compile Include="Support\Arguments.cs" />
     <Compile Include="Traits\ActorStance.cs" />
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Graphics\CursorProvider.cs" />
-    <Compile Include="Traits\Player\TechTree.cs" />
-    <Compile Include="Traits\Player\ClassicProductionQueue.cs" />
+    <Compile Include="Server\TraitInterfaces.cs" />
+    <Compile Include="Widgets\ScrollPanelWidget.cs" />
+    <Compile Include="Graphics\ShroudRenderer.cs" />
+    <Compile Include="Network\Handshake.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
@@ -235,14 +189,21 @@
     </ProjectReference>
     <Compile Include="ActorInitializer.cs" />
     <Compile Include="ActorReference.cs" />
+    <Compile Include="InputHandler.cs" />
     <Compile Include="ModData.cs" />
     <Compile Include="Map.cs" />
+    <Compile Include="Network\FrameData.cs" />
+    <Compile Include="Network\ReplayConnection.cs" />
     <Compile Include="Network\Session.cs" />
     <Compile Include="ObjectCreator.cs" />
     <Compile Include="Network\SyncReport.cs" />
+    <Compile Include="Traits\EditorAppearance.cs" />
+    <Compile Include="Traits\ValidateOrder.cs" />
     <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\PrimaryBuilding.cs" />
-    <Compile Include="Widgets\Delegates\DeveloperModeDelegate.cs" />
+    <Compile Include="Traits\Activities\CancelableActivity.cs" />
+    <Compile Include="Traits\SharesCell.cs" />
+    <Compile Include="Widgets\PasswordFieldWidget.cs" />
+    <Compile Include="Widgets\ScrollingTextWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
@@ -264,6 +225,9 @@
   <ItemGroup>
     <Content Include="OpenRA.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Widgets\Delegates\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -10,39 +10,64 @@
 
 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;
+		readonly MouseButton expectedButton;
 
-		public GenericSelectTarget(Actor subject, string order, string cursor)
+		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor, MouseButton button)
 		{
-			this.subject = subject;
+			this.subjects = subjects;
 			this.order = order;
 			this.cursor = cursor;
+			expectedButton = button;
+		}
+
+		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor) 
+			: this(subjects, order, cursor, MouseButton.Left)
+		{
+			
+		}
+
+		public GenericSelectTarget(Actor subject, string order, string cursor)
+			: this(new Actor[] { subject }, order, cursor)
+		{
+
+		}
+
+		public GenericSelectTarget(Actor subject, string order, string cursor, MouseButton button)
+			: this(new Actor[] { subject }, order, cursor, button)
+		{
+
 		}
 
 		public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
 		{
-			if (mi.Button == MouseButton.Right)
+			if (mi.Button != expectedButton)
 				world.CancelInputMode();
 			return OrderInner(world, xy, mi);
 		}
 
 		IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
 		{
-			if (mi.Button == MouseButton.Left && world.Map.IsInMap(xy))
-				yield return new Order(order, subject, xy);
+			if (mi.Button == expectedButton && world.Map.IsInMap(xy))
+			{
+				world.CancelInputMode();
+				foreach (var subject in subjects)
+					yield return new Order(order, subject, false) { TargetLocation = xy };
+			}
 		}
 
-		public virtual void Tick(World world) { }
-		public void RenderAfterWorld(World world) { }
-		public void RenderBeforeWorld(World world) { }
-
+		public virtual void Tick(World world) { }
+		public void RenderBeforeWorld(WorldRenderer wr, World world) { }
+		public void RenderAfterWorld(WorldRenderer wr, World world) { }
 		public string GetCursor(World world, int2 xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
 	}
 
@@ -53,6 +78,9 @@ namespace OpenRA.Orders
 		public GenericSelectTargetWithBuilding(Actor subject, string order, string cursor)
 			: base(subject, order, cursor) { }
 
+		public GenericSelectTargetWithBuilding(Actor subject, string order, string cursor, MouseButton button)
+			: base(subject, order, cursor, button) { }
+
 		public override void Tick(World world)
 		{
 			var hasStructure = world.Queries.OwnedBy[world.LocalPlayer]
@@ -63,5 +91,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/PlaceBuildingOrderGenerator.cs

@@ -1,80 +0,0 @@
-#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.Collections.Generic;
-using System.Linq;
-using OpenRA.GameRules;
-using OpenRA.Traits;
-
-namespace OpenRA.Orders
-{
-	public class PlaceBuildingOrderGenerator : IOrderGenerator
-	{
-		readonly Actor Producer;
-		readonly string Building;
-		BuildingInfo BuildingInfo { get { return Rules.Info[ Building ].Traits.Get<BuildingInfo>(); } }
-
-		public PlaceBuildingOrderGenerator(Actor producer, string name)
-		{
-			Producer = producer;
-			Building = name;
-		}
-
-		public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
-		{
-			if (mi.Button == MouseButton.Right)
-				world.CancelInputMode();
-
-			return InnerOrder(world, xy, mi);
-		}
-
-		IEnumerable<Order> InnerOrder(World world, int2 xy, MouseInput mi)
-		{
-			if (mi.Button == MouseButton.Left)
-			{
-				var topLeft = xy - Footprint.AdjustForBuildingSize( BuildingInfo );
-				if (!world.CanPlaceBuilding( Building, BuildingInfo, topLeft, null)
-					|| !world.IsCloseEnoughToBase(Producer.Owner, Building, BuildingInfo, topLeft))
-				{
-					var eva = world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
-					Sound.Play(eva.BuildingCannotPlaceAudio);
-					yield break;
-				}
-				
-				if (Rules.Info[ Building ].Traits.Contains<LineBuildInfo>())
-					yield return new Order("LineBuild", Producer.Owner.PlayerActor, topLeft, Building);
-				else
-					yield return new Order("PlaceBuilding", Producer.Owner.PlayerActor, topLeft, Building);
-			}
-		}
-		
-		public void Tick( World world )
-		{
-			// Find the queue with the target actor
-			var queue = Producer.TraitsImplementing<ProductionQueue>()
-				.Where(p => p.CurrentItem() != null && 
-		                 	p.CurrentItem().Item == Building && 
-		                 	p.CurrentItem().RemainingTime == 0)
-				.FirstOrDefault();
-						
-			if (queue == null)
-				world.CancelInputMode();
-		}
-
-		public void RenderAfterWorld( World world ) {}
-
-		public void RenderBeforeWorld(World world)
-		{
-			world.WorldRenderer.uiOverlay.DrawBuildingGrid(world, Building, BuildingInfo);
-		}
-
-		public string GetCursor(World world, int2 xy, MouseInput mi) { return "default"; }
-	}
-}

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -6,78 +6,175 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
 using OpenRA.Traits;
 
 namespace OpenRA.Orders
 {
 	class UnitOrderGenerator : IOrderGenerator
 	{
-		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
-		{		
-			var underCursor = world.FindUnitsAtMouse(mi.Location)
-				.Where(a => a.Info.Traits.Contains<TargetableInfo>())
-				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
-				.FirstOrDefault();
-			
-			var orders = world.Selection.Actors
-				.Select(a => a.Order(xy, mi, underCursor))
-				.Where(o => o != null)
-				.ToArray();
-
-			var actorsInvolved = orders.Select(o => o.Subject).Distinct();
-			if (actorsInvolved.Any())
-				yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor,
-					string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray()));
-
-			foreach (var o in orders)
-				yield return o;
-		}
-
-		public void Tick( World world ) {}
-
-		public void RenderBeforeWorld(World world)
-		{
-			foreach (var a in world.Selection.Actors)
-				if (!a.Destroyed)
-					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
-						t.RenderBeforeWorld(a);
+		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
+		{
+		    var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                var customOrders = custom.Order(world, xy, mi);
 
-			Game.Renderer.Flush();
+                foreach (var o in customOrders)
+                    yield return o;
+            }
+            else
+            {
+                var underCursor = world.FindUnitsAtMouse(mi.Location)
+                    .Where(a => a.HasTrait<ITargetable>())
+                    .OrderByDescending(
+                        a =>
+                        a.Info.Traits.Contains<SelectableInfo>()
+                            ? a.Info.Traits.Get<SelectableInfo>().Priority
+                            : int.MinValue)
+                    .FirstOrDefault();
+
+                var orders = world.Selection.Actors
+                    .Select(a => OrderForUnit(a, xy, mi, underCursor))
+                    .Where(o => o != null)
+                    .ToArray();
+
+                var actorsInvolved = orders.Select(o => o.self).Distinct();
+				if (actorsInvolved.Any())
+					yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
+					{
+						TargetString = string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray())
+					};
+                       
+
+                foreach (var o in orders)
+                    yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target, mi.Modifiers.HasModifier(Modifiers.Shift)));
+            }
 		}
 
-		public void RenderAfterWorld( World world )
-		{
-			foreach (var a in world.Selection.Actors)
-				if (!a.Destroyed)
-					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
-						t.RenderAfterWorld(a);
+		public void Tick( World world )
+        {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.Tick(world);
+            }
+		}
+
+		public void RenderBeforeWorld( WorldRenderer wr, World world )
+        {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.RenderBeforeWorld(wr, world);
+                return;
+            }
 
 			Game.Renderer.Flush();
 		}
 
-		public string GetCursor( World world, int2 xy, MouseInput mi )
-		{		
-			if (mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any())
-			{
-				var underCursor = world.FindUnitsAtMouse(mi.Location)
-					.Where(a => a.Info.Traits.Contains<SelectableInfo>())
-					.Any();
-				
-				if (underCursor)
-					return "select";
-			}
+		public void RenderAfterWorld( WorldRenderer wr, World world )
+        {
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+                custom.RenderAfterWorld(wr, world);
+                return;
+            }
 			
-			var c = Order(world, xy, mi)
-				.Select(o => o.Subject.TraitsImplementing<IOrderCursor>()
-					.Select(pc => pc.CursorForOrder(o.Subject, o)).FirstOrDefault(a => a != null))
-				.FirstOrDefault(a => a != null);
-
-			return c ?? "default";
+			Game.Renderer.Flush();
 		}
+
+		public string GetCursor( World world, int2 xy, MouseInput mi )
+		{
+			bool useSelect = false;
+
+            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
+            if (custom != null)
+            {
+               return custom.GetCursor(world, xy, mi);
+            }
+
+			var underCursor = world.FindUnitsAtMouse(mi.Location)
+				.Where(a => a.HasTrait<ITargetable>())
+				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
+				.FirstOrDefault();
+
+
+			if (mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any())
+				if (underCursor != null)
+					useSelect = true;
+
+			var orders = world.Selection.Actors
+				.Select(a => OrderForUnit(a, xy, mi, underCursor))
+				.Where(o => o != null)
+				.ToArray();
+
+			if( orders.Length == 0 ) return (useSelect) ? "select" : "default";
+
+			return orders[0].cursor ?? ((useSelect) ? "select" : "default");
+		}
+
+		static UnitOrderResult OrderForUnit( Actor self, int2 xy, MouseInput mi, Actor underCursor )
+		{
+			if (self.Owner != self.World.LocalPlayer)
+				return null;
+
+
+			if (self.Destroyed)
+				return null;
+
+			if( mi.Button == MouseButton.Right )
+			{
+				var uim = self.World.WorldActor.Trait<UnitInfluence>();
+				foreach( var o in self.TraitsImplementing<IIssueOrder>()
+					.SelectMany( trait => trait.Orders
+						.Select( x => new { Trait = trait, Order = x } ) )
+					.OrderByDescending( x => x.Order.OrderPriority ) )
+				{
+					var actorsAt = uim.GetUnitsAt( xy ).ToList();
+
+					string cursor = null;
+					if( underCursor != null )
+						if (o.Order.CanTargetActor(self, underCursor, mi.Modifiers.HasModifier(Modifiers.Ctrl), mi.Modifiers.HasModifier(Modifiers.Alt), mi.Modifiers.HasModifier(Modifiers.Shift), ref cursor))
+							return new UnitOrderResult( self, o.Order, o.Trait, cursor, Target.FromActor( underCursor ) );
+					if (o.Order.CanTargetLocation(self, xy, actorsAt, mi.Modifiers.HasModifier(Modifiers.Ctrl), mi.Modifiers.HasModifier(Modifiers.Alt), mi.Modifiers.HasModifier(Modifiers.Shift), ref cursor))
+						return new UnitOrderResult( self, o.Order, o.Trait, cursor, Target.FromCell( xy ) );
+				}
+			}
+
+			return null;
+		}
+
+		static Order CheckSameOrder( IOrderTargeter iot, Order order )
+		{
+			if( order == null && iot.OrderID != null )
+				Game.Debug( "BUG: in order targeter - decided on {0} but then didn't order", iot.OrderID );
+			else if( iot.OrderID != order.OrderString )
+				Game.Debug( "BUG: in order targeter - decided on {0} but ordered {1}", iot.OrderID, order.OrderString );
+			return order;
+		}
+
+		class UnitOrderResult
+		{
+			public readonly Actor self;
+			public readonly IOrderTargeter iot;
+			public readonly IIssueOrder trait;
+			public readonly string cursor;
+			public readonly Target target;
+
+			public UnitOrderResult( Actor self, IOrderTargeter iot, IIssueOrder trait, string cursor, Target target )
+			{
+				this.self = self;
+				this.iot = iot;
+				this.trait = trait;
+				this.cursor = cursor;
+				this.target = target;
+			}
+		}
 	}
 }

OpenRA.Game/Player.cs

@@ -13,93 +13,83 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Network;
-using OpenRA.Traits;
-
-namespace OpenRA
-{
-	public enum PowerState { Normal, Low, Critical };
-	public enum WinState { Won, Lost, Undefined }; 
-	
-	public class Player
-	{
-		public Actor PlayerActor;
-		public int Kills;
+using OpenRA.Traits;
+
+namespace OpenRA
+{
+	public enum PowerState { Normal, Low, Critical };
+	public enum WinState { Won, Lost, Undefined };
+
+	public class Player
+	{
+		public Actor PlayerActor;
+		public int Kills;
 		public int Deaths;
-		public WinState WinState = WinState.Undefined;
-
-		public readonly string Palette;
-		public readonly Color Color;
-		public readonly Color Color2;
-
-		public readonly string PlayerName;
-		public readonly string InternalName;
-		public readonly CountryInfo Country;
-		public readonly int Index;
+		public WinState WinState = WinState.Undefined;
+
+		public readonly string Palette;
+		public readonly Color Color;
+		public readonly Color Color2;
+
+		public readonly string PlayerName;
+		public readonly string InternalName;
+		public readonly CountryInfo Country;
+		public readonly int Index;
 		public readonly bool NonCombatant = false;
 		public readonly int ClientIndex;
-		public readonly PlayerReference PlayerRef;
-		
-		public ShroudRenderer Shroud;
-		public World World { get; private set; }
-
-		public Player( World world, PlayerReference pr, int index )
-		{
-			World = world;
-			Shroud = new ShroudRenderer(this, world.Map);
-			
-			Index = index;
-			Palette = "player"+index;
-			Color = pr.Color;
+		public readonly PlayerReference PlayerRef;
+		public bool IsBot;
+
+		public Shroud Shroud { get { return World.LocalShroud; }}
+		public World World { get; private set; }
+
+		public Player(World world, PlayerReference pr, int index)
+		{
+			World = world;
+
+			Index = index;
+			Palette = "player" + index;
+
+			Color = pr.Color;
 			Color2 = pr.Color2;
-			ClientIndex = 0;		/* it's a map player, "owned" by host */
-			
-			PlayerName = InternalName = pr.Name;
-			NonCombatant = pr.NonCombatant;
-			Country = world.GetCountries()
+			ClientIndex = 0;		/* it's a map player, "owned" by host */
+
+			PlayerName = InternalName = pr.Name;
+			NonCombatant = pr.NonCombatant;
+			Country = world.GetCountries()
 				.FirstOrDefault(c => pr.Race == c.Race)
 				?? world.GetCountries().Random(world.SharedRandom);
 
-			PlayerRef = pr;
-			
-			RegisterPlayerColor(world, Palette);
-			PlayerActor = world.CreateActor("Player", new TypeDictionary{ new OwnerInit( this ) });
-		}
-		
-		public Player( World world, Session.Client client, PlayerReference pr, int index )
-		{
-			World = world;
-			Shroud = new ShroudRenderer(this, world.Map);
-			
+			PlayerRef = pr;
+
+			PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });
+		}
+
+		public Player(World world, Session.Client client, PlayerReference pr, int index)
+		{
+			World = world;
 			Index = index;
-			Palette = "player"+index;
-			Color = client.Color1;
-			Color2 = client.Color2;
+			Palette = "player" + index;
+			Color = client.Color1;
+			Color2 = client.Color2;
 			PlayerName = client.Name;
-			InternalName = pr.Name;
-			Country = world.GetCountries()
-				.FirstOrDefault(c => client != null && client.Country == c.Race)
+
+			InternalName = pr.Name;
+			Country = world.GetCountries()
+				.FirstOrDefault(c => client != null && client.Country == c.Race)
 				?? world.GetCountries().Random(world.SharedRandom);
 
 			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);
-		}
-
-		public Dictionary<Player, Stance> Stances = new Dictionary<Player, Stance>();
-	}
+			PlayerRef = pr;
+
+			PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });
+		}
+
+		public void GiveAdvice(string advice)
+		{
+			Sound.PlayToPlayer(this, advice);
+		}
+
+		public Dictionary<Player, Stance> Stances = new Dictionary<Player, Stance>();
+	}
 }

OpenRA.Game/Selection.cs

@@ -42,7 +42,7 @@ namespace OpenRA
 			else
 				actors = (isCombine ? oldSelection.Union(newSelection) : newSelection).ToList();
 
-			var voicedUnit = actors.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.HasVoice());
+			var voicedUnit = actors.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.IsInWorld && a.HasVoice());
 			if (voicedUnit != null)
 				Sound.PlayVoice("Select", voicedUnit, voicedUnit.Owner.Country.Race);
 
@@ -56,6 +56,10 @@ namespace OpenRA
 		public void Tick(World world)
 		{
 			actors.RemoveAll(a => !a.IsInWorld);
+
+			foreach (var cg in controlGroups.Values)
+				cg.RemoveAll(a => a.Destroyed);		// note: NOT `!a.IsInWorld`, since that would remove things
+													// that are in transports.
 		}
 
 		Cache<int, List<Actor>> controlGroups = new Cache<int, List<Actor>>(_ => new List<Actor>());

OpenRA.Game/Server/Connection.cs

@@ -15,7 +15,7 @@ using System.Net.Sockets;
 
 namespace OpenRA.Server
 {
-	class Connection
+	public class Connection
 	{
 		public Socket socket;
 		public List<byte> data = new List<byte>();
@@ -35,7 +35,7 @@ namespace OpenRA.Server
 			return result.ToArray();
 		}
 
-		bool ReadDataInner()
+		bool ReadDataInner( Server server )
 		{
 			var rx = new byte[1024];
 			var len = 0;
@@ -49,7 +49,7 @@ namespace OpenRA.Server
 					else
 					{
 						if (len == 0)
-							Server.DropClient(this, null);
+							server.DropClient(this);
 						break;
 					}
 						
@@ -57,7 +57,7 @@ namespace OpenRA.Server
 				catch (SocketException e)
 				{
 					if (e.SocketErrorCode == SocketError.WouldBlock) break;
-					Server.DropClient(this, e); 
+					server.DropClient(this); 
 					return false; 
 				}
 			}
@@ -65,9 +65,9 @@ namespace OpenRA.Server
 			return true;
 		}
 
-		public void ReadData()
+		public void ReadData( Server server )
 		{
-			if (ReadDataInner())
+			if (ReadDataInner(server))
 				while (data.Count >= ExpectLength)
 				{
 					var bytes = PopBytes(ExpectLength);
@@ -82,16 +82,16 @@ namespace OpenRA.Server
 
 						case ReceiveState.Data:
 							{
-								Server.DispatchOrders(this, Frame, bytes);
+								server.DispatchOrders(this, Frame, bytes);
 								MostRecentFrame = Frame;
 								ExpectLength = 8;
 								State = ReceiveState.Header;
 
-								Server.UpdateInFlightFrames(this);
+								server.UpdateInFlightFrames(this);
 							} break;
 					}
 				}
 		}}
 
-	enum ReceiveState { Header, Data };
+	public enum ReceiveState { Header, Data };
 }

OpenRA.Game/Server/Exts.cs

@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System;
 
 namespace OpenRA.Server
 {

OpenRA.Game/Server/MasterServerQuery.cs

@@ -14,15 +14,20 @@ using System.Net;
 using System.Text;
 using System.Threading;
 using OpenRA.FileFormats;
+using OpenRA.Widgets;
 
 namespace OpenRA.Server
 {
-	static class MasterServerQuery
+    public static class MasterServerQuery
 	{
 		public static event Action<GameServer[]> OnComplete = _ => { };
+		public static event Action<string> OnVersion = _ => { };
 
 		static GameServer[] Games = { };
+		public static string ClientVersion = "";
+		public static string ServerVersion = "";
 		static AutoResetEvent ev = new AutoResetEvent(false);
+		static AutoResetEvent ev2 = new AutoResetEvent(false);
 
 		public static void Refresh(string masterServerUrl)
 		{
@@ -30,9 +35,7 @@ namespace OpenRA.Server
 			{
 				try
 				{
-					var wc = new WebClient();
-					var data = wc.DownloadData(new Uri(masterServerUrl + "list.php"));
-					var str = Encoding.UTF8.GetString(data);
+					var str = GetData(new Uri(masterServerUrl + "list.php"));
 
 					var yaml = MiniYaml.FromString(str);
 
@@ -52,10 +55,19 @@ namespace OpenRA.Server
 		{
 			if (ev.WaitOne(TimeSpan.FromMilliseconds(0))) 
 				OnComplete(Games);
+			if (ev2.WaitOne(TimeSpan.FromMilliseconds(0)))
+				OnVersion(ServerVersion);
+		}
+
+		static string GetData(Uri uri)
+		{
+			var wc = new WebClient();
+			var data = wc.DownloadData(uri);
+			return Encoding.UTF8.GetString(data);
 		}
 	}
 
-	class GameServer
+    public class GameServer
 	{
 		public readonly int Id = 0;
 		public readonly string Name = null;

OpenRA.Game/Server/ProtocolVersion.cs

@@ -13,6 +13,6 @@ namespace OpenRA.Server
 	public static class ProtocolVersion
 	{
 		// you *must* increment this whenever you make an incompatible protocol change
-		public static readonly int Version = 6;
+		public static readonly int Version = 7;
 	}
 }

OpenRA.Game/Server/Server.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -23,51 +22,54 @@ using OpenRA.Network;
 
 namespace OpenRA.Server
 {
-	static class Server
+	public class Server
 	{
-		static List<Connection> conns = new List<Connection>();
-		static TcpListener listener = null;
-		static Dictionary<int, List<Connection>> inFlightFrames
+		// Valid player connections
+		public List<Connection> conns = new List<Connection>();
+		
+		// Pre-verified player connections
+		public List<Connection> preConns = new List<Connection>();
+
+		TcpListener listener = null;
+		Dictionary<int, List<Connection>> inFlightFrames
 			= new Dictionary<int, List<Connection>>();
-		static Session lobbyInfo;
-		static bool GameStarted = false;
-		static string Name;
-		static int ExternalPort;
-		static int randomSeed;
+		
+		TypeDictionary ServerTraits = new TypeDictionary();
+		public Session lobbyInfo;
+		public bool GameStarted = false;
+		public string Name;
+		int randomSeed;
 
-		const int DownloadChunkInterval = 20000;
-		const int DownloadChunkSize = 16384;
+		public ModData ModData;
+		public Map Map;
 
-		const int MasterPingInterval = 60 * 3;	// 3 minutes. server has a 5 minute TTL for games, so give ourselves a bit
-												// of leeway.
-		static int lastPing = 0;
-		static bool isInternetServer;
-		static string masterServerUrl;
-		static bool isInitialPing;
-		static ModData ModData;
-		static Map Map;
-
-		public static void ServerMain(ModData modData, Settings settings, string map)
+		bool shutdown = false;
+		public void Shutdown()
+		{
+			shutdown = true;
+		}
+		
+		public Server(ModData modData, Settings settings, string map)
 		{
 			Log.AddChannel("server", "server.log");
 
-			isInitialPing = true;
-			Server.masterServerUrl = settings.Server.MasterServer;
-			isInternetServer = settings.Server.AdvertiseOnline;
 			listener = new TcpListener(IPAddress.Any, settings.Server.ListenPort);
 			Name = settings.Server.Name;
-			ExternalPort = settings.Server.ExternalPort;
 			randomSeed = (int)DateTime.Now.ToBinary();
 			ModData = modData;
 
-			lobbyInfo = new Session();
-			lobbyInfo.GlobalSettings.Mods = settings.Game.Mods;
+			foreach (var trait in modData.Manifest.ServerTraits)
+				ServerTraits.Add( modData.ObjectCreator.CreateObject<ServerTrait>(trait) );
+			
+			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.
-			
+			foreach (var t in ServerTraits.WithInterface<INotifyServerStart>())
+				t.ServerStarted(this);
+						
 			Log.Write("server", "Initial mods: ");
 			foreach( var m in lobbyInfo.GlobalSettings.Mods )
 				Log.Write("server","- {0}", m);
@@ -85,101 +87,76 @@ namespace OpenRA.Server
 
 			new Thread( _ =>
 			{
+				var timeout = ServerTraits.WithInterface<ITick>().Min(t => t.TickTimeout);
 				for( ; ; )
 				{
 					var checkRead = new ArrayList();
 					checkRead.Add( listener.Server );
 					foreach( var c in conns ) checkRead.Add( c.socket );
-
-					Socket.Select( checkRead, null, null, MasterPingInterval * 10000 );
+					foreach( var c in preConns ) checkRead.Add( c.socket );
+					
+					Socket.Select( checkRead, null, null, timeout );
 
 					foreach( Socket s in checkRead )
 						if( s == listener.Server ) AcceptConnection();
-						else conns.Single( c => c.socket == s ).ReadData();
+						else if (preConns.Count > 0)
+						{
+							var p = preConns.SingleOrDefault( c => c.socket == s );
+							if (p != null) p.ReadData( this );
+						}
+						else if (conns.Count > 0) conns.Single( c => c.socket == s ).ReadData( this );
 
-					if (Environment.TickCount - lastPing > MasterPingInterval * 1000)
-						PingMasterServer();
-					else
-						lock (masterServerMessages)
-							while (masterServerMessages.Count > 0)
-								SendChat(null, masterServerMessages.Dequeue());
+					foreach (var t in ServerTraits.WithInterface<ITick>())
+						t.Tick(this);
 					
-					if (conns.Count() == 0)
-					{
-						listener.Stop();
-						GameStarted = false;
+					if (shutdown)
 						break;
-					}
 				}
+				
+				GameStarted = false;
+				foreach (var t in ServerTraits.WithInterface<INotifyServerShutdown>())
+					t.ServerShutdown(this);
+
+				preConns.Clear();
+				conns.Clear();
+				try { listener.Stop(); }
+				catch { }
 			} ) { IsBackground = true }.Start();
-
-
-		}
-
-		static Session.Slot MakeSlotFromPlayerReference(PlayerReference pr)
-		{
-			if (!pr.Playable) return null;
-			return new Session.Slot
-			{
-				MapPlayer = pr.Name,
-				Bot = null,	/* todo: allow the map to specify a bot class? */
-				Closed = false,
-			};
-		}
-
-		static void LoadMap()
-		{
-			Map = new Map(ModData.AvailableMaps[lobbyInfo.GlobalSettings.Map].Package);
-			lobbyInfo.Slots = Map.Players
-				.Select(p => MakeSlotFromPlayerReference(p.Value))
-				.Where(s => s != null)
-				.Select((s, i) => { s.Index = i; return s; })
-				.ToList();
 		}
 
 		/* lobby rework todo: 
-		 * 
-		 *	- auto-assign players to slots
-		 *	- show all the slots in the lobby ui.
-		 *	- rework the game start so we actually use the slots.
-		 *	- all players should be able to click an empty slot to move to it
-		 *	- host should be able to choose whether a slot is open/closed/bot, with
-		 *		potentially more than one choice of bot class.
-		 *	- host should be able to kick a client from the lobby by closing its slot.
-		 *	- change lobby commands so the host can configure bots, rather than
-		 *		just configuring itself.
 		 *	- "teams together" option for team games -- will eliminate most need
 		 *		for manual spawnpoint choosing.
-		 *	- pick sensible non-conflicting colors for bots.
+		 *	- 256 max players is a dirty hack
 		 */
-
-		static int ChooseFreePlayerIndex()
+		int ChooseFreePlayerIndex()
 		{
-			for (var i = 0; i < 8; i++)
-				if (conns.All(c => c.PlayerIndex != i))
+			for (var i = 0; i < 256; i++)
+				if (conns.All(c => c.PlayerIndex != i) && preConns.All(c => c.PlayerIndex != i))
 					return i;
 
-			throw new InvalidOperationException("Already got 8 players");
+			throw new InvalidOperationException("Already got 256 players");
 		}
 
-		static int ChooseFreeSlot()
+		void AcceptConnection()
 		{
-			return lobbyInfo.Slots.First(s => !s.Closed && s.Bot == null).Index;
-		}
+			Socket newSocket = null;
 
-		static void AcceptConnection()
-		{
-			var newConn = new Connection { socket = listener.AcceptSocket() };
 			try
 			{
-				if (GameStarted)
-				{
-					Log.Write("server", "Rejected connection from {0}; game is already started.", 
-						newConn.socket.RemoteEndPoint);
-					newConn.socket.Close();
-					return;
-				}
+				if (!listener.Server.IsBound) return;
+				newSocket = listener.AcceptSocket();
+			}
+			catch
+			{
+				/* could have an exception here when listener 'goes away' when calling AcceptConnection! */
+				/* alternative would be to use locking but the listener doesnt go away without a reason */
+				return; 
+			}
 
+			var newConn = new Connection { socket = newSocket };
+			try
+			{
 				newConn.socket.Blocking = false;
 				newConn.socket.NoDelay = true;
 
@@ -187,50 +164,94 @@ namespace OpenRA.Server
 				newConn.PlayerIndex = ChooseFreePlayerIndex();
 				newConn.socket.Send(BitConverter.GetBytes(ProtocolVersion.Version));
 				newConn.socket.Send(BitConverter.GetBytes(newConn.PlayerIndex));
+				preConns.Add(newConn);
+				
+				// Dispatch a handshake order
+				var request = new HandshakeRequest()
+				{
+					Map = lobbyInfo.GlobalSettings.Map,
+					Mods = lobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m,Mod.AllMods[m].Version)).ToArray()
+				};
+				DispatchOrdersToClient(newConn, 0, 0, new ServerOrder("HandshakeRequest", request.Serialize()).Serialize());
+			}
+			catch (Exception) { DropClient(newConn); }
+		}
+		
+		void ValidateClient(Connection newConn, string data)
+		{
+			try
+			{
+				if (GameStarted)
+				{
+					Log.Write("server", "Rejected connection from {0}; game is already started.", 
+						newConn.socket.RemoteEndPoint);
+					DropClient(newConn);
+					return;
+				}
+
+				var client = HandshakeResponse.Deserialize(data).Client;
+				
+				// Promote connection to a valid client
+				preConns.Remove(newConn);
 				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(),
-					});
-
+				// Enforce correct PlayerIndex and Slot
+				client.Index = newConn.PlayerIndex;
+				client.Slot = ChooseFreeSlot();
+				
+				var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == client.Slot );
+				if (slotData != null && slotData.MapPlayer != 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);
-
 				SendChat(newConn, "has joined the game.");
-
+				
+				foreach (var t in ServerTraits.WithInterface<IClientJoined>())
+					t.ClientJoined(this, newConn);
+				
 				SyncLobbyInfo();
 			}
-			catch (Exception e) { DropClient(newConn, e); }
+			catch (Exception) { DropClient(newConn); }
 		}
 
-		public static void UpdateInFlightFrames(Connection conn)
+		int ChooseFreeSlot()
 		{
-			if (conn.Frame != 0)
+			return lobbyInfo.Slots.First(s => !s.Closed && s.Bot == null 
+				&& !lobbyInfo.Clients.Any( c => c.Slot == s.Index )).Index;
+		}
+		
+		
+		public static void SyncClientToPlayerReference(Session.Client c, PlayerReference pr)
+		{
+			if (pr == null)
+				return;
+			if (pr.LockColor)
 			{
-				if (!inFlightFrames.ContainsKey(conn.Frame))
-					inFlightFrames[conn.Frame] = new List<Connection> { conn };
-				else
-					inFlightFrames[conn.Frame].Add(conn);
-
-				if (conns.All(c => inFlightFrames[conn.Frame].Contains(c)))
-				{
-					inFlightFrames.Remove(conn.Frame);
-				}
+				c.Color1 = pr.Color;
+				c.Color2 = pr.Color2;
 			}
+			if (pr.LockRace)
+				c.Country = pr.Race;
+		}
+		
+		public void UpdateInFlightFrames(Connection conn)
+		{
+			if (conn.Frame == 0)
+				return;
+
+			if (!inFlightFrames.ContainsKey(conn.Frame))
+				inFlightFrames[conn.Frame] = new List<Connection> { conn };
+			else
+				inFlightFrames[conn.Frame].Add(conn);
+
+			if (conns.All(c => inFlightFrames[conn.Frame].Contains(c)))
+				inFlightFrames.Remove(conn.Frame);
 		}
 
-		static void DispatchOrdersToClient(Connection c, int client, int frame, byte[] data)
+		void DispatchOrdersToClient(Connection c, int client, int frame, byte[] data)
 		{
 			try
 			{
@@ -241,10 +262,10 @@ namespace OpenRA.Server
 				ms.Write( data );
 				c.socket.Send( ms.ToArray() );
 			}
-			catch( Exception e ) { DropClient( c, e ); }
+			catch (Exception) { DropClient(c); }
 		}
 
-		public static void DispatchOrders(Connection conn, int frame, byte[] data)
+		public void DispatchOrders(Connection conn, int frame, byte[] data)
 		{
 			if (frame == 0 && conn != null)
 				InterpretServerOrders(conn, data);
@@ -256,7 +277,7 @@ namespace OpenRA.Server
 			}
 		}
 
-		static void InterpretServerOrders(Connection conn, byte[] data)
+		void InterpretServerOrders(Connection conn, byte[] data)
 		{
 			var ms = new MemoryStream(data);
 			var br = new BinaryReader(ms);
@@ -273,372 +294,112 @@ namespace OpenRA.Server
 			catch (EndOfStreamException) { }
 			catch (NotImplementedException) { }
 		}
-
-		static bool InterpretCommand(Connection conn, string cmd)
-		{
-			var dict = new Dictionary<string, Func<string, bool>>
-			{
-				{ "ready",
-					s =>
-					{
-						// if we're downloading, we can't ready up.
-
-						var client = GetClient(conn);
-						if (client.State == Session.ClientState.NotReady)
-							client.State = Session.ClientState.Ready;
-						else if (client.State == Session.ClientState.Ready)
-							client.State = Session.ClientState.NotReady;
-
-						Log.Write("server", "Player @{0} is {1}",
-							conn.socket.RemoteEndPoint, client.State);
-
-						SyncLobbyInfo();
-						
-						if (conns.Count > 0 && conns.All(c => GetClient(c).State == Session.ClientState.Ready))
-							InterpretCommand(conn, "startgame");
-						
-						return true;
-					}},
-				{ "startgame", 
-					s => 
-					{
-						GameStarted = true;
-						foreach( var c in conns )
-							foreach( var d in conns )
-								DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
-
-						DispatchOrders(null, 0,
-							new ServerOrder("StartGame", "").Serialize());
-
-						PingMasterServer();
-						return true;
-					}},
-				{ "name", 
-					s => 
-					{
-						Log.Write("server", "Player@{0} is now known as {1}", conn.socket.RemoteEndPoint, s);
-						GetClient(conn).Name = s;
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "lag",
-					s =>
-					{
-						int lag;
-						if (!int.TryParse(s, out lag)) { Log.Write("server", "Invalid order lag: {0}", s); return false; }
-
-						Log.Write("server", "Order lag is now {0} frames.", lag);
-
-						lobbyInfo.GlobalSettings.OrderLatency = lag;
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "race",
-					s => 
-					{					
-						GetClient(conn).Country = s;
-						SyncLobbyInfo();
-						return true;
-					}},	
-				{ "team",
-					s => 
-					{
-						int team;
-						if (!int.TryParse(s, out team)) { Log.Write("server", "Invalid team: {0}", s ); return false; }
-
-						GetClient(conn).Team = team;
-						SyncLobbyInfo();
-						return true;
-					}},	
-				{ "spawn",
-					s => 
-					{
-						int spawnPoint;
-						if (!int.TryParse(s, out spawnPoint) || spawnPoint < 0 || spawnPoint > 8) //TODO: SET properly!
-						{
-							Log.Write("server", "Invalid spawn point: {0}", s);
-							return false;
-						}
-						
-						if (lobbyInfo.Clients.Where( c => c != GetClient(conn) ).Any( c => (c.SpawnPoint == spawnPoint) && (c.SpawnPoint != 0) ))
-						{
-							SendChatTo( conn, "You can't be at the same spawn point as another player" );
-							return true;
-						}
-
-						GetClient(conn).SpawnPoint = spawnPoint;
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "color",
-					s =>
-					{
-						var c = s.Split(',').Select(cc => int.Parse(cc)).ToArray();
-						GetClient(conn).Color1 = Color.FromArgb(c[0],c[1],c[2]);
-						GetClient(conn).Color2 = Color.FromArgb(c[3],c[4],c[5]);
-						SyncLobbyInfo();		
-						return true;
-					}},
-				{ "slot",
-					s =>
-					{
-						int slot;
-						if (!int.TryParse(s, out slot)) { Log.Write("server", "Invalid slot: {0}", s ); return false; }
-
-						var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == slot );
-						if (slotData == null || slotData.Closed || slotData.Bot != null 
-							|| lobbyInfo.Clients.Any( c => c.Slot == slot ))
-							return false;
-
-						GetClient(conn).Slot = slot;
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "slot_close",
-					s =>
-					{
-						int slot;
-						if (!int.TryParse(s, out slot)) { Log.Write("server", "Invalid slot: {0}", s ); return false; }
-
-						var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == slot );
-						if (slotData == null)
-							return false;
-
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can alter slots" );
-							return true;
-						}
-
-						slotData.Closed = true;
-						slotData.Bot = null;
-
-						/* kick any player that's in the slot */
-						var occupant = lobbyInfo.Clients.FirstOrDefault( c => c.Slot == slotData.Index );
-						if (occupant != null)
-						{
-							var occupantConn = conns.FirstOrDefault( c => c.PlayerIndex == occupant.Index );
-							if (occupantConn != null)
-								DropClient( occupantConn, new Exception() );
-						}
-
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "slot_open",
-					s =>
-					{
-						int slot;
-						if (!int.TryParse(s, out slot)) { Log.Write("server", "Invalid slot: {0}", s ); return false; }
-
-						var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == slot );
-						if (slotData == null)
-							return false;
-
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can alter slots" );
-							return true;
-						}
-
-						slotData.Closed = false;
-						slotData.Bot = null;
-
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "slot_bot",
-					s =>
-					{
-						var parts = s.Split(' ');
-
-						if (parts.Length != 2)
-						{
-							SendChatTo( conn, "Malformed slot_bot command" );
-							return true;
-						}
-
-						int slot;
-						if (!int.TryParse(parts[0], out slot)) { Log.Write("server", "Invalid slot: {0}", s ); return false; }
-
-						var slotData = lobbyInfo.Slots.FirstOrDefault( x => x.Index == slot );
-						if (slotData == null)
-							return false;
-
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can alter slots" );
-							return true;
-						}
-
-						slotData.Bot = parts[1];
-
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "map",
-					s =>
-					{
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can change the map" );
-							return true;
-						}
-						lobbyInfo.GlobalSettings.Map = s;			
-						LoadMap();
-
-						foreach(var client in lobbyInfo.Clients)
-						{
-							client.SpawnPoint = 0;
-							client.State = Session.ClientState.NotReady;
-						}
-						
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "mods",
-					s =>
-					{
-						var args = s.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-						lobbyInfo.GlobalSettings.Mods = args.GetRange(0,args.Count - 1).ToArray();
-						lobbyInfo.GlobalSettings.Map = args.Last();
-						SyncLobbyInfo();
-						return true;
-					}},
-				{ "lockteams",
-					s =>
-					{
-						if (conn.PlayerIndex != 0)
-						{
-							SendChatTo( conn, "Only the host can set that option" );
-							return true;
-						}
-						
-						bool.TryParse(s, out lobbyInfo.GlobalSettings.LockTeams);
-						SyncLobbyInfo();
-						return true;
-					}},
-			};
-
-			var cmdName = cmd.Split(' ').First();
-			var cmdValue = string.Join(" ", cmd.Split(' ').Skip(1).ToArray());
-
-			Func<string,bool> a;
-			if (!dict.TryGetValue(cmdName, out a))
-				return false;
-
-			Log.Write("server", "Client {0} sent server command: {1}", conn.PlayerIndex, cmd );
-			return a(cmdValue);
-		}
-
-		static void SendChatTo(Connection conn, string text)
+		
+		public void SendChatTo(Connection conn, string text)
 		{
 			DispatchOrdersToClient(conn, 0, 0,
 				new ServerOrder("Chat", text).Serialize());
 		}
 
-		static void SendChat(Connection asConn, string text)
-		{
-			DispatchOrders(asConn, 0, new ServerOrder("Chat", text).Serialize());
-		}
+        public void SendChat(Connection asConn, string text)
+        {
+            DispatchOrders(asConn, 0, new ServerOrder("Chat", text).Serialize());
+        }
 
-		static void InterpretServerOrder(Connection conn, ServerOrder so)
+        public void SendDisconnected(Connection asConn)
+        {
+            DispatchOrders(asConn, 0, new ServerOrder("Disconnected", "").Serialize());
+        }
+
+		void InterpretServerOrder(Connection conn, ServerOrder so)
 		{
 			switch (so.Name)
 			{
 				case "Command":
-				{
-					if(GameStarted)
-						SendChatTo(conn, "Cannot change state when game started.");
-					else if (GetClient(conn).State == Session.ClientState.Ready && !(so.Data == "ready" || so.Data == "startgame") )
-						SendChatTo(conn, "Cannot change state when marked as ready.");
-					else if (!InterpretCommand(conn, so.Data))
+					bool handled = false;
+					foreach (var t in ServerTraits.WithInterface<IInterpretCommand>())
+						if ((handled = t.InterpretCommand(this, conn, GetClient(conn), so.Data)))
+							break;
+					
+					if (!handled)
 					{
-						Log.Write("server", "Bad server command: {0}", so.Data);
-						SendChatTo(conn, "Bad server command.");
-					};
-				}
-				break;
-
-				case "Chat": 
+						Log.Write("server", "Unknown server command: {0}", so.Data);
+						SendChatTo(conn, "Unknown server command: {0}".F(so.Data));
+					}
+				
+					break;
+				case "HandshakeResponse":
+					ValidateClient(conn, so.Data);					
+					break;
+				case "Chat":
 				case "TeamChat":
+					var fromClient = GetClient(conn);
+					var fromIndex = fromClient != null ? fromClient.Index : 0;
+
 					foreach (var c in conns.Except(conn).ToArray())
-						DispatchOrdersToClient(c, GetClient(conn).Index, 0, so.Serialize());
+						DispatchOrdersToClient(c, fromIndex, 0, so.Serialize());
 				break;
 			}
 		}
 
-		static Session.Client GetClient(Connection conn)
+		public Session.Client GetClient(Connection conn)
 		{
-			return lobbyInfo.Clients.First(c => c.Index == conn.PlayerIndex);
+			return lobbyInfo.ClientWithIndex(conn.PlayerIndex);
 		}
 
-		public static void DropClient(Connection toDrop, Exception e)
+		public void DropClient(Connection toDrop)
 		{
-			conns.Remove(toDrop);
-			SendChat(toDrop, "Connection Dropped");
+			if (preConns.Contains(toDrop))
+				preConns.Remove(toDrop);
+			else
+			{
+				conns.Remove(toDrop);
+				SendChat(toDrop, "Connection Dropped");
 
-			lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
+            	if (GameStarted)
+                	SendDisconnected(toDrop); /* Report disconnection */
 
-			DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } );
+				lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
+				
+				DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } );
+
+				if (conns.Count != 0)
+					SyncLobbyInfo();
+			}			
+
+			try
+			{
+				toDrop.socket.Disconnect(false);
+			}
+			catch { }
+		}
+
+		public void SyncLobbyInfo()
+		{
+			if (!GameStarted)	/* don't do this while the game is running, it breaks things. */
+				DispatchOrders(null, 0,
+					new ServerOrder("SyncInfo", lobbyInfo.Serialize()).Serialize());
+
+			foreach (var t in ServerTraits.WithInterface<INotifySyncLobbyInfo>())
+				t.LobbyInfoSynced(this);
+		}
+		
+		public void StartGame()
+		{
+			GameStarted = true;
+			foreach( var c in conns )
+				foreach( var d in conns )
+					DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
+
+			// Drop any unvalidated clients
+			foreach (var c in preConns)
+				DropClient(c);
 			
-			if (conns.Count != 0)
-				SyncLobbyInfo();
-		}
-
-		static void SyncLobbyInfo()
-		{
 			DispatchOrders(null, 0,
-				new ServerOrder("SyncInfo", lobbyInfo.Serialize()).Serialize());
+				new ServerOrder("StartGame", "").Serialize());
 
-			PingMasterServer();
-		}
-
-		static volatile bool isBusy;
-		static Queue<string> masterServerMessages = new Queue<string>();
-		static void PingMasterServer()
-		{
-			if (isBusy || !isInternetServer) return;
-
-			lastPing = Environment.TickCount;
-			isBusy = true;
-
-			Action a = () =>
-				{
-					try
-					{
-						var url = "ping.php?port={0}&name={1}&state={2}&players={3}&mods={4}&map={5}";
-						if (isInitialPing) url += "&new=1";
-
-						using (var wc = new WebClient())
-						{
-							 wc.DownloadData(
-								masterServerUrl + url.F(
-								ExternalPort, Uri.EscapeUriString(Name),
-								GameStarted ? 2 : 1,	// todo: post-game states, etc.
-								lobbyInfo.Clients.Count,
-								string.Join(",", lobbyInfo.GlobalSettings.Mods),
-								lobbyInfo.GlobalSettings.Map));
-
-							if (isInitialPing)
-							{
-								isInitialPing = false;
-								lock (masterServerMessages)
-									masterServerMessages.Enqueue("Master server communication established.");
-							}
-						}
-					}
-					catch(Exception ex)
-					{
-						Log.Write("server", ex.ToString());
-						lock( masterServerMessages )
-							masterServerMessages.Enqueue( "Master server communication failed." );
-					}
-
-					isBusy = false;
-				};
-
-			a.BeginInvoke(null, null);
+			foreach (var t in ServerTraits.WithInterface<IStartGame>())
+				t.GameStarted(this);
 		}
 	}
 }

OpenRA.Game/Server/TraitInterfaces.cs

@@ -0,0 +1,58 @@
+#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 OpenRA.Network;
+
+namespace OpenRA.Server
+{	
+	// Returns true if order is handled 
+	public interface IInterpretCommand { bool InterpretCommand(Server server, Connection conn, Session.Client client, string cmd); }
+	public interface INotifySyncLobbyInfo { void LobbyInfoSynced(Server server); }
+	public interface INotifyServerStart { void ServerStarted(Server server); }
+	public interface INotifyServerShutdown { void ServerShutdown(Server server); }
+	public interface IStartGame { void GameStarted(Server server); }
+	public interface IClientJoined { void ClientJoined(Server server, Connection conn); }
+	public interface ITick
+	{
+		void Tick(Server server);
+		int TickTimeout { get; }
+	}
+	
+	public abstract class ServerTrait {}
+	
+	public class DebugServerTrait : ServerTrait, IInterpretCommand, IStartGame, INotifySyncLobbyInfo, INotifyServerStart, INotifyServerShutdown
+	{		
+		public bool InterpretCommand(Server server, Connection conn, Session.Client client, string cmd)
+		{
+			Console.WriteLine("Server received command from player {1}: {0}",cmd, conn.PlayerIndex);
+			return false;
+		}
+		
+		public void GameStarted(Server server)
+		{
+			Console.WriteLine("GameStarted()");
+		}
+		
+		public void LobbyInfoSynced(Server server)
+		{
+			Console.WriteLine("LobbyInfoSynced()");
+		}
+		
+		public void ServerStarted(Server server)
+		{
+			Console.WriteLine("ServerStarted()");
+		}
+		
+		public void ServerShutdown(Server server)
+		{
+			Console.WriteLine("ServerShutdown()");
+		}
+	}
+}

OpenRA.Game/ShroudRenderer.cs

@@ -1,219 +0,0 @@
-#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.FileFormats;
-using OpenRA.Graphics;
-
-namespace OpenRA
-{
-	public class ShroudRenderer
-	{
-		Traits.Shroud shroud;
-		Sprite[] shadowBits = SpriteSheetBuilder.LoadAllSprites("shadow");
-		Sprite[,] sprites, fogSprites;
-		
-		bool dirty = true;
-		bool disabled = false;
-		Map map;
-
-		public Rectangle? Bounds { get { return shroud.exploredBounds; } }
-
-		public ShroudRenderer(Player owner, Map map)
-		{
-			this.shroud = owner.World.WorldActor.Trait<Traits.Shroud>();
-			this.map = map;
-			
-			sprites = new Sprite[map.MapSize.X, map.MapSize.Y];
-			fogSprites = new Sprite[map.MapSize.X, map.MapSize.Y];
-
-			shroud.Dirty += () => dirty = true;
-		}
-
-		public bool Disabled
-		{
-			get { return disabled; }
-			set { disabled = value; dirty = true;}
-		}
-
-		public bool IsExplored(int2 xy) { return IsExplored(xy.X, xy.Y); }
-		public bool IsExplored(int x, int y)
-		{
-			if (disabled)
-				return true;
-			return shroud.exploredCells[x,y];
-		}
-
-		public bool IsVisible(int2 xy) { return IsVisible(xy.X, xy.Y); }
-		public bool IsVisible(int x, int y)
-		{
-			if (disabled)
-				return true;
-			return shroud.visibleCells[x,y] != 0;
-		}
-		
-		static readonly byte[][] SpecialShroudTiles =
-		{
-			new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
-			new byte[] { 32, 32, 25, 25, 19, 19, 20, 20 },
-			new byte[] { 33, 33, 33, 33, 26, 26, 26, 26, 21, 21, 21, 21, 23, 23, 23, 23 },
-			new byte[] { 36, 36, 36, 36, 30, 30, 30, 30 },
-			new byte[] { 34, 16, 34, 16, 34, 16, 34, 16, 27, 22, 27, 22, 27, 22, 27, 22 },
-			new byte[] { 44 },
-			new byte[] { 37, 37, 37, 37, 37, 37, 37, 37, 31, 31, 31, 31, 31, 31, 31, 31 },
-			new byte[] { 40 },
-			new byte[] { 35, 24, 17, 18 },
-			new byte[] { 39, 39, 29, 29 },
-			new byte[] { 45 },
-			new byte[] { 43 },
-			new byte[] { 38, 28 },
-			new byte[] { 42 },
-			new byte[] { 41 },
-			new byte[] { 46 },
-		};
-		
-		Sprite ChooseShroud(int i, int j)
-		{
-			if( !shroud.exploredCells[ i, j ] ) return shadowBits[ 0xf ];
-
-			// bits are for unexploredness: up, right, down, left
-			var v = 0;
-			// bits are for unexploredness: TL, TR, BR, BL
-			var u = 0;
-
-			if( !shroud.exploredCells[ i, j - 1 ] ) { v |= 1; u |= 3; }
-			if( !shroud.exploredCells[ i + 1, j ] ) { v |= 2; u |= 6; }
-			if( !shroud.exploredCells[ i, j + 1 ] ) { v |= 4; u |= 12; }
-			if( !shroud.exploredCells[ i - 1, j ] ) { v |= 8; u |= 9; }
-
-			var uSides = u;
-
-			if( !shroud.exploredCells[ i - 1, j - 1 ] ) u |= 1;
-			if( !shroud.exploredCells[ i + 1, j - 1 ] ) u |= 2;
-			if( !shroud.exploredCells[ i + 1, j + 1 ] ) u |= 4;
-			if( !shroud.exploredCells[ i - 1, j + 1 ] ) u |= 8;
-
-			return shadowBits[ SpecialShroudTiles[ u ^ uSides ][ v ] ];
-		}
-
-		Sprite ChooseFog(int i, int j)
-		{
-			if (shroud.visibleCells[i, j] == 0) return shadowBits[0xf];
-			if (!shroud.exploredCells[i, j]) return shadowBits[0xf];
-
-			// bits are for unexploredness: up, right, down, left
-			var v = 0;
-			// bits are for unexploredness: TL, TR, BR, BL
-			var u = 0;
-
-			if (shroud.visibleCells[i, j - 1] == 0) { v |= 1; u |= 3; }
-			if (shroud.visibleCells[i + 1, j] == 0) { v |= 2; u |= 6; }
-			if (shroud.visibleCells[i, j + 1] == 0) { v |= 4; u |= 12; }
-			if (shroud.visibleCells[i - 1, j] == 0) { v |= 8; u |= 9; }
-
-			var uSides = u;
-
-			if (shroud.visibleCells[i - 1, j - 1] == 0) u |= 1;
-			if (shroud.visibleCells[i + 1, j - 1] == 0) u |= 2;
-			if (shroud.visibleCells[i + 1, j + 1] == 0) u |= 4;
-			if (shroud.visibleCells[i - 1, j + 1] == 0) u |= 8;
-
-			return shadowBits[SpecialShroudTiles[u ^ uSides][v]];
-		}
-
-		internal void Draw()
-		{
-			if (disabled)
-				return;
-			
-			if (dirty)
-			{
-				dirty = false;
-				for (int i = map.TopLeft.X; i < map.BottomRight.X; i++)
-					for (int j = map.TopLeft.Y; j < map.BottomRight.Y; j++)
-						sprites[i, j] = ChooseShroud(i, j);
-				for (int i = map.TopLeft.X; i < map.BottomRight.X; i++)
-					for (int j = map.TopLeft.Y; j < map.BottomRight.Y; j++)
-						fogSprites[i, j] = ChooseFog(i, j);
-			}
-
-			var clipRect = Bounds.HasValue ? Rectangle.Intersect(Bounds.Value, map.Bounds) : map.Bounds;
-
-			var miny = clipRect.Top;
-			var maxy = clipRect.Bottom;
-			var minx = clipRect.Left;
-			var maxx = clipRect.Right;
-
-			var shroudPalette = "fog";
-
-			for (var j = miny; j < maxy; j++)
-			{
-				var starti = minx;
-				for (var i = minx; i < maxx; i++)
-				{
-					if (fogSprites[i, j] == shadowBits[0x0f])
-						continue;
-
-					if (starti != i)
-					{
-						Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[starti, j],
-						    Game.CellSize * new float2(starti, j),
-						    shroudPalette,
-						    new float2(Game.CellSize * (i - starti), Game.CellSize));
-						starti = i+1;
-					}
-
-					Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[i, j],
-						Game.CellSize * new float2(i, j),
-						shroudPalette);
-					starti = i+1;
-				}
-
-				if (starti < maxx)
-					Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[starti, j],
-						Game.CellSize * new float2(starti, j),
-						shroudPalette,
-						new float2(Game.CellSize * (maxx - starti), Game.CellSize));
-			}
-
-			shroudPalette = "shroud";
-
-			for (var j = miny; j < maxy; j++)
-			{
-				var starti = minx;
-				for (var i = minx; i < maxx; i++)
-				{
-					if (sprites[i, j] == shadowBits[0x0f])
-						continue;
-
-					if (starti != i)
-					{
-						Game.Renderer.SpriteRenderer.DrawSprite(sprites[starti, j],
-							Game.CellSize * new float2(starti, j),
-							shroudPalette,
-							new float2(Game.CellSize * (i - starti), Game.CellSize));
-						starti = i + 1;
-					}
-
-					Game.Renderer.SpriteRenderer.DrawSprite(sprites[i, j],
-						Game.CellSize * new float2(i, j),
-						shroudPalette);
-					starti = i + 1;
-				}
-
-				if (starti < maxx)
-					Game.Renderer.SpriteRenderer.DrawSprite(sprites[starti, j],
-						Game.CellSize * new float2(starti, j),
-						shroudPalette,
-						new float2(Game.CellSize * (maxx - starti), Game.CellSize));
-			}
-		}
-	}
-}

OpenRA.Game/Sound.cs

@@ -28,8 +28,7 @@ namespace OpenRA
 
 		static ISoundSource LoadSound(string filename)
 		{
-			var data = AudLoader.LoadSound(FileSystem.Open(filename));
-			return soundEngine.AddSoundSourceFromMemory(data, 1, 16, 22050);
+            return LoadSoundRaw(AudLoader.LoadSound(FileSystem.Open(filename)));
 		}
 
 		static ISoundSource LoadSoundRaw(byte[] rawData)
@@ -48,60 +47,49 @@ namespace OpenRA
 
 		public static void SetListenerPosition(float2 position) { soundEngine.SetListenerPosition(position); }
 
-		public static void Play(string name)
+		static ISound Play(Player player, string name, bool headRelative, float2 pos, float volumeModifier)
 		{
+			if (player != null && player != player.World.LocalPlayer)
+				return null;
 			if (name == "" || name == null)
-				return;
+				return null;
 
-			var sound = sounds[name];
-			soundEngine.Play2D(sound, false, true, float2.Zero, SoundVolume);
-		}
-
-		public static void Play(string name, float2 pos)
-		{
-			if (name == "" || name == null)
-				return;
-			
-			var sound = sounds[name];
-			soundEngine.Play2D(sound, false, false, pos, SoundVolume);
-		}
-
-		public static void PlayToPlayer(Player player, string name)
-		{
-			if( player == player.World.LocalPlayer )
-				Play( name );
-		}
-
-		public static void PlayToPlayer(Player player, string name, float2 pos)
-		{
-			if (player == player.World.LocalPlayer)
-				Play(name, pos);
+			return soundEngine.Play2D(sounds[name],
+				false, headRelative, pos,
+				InternalSoundVolume * volumeModifier);
 		}
 
+		public static ISound Play(string name) { return Play(null, name, true, float2.Zero, 1); }
+		public static ISound Play(string name, float2 pos) { return Play(null, name, false, pos, 1); }
+		public static ISound Play(string name, float volumeModifier) { return Play(null, name, true, float2.Zero, volumeModifier); }
+		public static ISound Play(string name, float2 pos, float volumeModifier) { return Play(null, name, false, pos, volumeModifier); }
+		public static ISound PlayToPlayer(Player player, string name) { return Play( player, name, true, float2.Zero, 1); }
+		public static ISound PlayToPlayer(Player player, string name, float2 pos) { return Play(player, name, false, pos, 1); }
+		
 		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()
 		{
 			if (video != null)
 				soundEngine.PauseSound(video, false);
 		}
-		
+
 		public static void PauseVideo()
 		{
 			if (video != null)
 				soundEngine.PauseSound(video, true);
 		}
-		
+
 		public static void StopVideo()
 		{
 			if (video != null)
 				soundEngine.StopSound(video);
 		}
-		
+
 		public static void Tick()
 		{
 			// Song finished
@@ -111,13 +99,13 @@ namespace OpenRA
 				OnMusicComplete();
 			}
 		}
-		
+
 		static Action OnMusicComplete;
 		public static bool MusicPlaying { get; private set; }
-		
+
 		public static void PlayMusic(string name)
 		{
-			PlayMusicThen(name, () => {});
+			PlayMusicThen(name, () => { });
 		}
 		public static void PlayMusicThen(string name, Action then)
 		{
@@ -132,13 +120,13 @@ namespace OpenRA
 				return;
 			}
 			StopMusic();
-						
+
 			currentMusic = name;
 			MusicPlaying = true;
 			var sound = sounds[name];
 			music = soundEngine.Play2D(sound, false, true, float2.Zero, MusicVolume);
 		}
-		
+
 		public static void PlayMusic()
 		{
 			if (music == null)
@@ -147,20 +135,26 @@ namespace OpenRA
 			soundEngine.PauseSound(music, false);
 		}
 
+		public static void StopSound(ISound sound)
+		{
+			if (sound != null)
+				soundEngine.StopSound(sound);
+		}
+
 		public static void StopMusic()
 		{
 			if (music != null)
 				soundEngine.StopSound(music);
-			
+
 			MusicPlaying = false;
 			currentMusic = null;
 		}
-		
+
 		public static void PauseMusic()
 		{
 			if (music == null)
 				return;
-			
+
 			MusicPlaying = false;
 			soundEngine.PauseSound(music, true);
 		}
@@ -168,16 +162,28 @@ namespace OpenRA
 		public static float GlobalVolume
 		{
 			get { return soundEngine.Volume; }
-			set { soundEngine.Volume = value;}
+			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);
 			}
 		}
 
@@ -191,7 +197,7 @@ namespace OpenRA
 					music.Volume = value;
 			}
 		}
-		
+
 		public static float VideoVolume
 		{
 			get { return Game.Settings.Sound.VideoVolume; }
@@ -202,17 +208,17 @@ namespace OpenRA
 					video.Volume = value;
 			}
 		}
-		
+
 		public static float MusicSeekPosition
 		{
-			get { return (music != null)? music.SeekPosition : 0; }	
+			get { return (music != null) ? music.SeekPosition : 0; }
 		}
-		
+
 		public static float VideoSeekPosition
 		{
-			get { return (video != null)? video.SeekPosition : 0; }	
+			get { return (video != null) ? video.SeekPosition : 0; }
 		}
-		
+
 		// Returns true if it played a phrase
 		public static bool PlayVoice(string phrase, Actor voicedUnit, string variant)
 		{
@@ -228,9 +234,9 @@ namespace OpenRA
 			var clip = vi.Pools.Value[phrase].GetNext();
 			if (clip == null)
 				return false;
-			
-			var variantext = (vi.Variants.ContainsKey(variant) && !vi.DisableVariants.Contains(phrase))? 
-				  vi.Variants[variant][voicedUnit.ActorID % vi.Variants.Count] : vi.DefaultVariant;
+
+			var variantext = (vi.Variants.ContainsKey(variant) && !vi.DisableVariants.Contains(phrase)) ?
+				  vi.Variants[variant][voicedUnit.ActorID % vi.Variants[variant].Length] : vi.DefaultVariant;
 			Play(clip + variantext);
 			return true;
 		}
@@ -249,8 +255,9 @@ namespace OpenRA
 		void SetSoundVolume(float volume, ISound music, ISound video);
 	}
 
-	interface ISoundSource {}
-	interface ISound
+	interface ISoundSource { }
+
+	public interface ISound
 	{
 		float Volume { get; set; }
 		float SeekPosition { get; }
@@ -283,7 +290,7 @@ namespace OpenRA
 					Log.Write("debug", "Failed generating OpenAL source {0}", i);
 					return;
 				}
-					
+
 				sourcePool.Add(source, false);
 			}
 		}
@@ -335,10 +342,10 @@ namespace OpenRA
 			get { return volume; }
 			set { Al.alListenerf(Al.AL_GAIN, volume = value); }
 		}
-		
+
 		public void PauseSound(ISound sound, bool paused)
 		{
-			int key = ((OpenAlSound) sound).source;
+			int key = ((OpenAlSound)sound).source;
 			int state;
 			Al.alGetSourcei(key, Al.AL_SOURCE_STATE, out state);
 			if (state == Al.AL_PLAYING && paused)
@@ -346,9 +353,9 @@ namespace OpenRA
 			else if (state == Al.AL_PAUSED && !paused)
 				Al.alSourcePlay(key);
 		}
-		
+
 		public void SetAllSoundsPaused(bool paused)
-		{	
+		{
 			foreach (int key in sourcePool.Keys)
 			{
 				int state;
@@ -357,35 +364,35 @@ namespace OpenRA
 					Al.alSourcePause(key);
 				else if (state == Al.AL_PAUSED && !paused)
 					Al.alSourcePlay(key);
-					
+
 			}
 		}
-					
+
 		public void SetSoundVolume(float volume, ISound music, ISound video)
 		{
-			var sounds = sourcePool.Select(s => s.Key).Where( b => 
-			{ 
+			var sounds = sourcePool.Select(s => s.Key).Where(b =>
+			{
 				int state;
 				Al.alGetSourcei(b, Al.AL_SOURCE_STATE, out state);
-				return ((state == Al.AL_PLAYING || state == Al.AL_PAUSED) && 
-					   ((music != null)? b != ((OpenAlSound) music).source : true) &&
-					   ((video != null)? b != ((OpenAlSound) video).source : true));
+				return ((state == Al.AL_PLAYING || state == Al.AL_PAUSED) &&
+					   ((music != null) ? b != ((OpenAlSound)music).source : true) &&
+					   ((video != null) ? b != ((OpenAlSound)video).source : true));
 			}).ToList();
 			foreach (var s in sounds)
 			{
 				Al.alSourcef(s, Al.AL_GAIN, volume);
 			}
 		}
-		
+
 		public void StopSound(ISound sound)
 		{
-			int key = ((OpenAlSound) sound).source;
+			int key = ((OpenAlSound)sound).source;
 			int state;
 			Al.alGetSourcei(key, Al.AL_SOURCE_STATE, out state);
 			if (state == Al.AL_PLAYING || state == Al.AL_PAUSED)
 				Al.alSourceStop(key);
 		}
-		
+
 		public void StopAllSounds()
 		{
 			foreach (int key in sourcePool.Keys)
@@ -399,7 +406,7 @@ namespace OpenRA
 
 		public void SetListenerPosition(float2 position)
 		{
-			var orientation = new [] { 0f, 0f, 1f, 0f, -1f, 0f };
+			var orientation = new[] { 0f, 0f, 1f, 0f, -1f, 0f };
 
 			Al.alListener3f(Al.AL_POSITION, position.X, position.Y, 50);
 			Al.alListenerfv(Al.AL_ORIENTATION, ref orientation[0]);
@@ -451,26 +458,26 @@ namespace OpenRA
 		public float Volume
 		{
 			get { return volume; }
-			set 
+			set
 			{
 				if (source != -1)
-					Al.alSourcef(source, Al.AL_GAIN, volume = value); 
+					Al.alSourcef(source, Al.AL_GAIN, volume = value);
 			}
 		}
-		
+
 		public float SeekPosition
 		{
 			get
 			{
 				float pos;
 				Al.alGetSourcef(source, Al.AL_SAMPLE_OFFSET, out pos);
-				return pos/22050f; 
+				return pos / 22050f;
 			}
 		}
-		
+
 		public bool Playing
 		{
-			get 
+			get
 			{
 				int state;
 				Al.alGetSourcei(source, Al.AL_SOURCE_STATE, out state);

OpenRA.Game/Support/PerfHistory.cs

@@ -15,12 +15,12 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Support
 {
-	static class PerfHistory
+	public static class PerfHistory
 	{
 		static readonly Color[] colors = { Color.Red, Color.Green, 
-											 Color.Blue, Color.Yellow, 
-											 Color.Orange, Color.Fuchsia, 
-											 Color.Lime, Color.LightBlue, 
+											 Color.Orange, Color.Yellow, 
+											 Color.Fuchsia, Color.Lime, 
+											 Color.LightBlue, Color.Blue, 
 											 Color.White, Color.Teal };
 		static int nextColor;
 
@@ -45,7 +45,7 @@ namespace OpenRA.Support
 		}
 	}
 
-	class PerfItem
+	public class PerfItem
 	{
 		public readonly Color c;
 		public readonly string Name;
@@ -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

@@ -129,5 +129,36 @@ namespace OpenRA
 				return p.Index * 0x567;
 			return 0;
 		}
+
+		public static void CheckSyncUnchanged( World world, Action fn )
+		{
+			CheckSyncUnchanged( world, () => { fn(); return true; } );
+		}
+
+		static bool inUnsyncedCode = false;
+
+		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
+			{
+				return fn();
+			}
+			finally
+			{
+				inUnsyncedCode = prevInUnsyncedCode;
+				if( sync != world.SyncHash() )
+					throw new InvalidOperationException( "CheckSyncUnchanged: sync-changing code may not run here" );
+			}
+		}
+
+		public static void AssertUnsynced( string message )
+		{
+			if( !inUnsyncedCode )
+				throw new InvalidOperationException( message );
+		}
 	}
 }

OpenRA.Game/TraitDictionary.cs

@@ -75,7 +75,7 @@ namespace OpenRA
 
 		public IEnumerable<TraitPair<T>> ActorsWithTraitMultiple<T>( World world )
 		{
-			return ( (TraitContainer<T>)InnerGet( typeof( T ) ) ).All();//.Where( x => x.Actor.IsInWorld );
+			return ( (TraitContainer<T>)InnerGet( typeof( T ) ) ).All();
 		}
 
 		public void RemoveActor( Actor a )

OpenRA.Game/Traits/Activities/CancelableActivity.cs

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

OpenRA.Game/Traits/Building.cs

@@ -1,117 +0,0 @@
-#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.Drawing;
-using System.Linq;
-using OpenRA.Effects;
-using OpenRA.GameRules;
-using OpenRA.Traits.Activities;
-
-namespace OpenRA.Traits
-{
-	public class BuildingInfo : ITraitInfo
-	{
-		public readonly int Power = 0;
-		public readonly bool BaseNormal = true;
-		public readonly bool WaterBound = false;
-		public readonly int Adjacent = 2;
-		public readonly bool Capturable = false;
-		public readonly string Footprint = "x";
-		public readonly int2 Dimensions = new int2(1, 1);
-		public readonly bool Unsellable = false;
-		public readonly float RefundPercent = 0.5f;
-		
-		public readonly string[] BuildSounds = {"placbldg.aud", "build5.aud"};
-		public readonly string[] SellSounds = {"cashturn.aud"};
-		public readonly string DamagedSound = "kaboom1.aud";
-		public readonly string DestroyedSound = "kaboom22.aud";
-
-		public object Create(ActorInitializer init) { return new Building(init); }
-	}
-
-	public class Building : INotifyDamage, IResolveOrder, IRenderModifier, IOccupySpace
-	{
-		readonly Actor self;
-		public readonly BuildingInfo Info;
-		[Sync]
-		readonly int2 topLeft;
-
-		public bool Disabled
-		{
-			get	{ return self.TraitsImplementing<IDisable>().Any(t => t.Disabled); }
-		}
-
-		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);
-		}
-		
-		public int GetPowerUsage()
-		{
-			var modifier = self
-				.TraitsImplementing<IPowerModifier>()
-				.Select(t => t.GetPowerModifier())
-				.Product();
-			
-			if (Info.Power > 0)
-			{
-				var health = self.TraitOrDefault<Health>();
-				var healthFraction = (health == null) ? 1f : health.HPFraction;
-				return (int)(modifier * healthFraction * Info.Power);
-			}
-			else
-				return (int)(modifier * Info.Power);
-		}
-
-		public void Damaged(Actor self, AttackInfo e)
-		{
-			if (e.DamageState == DamageState.Dead)
-			{
-				self.World.WorldActor.Trait<ScreenShaker>().AddEffect(10, self.CenterLocation, 1);
-				Sound.Play(Info.DestroyedSound, self.CenterLocation);
-			}
-		}
-
-		public void ResolveOrder(Actor self, Order order)
-		{
-			if (order.OrderString == "Sell")
-			{
-				self.CancelActivity();
-				self.QueueActivity(new Sell());
-			}
-		}
-		
-		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
-		{
-			foreach (var a in r)
-			{
-				yield return a;
-				if (Disabled)
-					yield return a.WithPalette("disabled");
-			}
-		}
-
-		public int2 TopLeft
-		{
-			get { return topLeft; }
-		}
-
-		public IEnumerable<int2> OccupiedCells()
-		{
-			return Footprint.UnpathableTiles( self.Info.Name, Info, TopLeft );
-		}
-	}
-}