Merge pull request #8936 from Mailaender/lint-perf

Improved the --check-yaml performance

.gitattributes

@@ -1,4 +1,6 @@
 # Enforce LF normalization on Windows
+*.yaml eol=lf
+*.lua eol=lf
 * text=lf
 
 # Custom for Visual Studio

.gitignore

@@ -12,6 +12,12 @@ obj
 *.lastcodeanalysissucceeded
 _ReSharper.*/
 
+# movies
+*.vqa
+
+# archives
+*.mix
+
 # binaries
 mods/*/*.dll
 mods/*/*.mdb
@@ -22,6 +28,8 @@ mods/*/*.mdb
 /*.pdb
 /*.mdb
 /*.exe
+thirdparty/download/*
+*.mmdb.gz
 
 # backup files by various editors
 *~
@@ -54,9 +62,11 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 DOCUMENTATION.md
 Lua-API.md
 *.html
+openra.6
 
 # StyleCop
 *.Cache
+StyleCopViolations.xml
 
 # SublimeText
 *.sublime-project

.travis.yml

@@ -1,28 +1,41 @@
 # Travis-CI Build for OpenRA
 # see travis-ci.org for details
 
-# Mono/.NET are not officially supported. The following is a workaround.
-language: c
+language: csharp
+mono: 3.12.0
 
-# Make sure build dependencies are installed.
-install:
- - wget http://download.mono-project.com/repo/xamarin.gpg -O /tmp/mono.gpg
- - sudo apt-key add /tmp/mono.gpg
- - sudo sh -c "echo 'deb http://download.mono-project.com/repo/debian wheezy/snapshots/3.8.0 main' >> /etc/apt/sources.list.d/mono-xamarin.list"
- - sudo apt-get update -qq
- - sudo apt-get install -qq mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6 libgdiplus=2.10-3
-cache: apt
+# http://docs.travis-ci.com/user/migrating-from-legacy
+sudo: false
 
+cache:
+  directories:
+  - thirdparty/download
+
+addons:
+  apt:
+    packages:
+    - nsis
+    - nsis-common
+    - dpkg
+    - markdown
+
+# Environment variables
+env:
+  secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs="
+
+# Fetch dependencies
 # Run the build script
-# call RALint to check for YAML errors
+# Check source code with StyleCop
+# call OpenRA to check for YAML errors
 script:
- - make dependencies
+ - travis_retry make all-dependencies
  - make all
+ - make check
  - make test
 
 # Automatically update the trait documentation and Lua API
 after_success:
- - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && make docs && cd packaging && ./update-wiki.sh
+ - test $TRAVIS_PULL_REQUEST == "false" && make docs && cd packaging && ./update-wiki.sh $TRAVIS_BRANCH; cd ..
 
 # Only watch the development branch and tagged release.
 branches:
@@ -30,6 +43,7 @@ branches:
    - /^release-.*$/
    - /^playtest-.*$/
    - /^pkgtest-.*$/
+   - /^prep-.*$/
    - bleed
 
 # Notify developers when build passed/failed.
@@ -43,12 +57,7 @@ notifications:
     skip_join: true
 
 before_deploy:
- - sudo apt-get install nsis markdown dpkg rpm libarchive-dev m4 fakeroot bsdtar
- - wget ftp://ftp.archlinux.org/other/pacman/pacman-4.0.3.tar.gz -O /tmp/pacman-4.0.3.tar.gz
- - pushd /tmp
- - tar -xzvf pacman-4.0.3.tar.gz
- - cd pacman-4.0.3 && ./configure --disable-doc --prefix=/usr && make && sudo make install
- - popd
+ - export PATH=$PATH:$HOME/usr/bin
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build
@@ -56,13 +65,11 @@ before_deploy:
 deploy:
   provider: releases
   api_key:
-    secure: "cMC68erxuf0jb4Pe0sOH4m1f7I2LWPUatD9BC0WeZ9PwTnWOzrm0hnjZIES4TTKVo8WIfZIiCfxpdAFeoh6bomG2MsKwSKMc8qHGhfNGqPnyzYh6zdPZaA+4Q3TDQI3DrziyDnQUFeH1h/7UZLDLxtDrOtcYcGdNg5VjvV9fJ7g="
+    secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
   file:
     - build/OpenRA-${TRAVIS_TAG}.exe
     - build/OpenRA-${TRAVIS_TAG}.zip
     - build/openra_${DOTVERSION}_all.deb
-    - build/openra-${DOTVERSION}-1-any.pkg.tar.gz
-    - build/openra-${DOTVERSION}-1.noarch.rpm
   skip_cleanup: true
   on:
     all_branches: true

AUTHORS

@@ -3,19 +3,24 @@ hard work of many contributors.
 
 The OpenRA developers are:
     * Chris Forbes (chrisf)
-    * Curtis Shmyr (hamb)
+    * Igor Popov (ihptru)
+    * Lukas Franke (abcdefg30)
     * Matthias Mailänder (Mailaender)
     * Oliver Brakmann (obrakmann)
     * Paul Chote (pchote)
-    * ScottNZ
+    * Pavel Penev (penev92)
+    * Reaperrr
+    * Tom Roostan (RoosterDragon)
 
 Previous developers included:
     * Alli Witheford (alzeih)
     * Caleb Anderson (RobotCaleb)
+    * Curtis Shmyr (hamb)
     * Daniel Hernandez (Mancano)
     * Megan Bowra-Dean (beedee)
     * Mike Bundy (kehaar)
     * Robert Pepperell (ytinasni)
+    * ScottNZ
 
 Also thanks to:
     * Adam Valy (Tschokky)
@@ -26,30 +31,40 @@ Also thanks to:
     * Andrew Perkins
     * Andrew Riedi
     * Andreas Beck (baxtor)
+    * Ang Soon Li (asl97)
+    * Arik Lirette (Angusm3)
     * Barnaby Smith (mvi)
     * Bellator
     * Braxton Williams (Buddytex)
+    * Bryan Wilbur
     * Bugra Cuhadaroglu (BugraC)
     * Christer Ulfsparre (Holloweye)
+    * Chris Grant (Unit158)
     * Cody Brittain (Generalcamo)
     * D2k Sardaukar
     * Daniel Derejvanik (Harisson)
     * Danny Keary (Dan9550)
+    * David Jiménez (Rydra)
+    * David Russell (DavidARussell)
     * DeadlySurprise
+    * Dmitri Suvorov (suvjunmd)
     * Erasmus Schroder (rasco)
     * Eric Bajumpaa (SteelPhase)
     * Fahrradkette
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
+    * Glen Anderson (GlenAnderson)
+    * Glenn Martin Jensen (Baxxster)
     * Gordon Martin (Happy0)
     * Guido Lipke (LipkeGu)
+    * Gyula Zimmermann (Graion Dilach)
     * Huw Pascoe
     * Ian T. Jacobsen (Smilex)
-    * Igor Popov (ihptru)
     * Imago
     * Iran
     * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
+    * Jan-Willem Buurlage (jwbuurlage)
     * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
     * Jes
@@ -60,17 +75,18 @@ Also thanks to:
     * Kyrre Soerensen (zypres)
     * Lawrence Wang
     * Lesueur Benjamin (Valkirie)
-    * Lukas Franke (abcdefg30)
     * Maarten Meuris (Nyerguds)
     * Mark Olson (markolson)
     * Matija Hustic (matija-hustic)
     * Matthew Gatland (mgatland)
     * Matthew Uzzell (MUzzell)
+    * Matthijs Benschop (Nerdie)
     * Max621
     * Max Ugrumov (katzsmile)
     * Michael Sztolcman (s1w_)
     * Mustafa Alperen Seki (MustaphaTR)
     * Neil Shivkar (havok13888)
+    * Nooze
     * Nukem
     * Okunev Yu Dmitry (xaionaro)
     * Olaf van der Spek
@@ -81,7 +97,6 @@ Also thanks to:
     * Psydev
     * Raymond Bedrossian (Squiggles211)
     * Raymond Martineau (mart0258)
-    * Reaperrr
     * Riderr3
     * Rikhardur Bjarni Einarsson (WolfGaming)
     * Sascha Biedermann (bidifx)
@@ -92,12 +107,14 @@ Also thanks to:
     * Teemu Nieminen (Temeez)
     * Tim Mylemans (gecko)
     * Tirili
-    * Tom Roostan (RoosterDragon)
     * Tristan Keating (Kilkakon)
     * Tristan Mühlbacher (MicroBit)
     * Vladimir Komarov (VrKomarov)
     * Wuschel
 
+Using GNU FreeFont distributed under the GNU GPL
+terms.
+
 Using Simple DirectMedia Layer distributed under
 the terms of the zlib license.
 

CONTRIBUTING.md

@@ -4,7 +4,10 @@
 
 * Have you read the [FAQ](https://github.com/OpenRA/OpenRA/wiki/FAQ)?
 * Add the appropriate log files on crashes.
+* Mention the version you have tested against.
 * Please be specific on how to reproduce the problem.
+* Do not submit duplicate issues. Search first.
+* Avoid including multiple requests/bugs into a single issue.
 
 ## Patches
 

INSTALL.md

@@ -6,26 +6,24 @@ The following lists per-platform dependencies required to build from source.
 Windows
 =======
 
+* [Windows PowerShell >= 4.0](http://microsoft.com/powershell)
 * [.NET Framework >= 4.0 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=17113)
-* [SDL 2 (included)](http://www.libsdl.org/download-2.0.php)
-* [FreeType (included)](http://gnuwin32.sourceforge.net/packages/freetype.htm)
-* [zlib (included)](http://gnuwin32.sourceforge.net/packages/zlib.htm)
-* [OpenAL (included)](http://kcat.strangesoft.net/openal.html)
-* [liblua 5.1 (included)](http://luabinaries.sourceforge.net/download.html)
+* [SDL 2](http://www.libsdl.org/download-2.0.php) (included)
+* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included)
+* [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included)
+* [OpenAL](http://kcat.strangesoft.net/openal.html) (included)
+* [liblua 5.1](http://luabinaries.sourceforge.net/download.html) (included)
 
-To compile OpenRA, open the `OpenRA.sln` solution in the main folder,
-or build it from the command-line with MSBuild.
+You need to fetch the thirdparty dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places by typing `make dependencies` in a command terminal.
 
-Copy both the native DLLs from `.\thirdparty\windows`
-and the CLI images from `.\thirdparty` to the main folder.
+To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with MSBuild or use the Makefile analogue command `make all` scripted in PowerShell syntax.
 
-Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert
-or `OpenRA.Game.exe Game.Mod=cnc` for Tiberian Dawn.
+Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert or `OpenRA.Game.exe Game.Mod=cnc` for Tiberian Dawn.
 
 Linux
 =====
 
-Run `./configure` to map the native libraries to your system.
+Use `make dependencies` to map the native libraries to your system, fetch the remaining CLI dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places.
 
 To compile OpenRA, run `make all` from the command line.
 
@@ -38,6 +36,7 @@ Debian/Ubuntu
 
 * mono-dmcs
 * libmono-system-windows-forms4.0-cil
+* nuget
 * cli-common-dev (>= 2.10)
 * libfreetype6
 * libopenal1
@@ -50,6 +49,7 @@ openSUSE
 --------
 
 * mono-devel
+* nuget
 * openal
 * freetype2
 * SDL2
@@ -62,6 +62,7 @@ Gentoo
 
 * dev-lang/mono
 * dev-dotnet/libgdiplus
+* dev-dotnet/nuget
 * media-libs/freetype:2
 * media-libs/libsdl2
 * media-libs/openal

Makefile

@@ -1,14 +1,17 @@
 ############################# INSTRUCTIONS #############################
 #
 # to compile, run:
-#   make
+#   make [DEBUG=false]
 #
 # to compile with development tools, run:
-#   make all
+#   make all [DEBUG=false]
 #
 # to check the official mods for erroneous yaml files, run:
 #   make test
 #
+# to check the official mod dlls for StyleCop violations, run:
+#   make check
+#
 # to generate documentation aimed at modders, run:
 #   make docs
 #
@@ -19,7 +22,7 @@
 #   make [prefix=/foo] [bindir=/bar/bin] install-all
 #
 # to install Linux startup scripts, desktop files and icons:
-#   make install-linux-shortcuts
+#   make install-linux-shortcuts [DEBUG=false]
 #
 # to uninstall, run:
 #   make uninstall
@@ -35,9 +38,17 @@
 ############################## TOOLCHAIN ###############################
 #
 CSC         = dmcs
-CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
-DEFINE      = DEBUG;TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll thirdparty/MaxMind.Db.dll thirdparty/MaxMind.GeoIP2.dll thirdparty/Eluant.dll
+CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
+DEFINE      = TRACE
+COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll
+
+DEBUG = true
+ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
+CSFLAGS   += -debug:pdbonly -optimize+
+else
+CSFLAGS   += -debug:full -optimize-
+DEFINE    := DEBUG;$(DEFINE)
+endif
 
 
 
@@ -47,6 +58,7 @@ COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExte
 prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
 datadir ?= $(datarootdir)
+mandir ?= $(datarootdir)/man/
 bindir ?= $(prefix)/bin
 libdir ?= $(prefix)/lib
 gameinstalldir ?= $(libdir)/openra
@@ -67,10 +79,18 @@ INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
-CORE = rsdl2 rnull game utility ralint
-TOOLS = editor tsbuild crashdialog
+CORE = rsdl2 rnull game utility
+TOOLS = gamemonitor
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
+# dependencies
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+os-dependencies = osx-dependencies
+else
+os-dependencies = linux-dependencies
+endif
+
 
 
 ######################## PROGRAM TARGET RULES ##########################
@@ -80,7 +100,7 @@ VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev
 game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET = OpenRA.Game.exe
 game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/SDL2-CS.dll thirdparty/SharpFont.dll
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SDL2-CS.dll thirdparty/download/SharpFont.dll
 game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS += game
 game: $(game_TARGET)
@@ -90,7 +110,7 @@ rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
 rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
 rsdl2_KIND = library
 rsdl2_DEPS = $(game_TARGET)
-rsdl2_LIBS = $(COMMON_LIBS) thirdparty/SDL2-CS.dll $(rsdl2_DEPS)
+rsdl2_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll $(rsdl2_DEPS)
 
 rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
 rnull_TARGET = OpenRA.Renderer.Null.dll
@@ -105,14 +125,14 @@ mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
 mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
 mod_common_KIND = library
 mod_common_DEPS = $(game_TARGET)
-mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS)
+mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
 PROGRAMS += mod_common
 mod_common: $(mod_common_TARGET)
 
 ##### Official Mods #####
 
 STD_MOD_LIBS	= $(game_TARGET)
-STD_MOD_DEPS	= $(STD_MOD_LIBS) $(ralint_TARGET)
+STD_MOD_DEPS	= $(STD_MOD_LIBS)
 
 # Red Alert
 mod_ra_SRCS := $(shell find OpenRA.Mods.RA/ -iname '*.cs')
@@ -127,8 +147,8 @@ mod_ra: $(mod_ra_TARGET)
 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 = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET)
-mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
+mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_cnc
 mod_cnc: $(mod_cnc_TARGET)
 
@@ -136,8 +156,8 @@ mod_cnc: $(mod_cnc_TARGET)
 mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
 mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
 mod_d2k_KIND = library
-mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET) $(mod_cnc_TARGET)
-mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
+mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_d2k
 mod_d2k: $(mod_d2k_TARGET)
 
@@ -145,63 +165,59 @@ mod_d2k: $(mod_d2k_TARGET)
 mod_ts_SRCS := $(shell find OpenRA.Mods.TS/ -iname '*.cs')
 mod_ts_TARGET = mods/ts/OpenRA.Mods.TS.dll
 mod_ts_KIND = library
-mod_ts_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET)
-mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_ts_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
+mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_ts
 mod_ts: $(mod_ts_TARGET)
 
-##### Tools #####
+check: utility mods
+	@echo
+	@echo "Checking for code style violations in OpenRA.Game..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game
+	@echo
+	@echo "Checking for code style violations in OpenRA.Renderer.Null..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Null
+	@echo
+	@echo "Checking for code style violations in OpenRA.GameMonitor..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.GameMonitor
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.Common..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Common
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.RA..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.Cnc..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Cnc
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.D2k..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.D2k
+	@echo
+	@echo "Checking for code style violations in OpenRA.Mods.TS..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS
+	@echo
+	@echo "Checking for code style violations in OpenRA.Renderer.Sdl2..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Sdl2
+	@echo
+	@echo "Checking for code style violations in OpenRA.Utility..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
+	@echo
+	@echo "Checking for code style violations in OpenRA.Test..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
 
-# Map Editor
-editor_SRCS := $(shell find OpenRA.Editor/ -iname '*.cs')
-editor_TARGET = OpenRA.Editor.exe
-editor_KIND = winexe
-editor_DEPS = $(game_TARGET) $(mod_common_TARGET)
-editor_LIBS = System.Windows.Forms.dll System.Data.dll System.Drawing.dll $(editor_DEPS) thirdparty/Eluant.dll
-editor_EXTRA = -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
-editor_FLAGS = -win32icon:OpenRA.Editor/OpenRA.Editor.Icon.ico
-
-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 OpenRA.Lint/ -iname '*.cs')
-ralint_TARGET = OpenRA.Lint.exe
-ralint_KIND = exe
-ralint_DEPS = $(game_TARGET)
-ralint_LIBS = $(COMMON_LIBS) $(ralint_DEPS)
-PROGRAMS += ralint
-ralint: $(ralint_TARGET)
-
-test:
-	@echo "OpenRA.Lint: checking Red Alert mod MiniYAML..."
-	@mono --debug OpenRA.Lint.exe --verbose ra
-	@echo "OpenRA.Lint: checking Tiberian Dawn mod MiniYAML..."
-	@mono --debug OpenRA.Lint.exe --verbose cnc
-	@echo "OpenRA.Lint: checking Dune 2000 mod MiniYAML..."
-	@mono --debug OpenRA.Lint.exe --verbose d2k
-	@echo "OpenRA.Lint: checking Tiberian Sun mod MiniYAML..."
-	@mono --debug OpenRA.Lint.exe --verbose ts
-
-# Builds and exports tilesets from a bitmap
-tsbuild_SRCS := $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET = OpenRA.TilesetBuilder.exe
-tsbuild_KIND = winexe
-tsbuild_DEPS = $(game_TARGET)
-tsbuild_LIBS = $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
-tsbuild_EXTRA = -resource:OpenRA.TilesetBuilder.FormBuilder.resources -resource:OpenRA.TilesetBuilder.FormNew.resources -resource:OpenRA.TilesetBuilder.Surface.resources
-PROGRAMS += tsbuild
-OpenRA.TilesetBuilder.FormBuilder.resources:
-	resgen2 OpenRA.TilesetBuilder/FormBuilder.resx OpenRA.TilesetBuilder.FormBuilder.resources 1> /dev/null
-OpenRA.TilesetBuilder.FormNew.resources:
-	resgen2 OpenRA.TilesetBuilder/frmNew.resx OpenRA.TilesetBuilder.FormNew.resources 1> /dev/null
-OpenRA.TilesetBuilder.Surface.resources:
-	resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null
-tsbuild: OpenRA.TilesetBuilder.FormBuilder.resources OpenRA.TilesetBuilder.FormNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET)
+test: utility mods
+	@echo
+	@echo "Testing Tiberian Sun mod MiniYAML..."
+	@mono --debug OpenRA.Utility.exe ts --check-yaml
+	@echo
+	@echo "Testing Dune 2000 mod MiniYAML..."
+	@mono --debug OpenRA.Utility.exe d2k --check-yaml
+	@echo
+	@echo "Testing Tiberian Dawn mod MiniYAML..."
+	@mono --debug OpenRA.Utility.exe cnc --check-yaml
+	@echo
+	@echo "Testing Red Alert mod MiniYAML..."
+	@mono --debug OpenRA.Utility.exe ra --check-yaml
 
 
 ##### Launchers / Utilities #####
@@ -220,11 +236,10 @@ utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
 utility_TARGET = OpenRA.Utility.exe
 utility_KIND = exe
 utility_DEPS = $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll
+utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.SharpZipLib.dll
 PROGRAMS += utility
 utility: $(utility_TARGET)
 
-
 # Patches binary headers to work around a mono bug
 fixheader.exe: packaging/fixheader.cs
 	@echo CSC fixheader.exe
@@ -252,48 +267,62 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 
 ########################## MAKE/INSTALL RULES ##########################
 #
-default: cli-dependencies core
+default: core
 
-core: game renderers mods utility ralint
+core: game renderers mods utility
 
-tools: editor tsbuild gamemonitor
+tools: gamemonitor
 
-package: dependencies core editor gamemonitor docs version
+package: all-dependencies core tools docs version
 
 mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
 
-all: cli-dependencies core tools
+all: dependencies core tools
 
 clean:
-	@-$(RM_F) *.exe *.dll ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-$(RM_F) *.exe *.dll *.dylib *.dll.config ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 	@-$(RM_RF) ./*/bin ./*/obj
+	@-$(RM_RF) ./thirdparty/download
 
 distclean: clean
 
-platformdeps = "linux"
-ifeq ($(shell uname),Darwin)
-	platformdeps = "osx"
-endif
-
-dependencies: cli-dependencies native-dependencies
-
 cli-dependencies:
-	@ $(CP_R) thirdparty/*.dll .
-	@ $(CP_R) thirdparty/*.dll.config .
+	@./thirdparty/fetch-thirdparty-deps.sh
+	@ $(CP_R) thirdparty/download/*.dll .
+	@ $(CP_R) thirdparty/download/*.dll.config .
+	@ $(CP) thirdparty/SDL2-CS.dll.config .
 
-native-dependencies:
-	@ $(CP_R) thirdparty/${platformdeps}/* .
+linux-dependencies: cli-dependencies linux-native-dependencies
 
-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml
+linux-native-dependencies:
+	@./thirdparty/configure-native-deps.sh
+
+windows-dependencies:
+	@./thirdparty/fetch-thirdparty-deps-windows.sh
+
+osx-dependencies: cli-dependencies
+	@./thirdparty/fetch-thirdparty-deps-osx.sh
+	@ $(CP_R) thirdparty/download/osx/*.dylib .
+	@ $(CP_R) thirdparty/download/osx/*.dll.config .
+
+dependencies: $(os-dependencies)
+	@./thirdparty/fetch-geoip-db.sh
+	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
+
+all-dependencies: cli-dependencies windows-dependencies osx-dependencies
+
+version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
 		mv -f $${i}.tmp $${i} ; \
 	done
 
-# Documentation (d2k depends on all mod libraries)
-docs: utility
-	@mono --debug OpenRA.Utility.exe d2k --docs > DOCUMENTATION.md
-	@mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md
+docs: utility mods version
+	@mono --debug OpenRA.Utility.exe all --docs > DOCUMENTATION.md
+	@mono --debug OpenRA.Utility.exe all --lua-docs > Lua-API.md
+
+man-page: utility mods
+	@mono --debug OpenRA.Utility.exe all --man-page > openra.6
 
 install: install-core
 
@@ -317,7 +346,7 @@ install-core: default
 	@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"
 
 	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
-	@$(INSTALL_DATA) "GeoLite2-Country.mmdb" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb"
+	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
 	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
 	@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
 
@@ -335,7 +364,7 @@ install-core: default
 	@$(INSTALL_PROGRAM) Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) RestSharp.dll "$(DATA_INSTALL_DIR)"
 
-ifeq ($(shell uname),Linux)
+ifneq ($(UNAME_S),Darwin)
 	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
 endif
 
@@ -343,22 +372,40 @@ install-tools: tools
 	@-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
-	@$(RM) $(DATA_INSTALL_DIR)/OpenRA.TilesetBuilder.exe # TODO: won't work outside the source tree
 
 install-linux-icons:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
+	@$(CP_R) packaging/linux/hicolor "$(DESTDIR)$(datadir)/icons/"
 
 install-linux-desktop:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
+
+install-linux-mime:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
+
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"
+
+install-linux-appdata:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
+	@$(INSTALL_DATA) packaging/linux/openra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+
+install-man-page: man-page
+	@$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man6/"
+	@$(INSTALL_DATA) openra.6 "$(DESTDIR)$(mandir)/man6/"
 
 install-linux-scripts:
 	@echo "#!/bin/sh" > openra
 	@echo 'cd "$(gameinstalldir)"' >> openra
+ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
 	@echo 'mono OpenRA.Game.exe "$$@"' >> openra
-	@echo 'if [ $$? != 0 ]' >> openra
+else
+	@echo 'mono --debug OpenRA.Game.exe "$$@"' >> openra
+endif
+	@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
 	@echo 'then' >> openra
 	@echo 'ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."' >> openra
 	@echo '$$ZENITY --question --title "OpenRA" --text "OpenRA has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ' >> openra
@@ -369,33 +416,25 @@ install-linux-scripts:
 	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
 	@-$(RM) openra
 
-	@echo "#!/bin/sh" >  openra-editor
-	@echo 'cd "$(gameinstalldir)"' >> openra-editor
-	@echo 'exec mono OpenRA.Editor.exe "$$@"' >> openra-editor
-	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)"
-	@-$(RM) openra-editor
-
 uninstall:
 	@-$(RM_R) "$(DATA_INSTALL_DIR)"
 	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-editor"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-editor.desktop"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-editor.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-editor.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
+	@-$(RM_F) "$(DESTDIR)$(mandir)/man6/openra.6"
 
 help:
 	@echo to compile, run:
-	@echo \ \ make
+	@echo \ \ make [DEBUG=false]
 	@echo
 	@echo to compile with development tools, run:
-	@echo \ \ make all
+	@echo \ \ make all [DEBUG=false]
 	@echo
 	@echo to check the official mods for erroneous yaml files, run:
 	@echo \ \ make test
@@ -410,7 +449,7 @@ help:
 	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all
 	@echo
 	@echo to install Linux startup scripts, desktop files and icons
-	@echo \ \ make install-linux-shortcuts
+	@echo \ \ make install-linux-shortcuts [DEBUG=false]
 	@echo
 	@echo to uninstall, run:
 	@echo \ \ make uninstall

OpenRA.Editor/ActorPropertiesDialog.Designer.cs

@@ -1,90 +0,0 @@
-namespace OpenRA.Editor
-{
-	partial class ActorPropertiesDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button1 = new System.Windows.Forms.Button();
-			this.button2 = new System.Windows.Forms.Button();
-			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-			this.SuspendLayout();
-			// 
-			// button1
-			// 
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(226, 333);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 0;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			// 
-			// button2
-			// 
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button2.Enabled = false;
-			this.button2.Location = new System.Drawing.Point(145, 333);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 0;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			// 
-			// flowLayoutPanel1
-			// 
-			this.flowLayoutPanel1.AutoScroll = true;
-			this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-			this.flowLayoutPanel1.Location = new System.Drawing.Point(13, 13);
-			this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-			this.flowLayoutPanel1.Size = new System.Drawing.Size(288, 314);
-			this.flowLayoutPanel1.TabIndex = 1;
-			// 
-			// ActorPropertiesDialog
-			// 
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(313, 368);
-			this.Controls.Add(this.flowLayoutPanel1);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "ActorPropertiesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Actor Properties";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-	}
-}

OpenRA.Editor/ActorPropertiesDialog.cs

@@ -1,48 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class ActorPropertiesDialog : Form
-	{
-		public ActorPropertiesDialog()
-		{
-			InitializeComponent();
-		}
-
-		public void AddRow(string name, Control c)
-		{
-			flowLayoutPanel1.Controls.Add(new Label
-			{
-				Text = name,
-				Width = flowLayoutPanel1.Width * 3 / 10,
-				Height = 25,
-				TextAlign = ContentAlignment.MiddleLeft,
-			});
-
-			c.Width = flowLayoutPanel1.Width * 6 / 10 - 25;
-			c.Height = 25;
-			flowLayoutPanel1.Controls.Add(c);
-		}
-
-		public Control MakeEditorControl(Type t, Func<object> getter, Action<object> setter)
-		{
-			var r = new TextBox();
-			r.Text = FieldSaver.FormatValue(getter(), t);
-			r.LostFocus += (e, _) => setter(FieldLoader.GetValue("<editor internals>", t, r.Text));
-			r.Enabled = false;
-			return r;
-		}
-	}
-}

OpenRA.Editor/ActorPropertiesDialog.resx

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

OpenRA.Editor/ActorTemplate.cs

@@ -1,35 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Drawing;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	class ActorTemplate
-	{
-		public Bitmap Bitmap;
-		public ActorInfo Info;
-		public EditorAppearanceInfo Appearance;
-	}
-
-	class BrushTemplate
-	{
-		public Bitmap Bitmap;
-		public ushort N;
-	}
-
-	class ResourceTemplate
-	{
-		public Bitmap Bitmap;
-		public ResourceTypeInfo Info;
-		public int Value;
-	}
-}

OpenRA.Editor/ActorTool.cs

@@ -1,51 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Linq;
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class ActorTool : ITool
-	{
-		ActorTemplate actorTemplate;
-		public ActorTool(ActorTemplate actor) { this.actorTemplate = actor; }
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			surface.DrawActor(g, surface.GetBrushLocation(), actorTemplate,
-				surface.GetPaletteForPlayer(surface.NewActorOwner));
-		}
-
-		public void Apply(Surface surface)
-		{
-			if (surface.Map.Actors.Value.Any(a => a.Value.Location() == surface.GetBrushLocation()))
-				return;
-
-			var owner = surface.NewActorOwner;
-			var id = NextActorName(surface);
-			surface.Map.Actors.Value[id] = new ActorReference(actorTemplate.Info.Name.ToLowerInvariant())
-			{
-				new LocationInit(surface.GetBrushLocation()),
-				new OwnerInit(owner)
-			};
-		}
-
-		static string NextActorName(Surface surface)
-		{
-			var id = 0;
-			for (;;)
-			{
-				var possible = "Actor{0}".F(id++);
-				if (!surface.Map.Actors.Value.ContainsKey(possible)) return possible;
-			}
-		}
-	}
-}

OpenRA.Editor/BrushTool.cs

@@ -1,121 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class BrushTool : ITool
-	{
-		BrushTemplate brushTemplate;
-
-		public BrushTool(BrushTemplate brush) { this.brushTemplate = brush; }
-
-		public void Apply(Surface surface)
-		{
-			// change the bits in the map
-			var template = surface.TileSet.Templates[brushTemplate.N];
-			var tile = surface.TileSetRenderer.Data(brushTemplate.N);
-			var pos = surface.GetBrushLocation();
-
-			if (surface.GetModifiers() == Keys.Shift)
-			{
-				FloodFillWithBrush(surface, pos);
-				return;
-			}
-
-			for (var u = 0; u < template.Size.X; u++)
-				for (var v = 0; v < template.Size.Y; v++)
-				{
-					var cell = pos + new CVec(u, v);
-					if (surface.Map.Contains(cell))
-					{
-						var z = u + v * template.Size.X;
-						if (tile[z].Length > 0)
-						{
-							var index = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z;
-							surface.Map.MapTiles.Value[cell] = new TerrainTile(brushTemplate.N, index);
-						}
-
-						var ch = new int2((pos.X + u) / Surface.ChunkSize, (pos.Y + v) / Surface.ChunkSize);
-						if (surface.Chunks.ContainsKey(ch))
-						{
-							surface.Chunks[ch].Dispose();
-							surface.Chunks.Remove(ch);
-						}
-					}
-				}
-		}
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			g.DrawImage(brushTemplate.Bitmap,
-					surface.TileSetRenderer.TileSize * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X,
-					surface.TileSetRenderer.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
-					brushTemplate.Bitmap.Width * surface.Zoom,
-					brushTemplate.Bitmap.Height * surface.Zoom);
-		}
-
-		void FloodFillWithBrush(Surface s, CPos pos)
-		{
-			var queue = new Queue<CPos>();
-			var replace = s.Map.MapTiles.Value[pos];
-			var touched = new bool[s.Map.MapSize.X, s.Map.MapSize.Y];
-
-			Action<int, int> maybeEnqueue = (x, y) =>
-			{
-				var c = new CPos(x, y);
-				if (s.Map.Contains(c) && !touched[x, y])
-				{
-					queue.Enqueue(c);
-					touched[x, y] = true;
-				}
-			};
-
-			queue.Enqueue(pos);
-			while (queue.Count > 0)
-			{
-				var p = queue.Dequeue();
-				if (s.Map.MapTiles.Value[p].Type != replace.Type)
-					continue;
-
-				var a = FindEdge(s, p, new CVec(-1, 0), replace);
-				var b = FindEdge(s, p, new CVec(1, 0), replace);
-
-				for (var x = a.X; x <= b.X; x++)
-				{
-					s.Map.MapTiles.Value[new CPos(x, p.Y)] = new TerrainTile(brushTemplate.N, (byte)0);
-					if (s.Map.MapTiles.Value[new CPos(x, p.Y - 1)].Type == replace.Type)
-						maybeEnqueue(x, p.Y - 1);
-					if (s.Map.MapTiles.Value[new CPos(x, p.Y + 1)].Type == replace.Type)
-						maybeEnqueue(x, p.Y + 1);
-				}
-			}
-
-			/* TODO: optimize */
-			foreach (var ch in s.Chunks.Values) ch.Dispose();
-			s.Chunks.Clear();
-		}
-
-		static CPos FindEdge(Surface s, CPos p, CVec d, TerrainTile replace)
-		{
-			for (;;)
-			{
-				var q = p + d;
-				if (!s.Map.Contains(q)) return p;
-				if (s.Map.MapTiles.Value[q].Type != replace.Type) return p;
-				p = q;
-			}
-		}
-	}
-}

OpenRA.Editor/ErrorListDialog.Designer.cs

@@ -1,98 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class ErrorListDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.label1 = new System.Windows.Forms.Label();
-			this.listBox1 = new System.Windows.Forms.ListBox();
-			this.button1 = new System.Windows.Forms.Button();
-			this.SuspendLayout();
-			//
-			// label1
-			//
-			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.label1.Location = new System.Drawing.Point(10, 9);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(610, 23);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Your map import completed, but with errors:";
-			//
-			// listBox1
-			//
-			this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.listBox1.FormattingEnabled = true;
-			this.listBox1.Location = new System.Drawing.Point(13, 30);
-			this.listBox1.Name = "listBox1";
-			this.listBox1.Size = new System.Drawing.Size(607, 316);
-			this.listBox1.TabIndex = 1;
-			//
-			// button1
-			//
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(545, 359);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Close";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// ErrorListDialog
-			//
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(632, 394);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.listBox1);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ErrorListDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Import Errors";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.ListBox listBox1;
-		private System.Windows.Forms.Button button1;
-	}
-}

OpenRA.Editor/ErrorListDialog.cs

@@ -1,25 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class ErrorListDialog : Form
-	{
-		public ErrorListDialog(IEnumerable<string> errors)
-		{
-			InitializeComponent();
-			foreach (var e in errors)
-				listBox1.Items.Add(e);
-		}
-	}
-}

OpenRA.Editor/Form1.cs

@@ -1,730 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.FileSystem;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	public partial class Form1 : Form
-	{
-		public Form1(string[] args)
-		{
-			InitializeComponent();
-			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
-
-			currentMod = args.FirstOrDefault() ?? "ra";
-
-			toolStripComboBox1.Items.AddRange(ModMetadata.AllMods.Keys.ToArray());
-
-			toolStripComboBox1.SelectedIndexChanged += (_, e) =>
-			{
-				tilePalette.SuspendLayout();
-				actorPalette.SuspendLayout();
-				resourcePalette.SuspendLayout();
-				tilePalette.Controls.Clear();
-				actorPalette.Controls.Clear();
-				resourcePalette.Controls.Clear();
-				tilePalette.ResumeLayout();
-				actorPalette.ResumeLayout();
-				resourcePalette.ResumeLayout();
-				surface1.Bind(null, null, null, null, null);
-				miniMapBox.Image = null;
-				currentMod = toolStripComboBox1.SelectedItem as string;
-
-				Game.modData = new ModData(currentMod);
-				GlobalFileSystem.LoadFromManifest(Game.modData.Manifest);
-				Program.Rules = Game.modData.RulesetCache.LoadDefaultRules();
-
-				var mod = Game.modData.Manifest.Mod;
-				Text = "{0} Mod Version: {1} - OpenRA Editor".F(mod.Title, mod.Version);
-
-				loadedMapName = null;
-			};
-
-			toolStripComboBox1.SelectedItem = currentMod;
-
-			surface1.AfterChange += OnMapChanged;
-			surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
-			surface1.ActorDoubleClicked += ActorDoubleClicked;
-
-			if (args.Length >= 2)
-				LoadMap(args[1]);
-		}
-
-		void OnMapChanged()
-		{
-			MakeDirty();
-			var tileSet = Program.Rules.TileSets[surface1.Map.Tileset];
-			miniMapBox.Image = Minimap.RenderMapPreview(tileSet, surface1.Map, true);
-			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
-		}
-
-		void ActorDoubleClicked(KeyValuePair<string, ActorReference> kv)
-		{
-			using (var apd = new ActorPropertiesDialog())
-			{
-				var name = kv.Key;
-				apd.AddRow("(Name)", apd.MakeEditorControl(typeof(string), () => name, v => name = (string)v));
-				apd.AddRow("(Type)", apd.MakeEditorControl(typeof(string), () => kv.Value.Type, v => kv.Value.Type = (string)v));
-
-				var objSaved = kv.Value.Save();
-
-				// TODO: make this work properly
-				foreach (var init in Program.Rules.Actors[kv.Value.Type].GetInitKeys())
-				{
-					var initName = init.First;
-					apd.AddRow(initName,
-						apd.MakeEditorControl(init.Second,
-							() =>
-							{
-								var nodesDict = objSaved.ToDictionary();
-								return nodesDict.ContainsKey(initName) ? nodesDict[initName].Value : null;
-							},
-							_ => { }));
-				}
-
-				apd.ShowDialog();
-
-				// TODO: writeback
-			}
-		}
-
-		void MakeDirty() { dirty = true; }
-
-		string loadedMapName;
-		string currentMod = "ra";
-		TileSet tileset;
-		TileSetRenderer tilesetRenderer;
-		bool dirty = false;
-
-		void LoadMap(string mapname)
-		{
-			tilePalette.Controls.Clear();
-			actorPalette.Controls.Clear();
-			resourcePalette.Controls.Clear();
-
-			loadedMapName = mapname;
-
-			// load the map
-			var map = new Map(mapname);
-
-			// upgrade maps that have no player definitions. editor doesnt care,
-			// but this breaks the game pretty badly.
-			if (map.Players.Count == 0)
-				map.MakeDefaultPlayers();
-
-			PrepareMapResources(Game.modData, map);
-
-			// Calculate total net worth of resources in cash
-			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
-
-			dirty = false;
-		}
-
-		void NewMap(Map map)
-		{
-			tilePalette.Controls.Clear();
-			actorPalette.Controls.Clear();
-			resourcePalette.Controls.Clear();
-
-			loadedMapName = null;
-			PrepareMapResources(Game.modData, map);
-
-			MakeDirty();
-		}
-
-		// this code is insanely stupid, and mostly my fault -- chrisf
-		void PrepareMapResources(ModData modData, Map map)
-		{
-			Program.Rules = map.Rules;
-
-			tileset = Program.Rules.TileSets[map.Tileset];
-			tilesetRenderer = new TileSetRenderer(tileset, modData.Manifest.TileSize);
-			var shadowIndex = new int[] { 3, 4 };
-			var palette = new ImmutablePalette(GlobalFileSystem.Open(tileset.Palette), shadowIndex);
-
-			// required for desert terrain in RA
-			var playerPalette = tileset.PlayerPalette ?? tileset.Palette;
-			var shadowedPalette = new ImmutablePalette(GlobalFileSystem.Open(playerPalette), shadowIndex);
-
-			surface1.Bind(map, tileset, tilesetRenderer, palette, shadowedPalette);
-
-			// construct the palette of tiles
-			var palettes = new[] { tilePalette, actorPalette, resourcePalette };
-			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
-
-			var templateOrder = tileset.EditorTemplateOrder ?? new string[] { };
-			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category).OrderBy(t => Array.IndexOf(templateOrder, t.Key)))
-			{
-				var category = tc.Key ?? "(Uncategorized)";
-				var categoryHeader = new Label
-				{
-					BackColor = SystemColors.Highlight,
-					ForeColor = SystemColors.HighlightText,
-					Text = category,
-					AutoSize = false,
-					Height = 24,
-					TextAlign = ContentAlignment.MiddleLeft,
-					Width = tilePalette.ClientSize.Width,
-				};
-
-				// hook this manually, anchoring inside FlowLayoutPanel is flaky.
-				tilePalette.Resize += (_, e) => categoryHeader.Width = tilePalette.ClientSize.Width;
-
-				if (tilePalette.Controls.Count > 0)
-					tilePalette.SetFlowBreak(
-						tilePalette.Controls[tilePalette.Controls.Count - 1], true);
-				tilePalette.Controls.Add(categoryHeader);
-
-				foreach (var t in tc)
-				{
-					try
-					{
-						var bitmap = tilesetRenderer.RenderTemplate((ushort)t.Key, palette);
-						var ibox = new PictureBox
-						{
-							Image = bitmap,
-							Width = bitmap.Width / 2,
-							Height = bitmap.Height / 2,
-							SizeMode = PictureBoxSizeMode.StretchImage
-						};
-	
-						var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
-						ibox.Click += (_, e) => surface1.SetTool(new BrushTool(brushTemplate));
-	
-						var template = t.Value;
-						tilePalette.Controls.Add(ibox);
-						tt.SetToolTip(ibox, "{1}:{0} ({2}x{3})".F(template.Image, template.Id, template.Size.X, template.Size.Y));
-					}
-					catch { }
-				}
-			}
-
-			var actorTemplates = new List<ActorTemplate>();
-
-			foreach (var a in Program.Rules.Actors.Keys)
-			{
-				try
-				{
-					var info = Program.Rules.Actors[a];
-					if (!info.Traits.Contains<ILegacyEditorRenderInfo>()) continue;
-
-					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
-					if (etf != null && etf.ExcludeTilesets != null
-						&& etf.ExcludeTilesets.Contains(tileset.Id)) continue;
-					if (etf != null && etf.RequireTilesets != null
-						&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
-
-					var templatePalette = shadowedPalette;
-					var rsi = info.Traits.GetOrDefault<ILegacyEditorRenderInfo>();
-
-					// exception for desert buildings
-					if (rsi != null && rsi.EditorPalette != null && rsi.EditorPalette.Contains("terrain"))
-						templatePalette = palette;
-
-					var template = RenderUtils.RenderActor(info, tileset, templatePalette);
-					var ibox = new PictureBox
-					{
-						Image = template.Bitmap,
-						Width = 32,
-						Height = 32,
-						SizeMode = PictureBoxSizeMode.Zoom,
-						BorderStyle = BorderStyle.FixedSingle
-					};
-
-					ibox.Click += (_, e) => surface1.SetTool(new ActorTool(template));
-
-					actorPalette.Controls.Add(ibox);
-
-					tt.SetToolTip(ibox, "{0}".F(info.Name));
-
-					actorTemplates.Add(template);
-				}
-				catch { }
-			}
-
-			surface1.BindActorTemplates(actorTemplates);
-
-			var resourceTemplates = new List<ResourceTemplate>();
-
-			foreach (var a in Program.Rules.Actors["world"].Traits.WithInterface<ResourceTypeInfo>())
-			{
-				try
-				{
-					var template = RenderUtils.RenderResourceType(a, tileset.Extensions, shadowedPalette);
-					var ibox = new PictureBox
-					{
-						Image = template.Bitmap,
-						Width = 32,
-						Height = 32,
-						SizeMode = PictureBoxSizeMode.Zoom,
-						BorderStyle = BorderStyle.FixedSingle
-					};
-
-					ibox.Click += (_, e) => surface1.SetTool(new ResourceTool(template));
-
-					resourcePalette.Controls.Add(ibox);
-
-					tt.SetToolTip(ibox, "{0}:{1}cr".F(template.Info.Name, template.Info.ValuePerUnit));
-
-					resourceTemplates.Add(template);
-				}
-				catch { }
-			}
-
-			surface1.BindResourceTemplates(resourceTemplates);
-
-			foreach (var p in palettes)
-			{
-				p.Visible = true;
-				p.ResumeLayout();
-			}
-
-			miniMapBox.Image = Minimap.RenderMapPreview(tileset, surface1.Map, true);
-
-			propertiesToolStripMenuItem.Enabled = true;
-			toolStripMenuItemProperties.Enabled = true;
-			resizeToolStripMenuItem.Enabled = true;
-			toolStripMenuItemResize.Enabled = true;
-			saveToolStripMenuItem.Enabled = true;
-			toolStripMenuItemSave.Enabled = true;
-			saveAsToolStripMenuItem.Enabled = true;
-			miniMapToPng.Enabled = true;
-
-			PopulateActorOwnerChooser();
-		}
-
-		void PopulateActorOwnerChooser()
-		{
-			actorOwnerChooser.Items.Clear();
-			actorOwnerChooser.Items.AddRange(surface1.Map.Players.Values.ToArray());
-			actorOwnerChooser.SelectedIndex = 0;
-			surface1.NewActorOwner = ((PlayerReference)actorOwnerChooser.SelectedItem).Name;
-		}
-
-		void ResizeClicked(object sender, EventArgs e)
-		{
-			using (var rd = new ResizeDialog())
-			{
-				rd.MapWidth.Value = surface1.Map.MapSize.X;
-				rd.MapHeight.Value = surface1.Map.MapSize.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.ResizeCordon((int)rd.CordonLeft.Value,
-					(int)rd.CordonTop.Value,
-					(int)rd.CordonRight.Value,
-					(int)rd.CordonBottom.Value);
-
-				if ((int)rd.MapWidth.Value != surface1.Map.MapSize.X || (int)rd.MapHeight.Value != surface1.Map.MapSize.Y)
-				{
-					surface1.Map.Resize((int)rd.MapWidth.Value, (int)rd.MapHeight.Value);
-					surface1.Bind(surface1.Map, surface1.TileSet, surface1.TileSetRenderer, surface1.Palette, surface1.PlayerPalette);	// rebind it to invalidate all caches
-				}
-
-				surface1.Invalidate();
-			}
-		}
-
-		void SaveClicked(object sender, EventArgs e)
-		{
-			if (loadedMapName == null)
-				SaveAsClicked(sender, e);
-			else
-			{
-				surface1.Map.RequiresMod = currentMod;
-				surface1.Map.Save(loadedMapName);
-				dirty = false;
-			}
-		}
-
-		void SaveAsClicked(object sender, EventArgs e)
-		{
-			using (var nms = new MapSelect(currentMod))
-			{
-				nms.NewText.ReadOnly = false;
-				nms.ButtonOkay.Text = "Save";
-				nms.NewText.Text = "unnamed";
-				nms.PathOutText.ReadOnly = false;
-
-				if (DialogResult.OK == nms.ShowDialog())
-				{
-					if (nms.NewText.Text == "")
-						nms.NewText.Text = "unnamed";
-
-					// TODO: Allow the user to choose map format (directory vs oramap)
-					loadedMapName = Path.Combine(nms.MapFolderPath, nms.NewText.Text + ".oramap");
-					SaveClicked(sender, e);
-				}
-			}
-		}
-
-		void OpenClicked(object sender, EventArgs e)
-		{
-			using (var nms = new MapSelect(currentMod))
-			{
-				nms.NewText.ReadOnly = true;
-				nms.PathOutText.ReadOnly = true;
-				nms.ButtonOkay.Text = "Open";
-
-				if (DialogResult.OK == nms.ShowDialog())
-					LoadMap((string)nms.NewText.Tag);
-			}
-		}
-
-		void NewClicked(object sender, EventArgs e)
-		{
-			using (var nmd = new NewMapDialog())
-			{
-				nmd.TheaterBox.Items.Clear();
-				nmd.TheaterBox.Items.AddRange(Program.Rules.TileSets.Select(a => a.Value.Id).ToArray());
-				nmd.TheaterBox.SelectedIndex = 0;
-
-				if (DialogResult.OK == nmd.ShowDialog())
-				{
-					var tileset = Program.Rules.TileSets[nmd.TheaterBox.SelectedItem as string];
-					var map = Map.FromTileset(tileset);
-
-					map.Resize((int)nmd.MapWidth.Value, (int)nmd.MapHeight.Value);
-					map.ResizeCordon((int)nmd.CordonLeft.Value, (int)nmd.CordonTop.Value,
-						(int)nmd.CordonRight.Value, (int)nmd.CordonBottom.Value);
-
-					map.Players.Clear();
-					map.MakeDefaultPlayers();
-					map.FixOpenAreas(Program.Rules);
-
-					NewMap(map);
-				}
-			}
-		}
-
-		void PropertiesClicked(object sender, EventArgs e)
-		{
-			using (var pd = new PropertiesDialog())
-			{
-				pd.TitleBox.Text = surface1.Map.Title;
-				pd.DescBox.Text = surface1.Map.Description;
-				pd.AuthorBox.Text = surface1.Map.Author;
-				pd.SelectableCheckBox.Checked = surface1.Map.Selectable;
-				pd.ShellmapCheckBox.Checked = surface1.Map.UseAsShellmap;
-
-				if (DialogResult.OK != pd.ShowDialog())
-					return;
-
-				surface1.Map.Title = pd.TitleBox.Text;
-				surface1.Map.Description = pd.DescBox.Text;
-				surface1.Map.Author = pd.AuthorBox.Text;
-				surface1.Map.Selectable = pd.SelectableCheckBox.Checked;
-				surface1.Map.UseAsShellmap = pd.ShellmapCheckBox.Checked;
-			}
-		}
-
-		void Form1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = true; }
-		void Form1_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = false; }
-
-		void CloseClicked(object sender, EventArgs e)
-		{
-			Close();
-		}
-
-		void OnFormClosing(object sender, FormClosingEventArgs e)
-		{
-			if (!dirty) return;
-
-			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;
-				case DialogResult.No: break;
-				case DialogResult.Cancel: e.Cancel = true; break;
-			}
-		}
-
-		void ExportMinimap(object sender, EventArgs e)
-		{
-			using (var sfd = new SaveFileDialog()
-			{ 
-				InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps"),
-				DefaultExt = "*.png",
-				Filter = "PNG Image (*.png)|*.png",
-				Title = "Export Minimap to PNG",
-				FileName = Path.ChangeExtension(loadedMapName, ".png"),
-				RestoreDirectory = true
-			})
-
-			if (DialogResult.OK == sfd.ShowDialog())
-				miniMapBox.Image.Save(sfd.FileName);
-		}
-
-		void ShowActorNamesClicked(object sender, EventArgs e)
-		{
-			showActorNamesToolStripMenuItem.Checked ^= true;
-			toolStripMenuItemShowActorNames.Checked ^= true;
-			surface1.ShowActorNames = showActorNamesToolStripMenuItem.Checked;
-		}
-
-		void ShowGridClicked(object sender, EventArgs e)
-		{
-			showGridToolStripMenuItem.Checked ^= true;
-			toolStripMenuItemShowGrid.Checked ^= true;
-			surface1.ShowGrid = showGridToolStripMenuItem.Checked;
-			surface1.Chunks.Clear();
-		}
-
-		void FixOpenAreas(object sender, EventArgs e)
-		{
-			dirty = true;
-			surface1.Map.FixOpenAreas(Program.Rules);
-			surface1.Chunks.Clear();
-			surface1.Invalidate();
-		}
-
-		void SetupDefaultPlayers(object sender, EventArgs e)
-		{
-			dirty = true;
-			surface1.Map.Players.Clear();
-			surface1.Map.MakeDefaultPlayers();
-
-			surface1.Chunks.Clear();
-			surface1.Invalidate();
-
-			PopulateActorOwnerChooser();
-		}
-
-		void DrawPlayerListItem(object sender, DrawItemEventArgs e)
-		{
-			// color block
-			var player = e.Index >= 0 ? (PlayerReference)((ComboBox)sender).Items[e.Index] : null;
-
-			e.DrawBackground();
-			e.DrawFocusRectangle();
-
-			if (player == null)
-				return;
-
-			var color = player.Color.RGB;
-			using (var brush = new SolidBrush(color))
-				e.Graphics.FillRectangle(brush, e.Bounds.Left + 2, e.Bounds.Top + 2, e.Bounds.Height + 6, e.Bounds.Height - 4);
-			using (var foreBrush = new SolidBrush(e.ForeColor))
-				e.Graphics.DrawString(player.Name, e.Font, foreBrush, e.Bounds.Left + e.Bounds.Height + 12, e.Bounds.Top);
-		}
-
-		void OnSelectedPlayerChanged(object sender, EventArgs e)
-		{
-			var player = actorOwnerChooser.SelectedItem as PlayerReference;
-			surface1.NewActorOwner = player.Name;
-		}
-
-		void CopySelectionToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			surface1.CopySelection();
-		}
-
-		void OpenRAWebsiteToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://www.openra.net");
-		}
-
-		void OpenRAResourcesToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://resource.openra.net");
-		}
-
-		void WikiDocumentationToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://wiki.openra.net");
-		}
-
-		void DiscussionForumsToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://www.sleipnirstuff.com/forum/viewforum.php?f=80");
-		}
-
-		void IssueTrackerToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://bugs.openra.net");
-		}
-
-		void DeveloperBountiesToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("https://www.bountysource.com/trackers/36085-openra");
-		}
-
-		void SourceCodeToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://github.com/OpenRA/OpenRA");
-		}
-
-		void AboutToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			MessageBox.Show("OpenRA and OpenRA Editor are Free/Libre Open Source Software released under the GNU General Public License version 3. See AUTHORS and COPYING for details.",
-							"About",
-							MessageBoxButtons.OK,
-							MessageBoxIcon.Asterisk);
-		}
-
-		void HelpToolStripButton_Click(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://wiki.openra.net/Mapping");
-		}
-
-		void ToolStripMenuItemNewClick(object sender, EventArgs e)
-		{
-			NewClicked(sender, e);
-		}
-
-		void ToolStripMenuItemOpenClick(object sender, EventArgs e)
-		{
-			OpenClicked(sender, e);
-		}
-
-		void ToolStripMenuItemSaveClick(object sender, EventArgs e)
-		{
-			SaveClicked(sender, e);
-		}
-
-		void ToolStripMenuItemPropertiesClick(object sender, EventArgs e)
-		{
-			PropertiesClicked(sender, e);
-		}
-
-		void ToolStripMenuItemResizeClick(object sender, EventArgs e)
-		{
-			ResizeClicked(sender, e);
-		}
-
-		void ToolStripMenuItemShowActorNamesClick(object sender, EventArgs e)
-		{
-			ShowActorNamesClicked(sender, e);
-		}
-
-		void ToolStripMenuItemFixOpenAreasClick(object sender, EventArgs e)
-		{
-			FixOpenAreas(sender, e);
-		}
-
-		void ToolStripMenuItemSetupDefaultPlayersClick(object sender, EventArgs e)
-		{
-			SetupDefaultPlayers(sender, e);
-		}
-
-		void ToolStripMenuItemCopySelectionClick(object sender, EventArgs e)
-		{
-			CopySelectionToolStripMenuItemClick(sender, e);
-		}
-
-		void ToolStripMenuItemShowGridClick(object sender, EventArgs e)
-		{
-			ShowGridClicked(sender, e);
-		}
-		
-		public int CalculateTotalResource()
-		{
-			var totalResource = 0;
-			for (var i = 0; i < surface1.Map.MapSize.X; i++)
-				for (var j = 0; j < surface1.Map.MapSize.Y; j++)
-				{
-					var cell = new CPos(i, j);
-					if (surface1.Map.MapResources.Value[cell].Type != 0)
-						totalResource += GetResourceValue(i, j);
-				}
-
-			return totalResource;
-		}
-		
-		int GetAdjecentCellsWith(int resourceType, int x, int y)
-		{
-			var sum = 0;
-			for (var u = -1; u < 2; u++)
-				for (var v = -1; v < 2; v++)
-				{
-					var cell = new CPos(x + u, y + v);
-
-					if (!surface1.Map.Contains(cell))
-						continue;
-
-					if (surface1.Map.MapResources.Value[cell].Type == resourceType)
-						++sum;
-				}
-
-			return sum;
-		}
-
-		int GetResourceValue(int x, int y)
-		{
-			var imageLength = 0;
-			var type = surface1.Map.MapResources.Value[new CPos(x, y)].Type;
-			var template = surface1.ResourceTemplates.FirstOrDefault(a => a.Value.Info.ResourceType == type).Value;
-			if (type == 1)
-				imageLength = 12;
-			else if (type == 2)
-				imageLength = 3;
-			var density = (GetAdjecentCellsWith(type, x, y) * imageLength - 1) / 9;
-			var value = template.Info.ValuePerUnit;
-			return density * value;
-		}
-
-		void ZoomInToolStripButtonClick(object sender, System.EventArgs e)
-		{
-			if (surface1.Map == null) return;
-
-			surface1.Zoom /= .75f;
-
-			surface1.Invalidate();
-		}
-
-		void ZoomOutToolStripButtonClick(object sender, System.EventArgs e)
-		{
-			if (surface1.Map == null) return;
-
-			surface1.Zoom *= .75f;
-
-			surface1.Invalidate();
-		}
-
-		void PanToolStripButtonClick(object sender, System.EventArgs e)
-		{
-			panToolStripButton.Checked ^= true;
-			surface1.IsPanning = panToolStripButton.Checked;
-		}
-
-		void ShowRulerToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			showRulerToolStripMenuItem.Checked ^= true;
-			showRulerToolStripItem.Checked ^= true;
-			surface1.ShowRuler = showRulerToolStripMenuItem.Checked;
-			surface1.Chunks.Clear();
-		}
-
-		void ShowRulerToolStripItemClick(object sender, System.EventArgs e)
-		{
-			ShowRulerToolStripMenuItemClick(sender, e);
-		}
-
-		void EraserToolStripButtonClick(object sender, System.EventArgs e)
-		{
-			eraserToolStripButton.Checked ^= true;
-			surface1.IsErasing = eraserToolStripButton.Checked;
-		}
-	}
-}

OpenRA.Editor/ITool.cs

@@ -1,20 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	interface ITool
-	{
-		void Apply(Surface surface);
-		void Preview(Surface surface, SGraphics g);
-	}
-}

OpenRA.Editor/MapSelect.Designer.cs

@@ -1,319 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class MapSelect
-	{
-		// TODO:
-		private System.ComponentModel.IContainer components = null;
-
-		// TODO:
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-
-			base.Dispose(disposing);
-		}
-
-		// TODO:
-		private void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
-			this.MapList = new System.Windows.Forms.ListView();
-			this.ColumnMapName = new System.Windows.Forms.ColumnHeader("(none)");
-			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
-			this.ButtonCancel = new System.Windows.Forms.Button();
-			this.ButtonOkay = new System.Windows.Forms.Button();
-			this.NewLabel = new System.Windows.Forms.Label();
-			this.NewText = new System.Windows.Forms.TextBox();
-			this.MiniMapBox = new System.Windows.Forms.PictureBox();
-			this.BottomPanel = new System.Windows.Forms.Panel();
-			this.PathOutText = new System.Windows.Forms.TextBox();
-			this.PathOutLabel = new System.Windows.Forms.Label();
-			this.PathLabel = new System.Windows.Forms.Label();
-			this.SplitContainer1 = new System.Windows.Forms.SplitContainer();
-			this.MapListLabel = new System.Windows.Forms.Label();
-			this.DescTxt = new System.Windows.Forms.TextBox();
-			this.DescLabel = new System.Windows.Forms.Label();
-			this.TheaterText = new System.Windows.Forms.TextBox();
-			this.TheaterLabel = new System.Windows.Forms.Label();
-			this.AuthorText = new System.Windows.Forms.TextBox();
-			this.AuthorLabel = new System.Windows.Forms.Label();
-			this.TitleText = new System.Windows.Forms.TextBox();
-			this.MapNameLabel = new System.Windows.Forms.Label();
-			this.MiniMapLabel = new System.Windows.Forms.Label();
-			this.pictureBox1 = new System.Windows.Forms.PictureBox();
-			((System.ComponentModel.ISupportInitialize)this.MiniMapBox).BeginInit();
-			this.BottomPanel.SuspendLayout();
-			this.SplitContainer1.Panel1.SuspendLayout();
-			this.SplitContainer1.Panel2.SuspendLayout();
-			this.SplitContainer1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)this.pictureBox1).BeginInit();
-			this.SuspendLayout();
-
-			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {	this.ColumnMapName });
-			this.MapList.FullRowSelect = true;
-			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-			this.MapList.LargeImageList = this.MapIconsList;
-			this.MapList.Location = new System.Drawing.Point(15, 25);
-			this.MapList.MultiSelect = false;
-			this.MapList.Name = "MapList";
-			this.MapList.Size = new System.Drawing.Size(273, 294);
-			this.MapList.SmallImageList = this.MapIconsList;
-			this.MapList.StateImageList = this.MapIconsList;
-			this.MapList.TabIndex = 0;
-			this.MapList.UseCompatibleStateImageBehavior = false;
-			this.MapList.View = System.Windows.Forms.View.Details;
-			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
-
-			this.ColumnMapName.Text = "Map name";
-			this.ColumnMapName.Width = 240;
-
-			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.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.ButtonCancel.Location = new System.Drawing.Point(407, 35);
-			this.ButtonCancel.Name = "btnCancel";
-			this.ButtonCancel.Size = new System.Drawing.Size(75, 23);
-			this.ButtonCancel.TabIndex = 3;
-			this.ButtonCancel.Text = "Cancel";
-			this.ButtonCancel.UseVisualStyleBackColor = true;
-
-			this.ButtonOkay.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.ButtonOkay.Location = new System.Drawing.Point(326, 35);
-			this.ButtonOkay.Name = "btnOk";
-			this.ButtonOkay.Size = new System.Drawing.Size(75, 23);
-			this.ButtonOkay.TabIndex = 2;
-			this.ButtonOkay.Text = "Open";
-			this.ButtonOkay.UseVisualStyleBackColor = true;
-
-			this.NewLabel.AutoSize = true;
-			this.NewLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.NewLabel.Location = new System.Drawing.Point(12, 40);
-			this.NewLabel.Name = "lblNew";
-			this.NewLabel.Size = new System.Drawing.Size(69, 13);
-			this.NewLabel.TabIndex = 3;
-			this.NewLabel.Text = "Map name:";
-
-			this.NewText.BackColor = System.Drawing.SystemColors.Window;
-			this.NewText.Location = new System.Drawing.Point(88, 37);
-			this.NewText.Name = "txtNew";
-			this.NewText.ReadOnly = true;
-			this.NewText.Size = new System.Drawing.Size(232, 20);
-			this.NewText.TabIndex = 1;
-
-			this.MiniMapBox.BackColor = System.Drawing.Color.Black;
-			this.MiniMapBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-			this.MiniMapBox.Location = new System.Drawing.Point(32, 25);
-			this.MiniMapBox.Name = "pbMinimap";
-			this.MiniMapBox.Size = new System.Drawing.Size(124, 124);
-			this.MiniMapBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-			this.MiniMapBox.TabIndex = 5;
-			this.MiniMapBox.TabStop = false;
-
-			this.BottomPanel.Controls.Add(this.pictureBox1);
-			this.BottomPanel.Controls.Add(this.PathOutText);
-			this.BottomPanel.Controls.Add(this.PathOutLabel);
-			this.BottomPanel.Controls.Add(this.PathLabel);
-			this.BottomPanel.Controls.Add(this.ButtonCancel);
-			this.BottomPanel.Controls.Add(this.ButtonOkay);
-			this.BottomPanel.Controls.Add(this.NewText);
-			this.BottomPanel.Controls.Add(this.NewLabel);
-			this.BottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.BottomPanel.Location = new System.Drawing.Point(0, 332);
-			this.BottomPanel.MaximumSize = new System.Drawing.Size(0, 70);
-			this.BottomPanel.Name = "pnlBottom";
-			this.BottomPanel.Size = new System.Drawing.Size(494, 70);
-			this.BottomPanel.TabIndex = 6;
-
-			this.PathOutText.BackColor = System.Drawing.SystemColors.Window;
-			this.PathOutText.Location = new System.Drawing.Point(55, 10);
-			this.PathOutText.Name = "txtPathOut";
-			this.PathOutText.ReadOnly = true;
-			this.PathOutText.Size = new System.Drawing.Size(265, 20);
-			this.PathOutText.TabIndex = 0;
-			this.PathOutText.TextChanged += new System.EventHandler(this.PathOutTextChanged);
-
-			this.PathOutLabel.AutoSize = true;
-			this.PathOutLabel.Location = new System.Drawing.Point(55, 13);
-			this.PathOutLabel.Name = "lblPathOut";
-			this.PathOutLabel.Size = new System.Drawing.Size(0, 13);
-			this.PathOutLabel.TabIndex = 6;
-
-			this.PathLabel.AutoSize = true;
-			this.PathLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.PathLabel.Location = new System.Drawing.Point(12, 13);
-			this.PathLabel.Name = "lblPath";
-			this.PathLabel.Size = new System.Drawing.Size(37, 13);
-			this.PathLabel.TabIndex = 5;
-			this.PathLabel.Text = "Path:";
-
-			this.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.SplitContainer1.Location = new System.Drawing.Point(0, 0);
-			this.SplitContainer1.Name = "splitContainer1";
-
-			this.SplitContainer1.Panel1.Controls.Add(this.MapListLabel);
-			this.SplitContainer1.Panel1.Controls.Add(this.MapList);
-
-			this.SplitContainer1.Panel2.Controls.Add(this.DescTxt);
-			this.SplitContainer1.Panel2.Controls.Add(this.DescLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.TheaterText);
-			this.SplitContainer1.Panel2.Controls.Add(this.TheaterLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.AuthorText);
-			this.SplitContainer1.Panel2.Controls.Add(this.AuthorLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.TitleText);
-			this.SplitContainer1.Panel2.Controls.Add(this.MapNameLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.MiniMapLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.MiniMapBox);
-			this.SplitContainer1.Size = new System.Drawing.Size(494, 332);
-			this.SplitContainer1.SplitterDistance = 300;
-			this.SplitContainer1.TabIndex = 7;
-
-			this.MapListLabel.AutoSize = true;
-			this.MapListLabel.Location = new System.Drawing.Point(12, 9);
-			this.MapListLabel.Name = "lblMapList";
-			this.MapListLabel.Size = new System.Drawing.Size(81, 13);
-			this.MapListLabel.TabIndex = 1;
-			this.MapListLabel.Text = "Available maps:";
-
-			this.DescTxt.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.DescTxt.Location = new System.Drawing.Point(16, 289);
-			this.DescTxt.Name = "txtDesc";
-			this.DescTxt.ReadOnly = true;
-			this.DescTxt.Size = new System.Drawing.Size(162, 20);
-			this.DescTxt.TabIndex = 14;
-
-			this.DescLabel.AutoSize = true;
-			this.DescLabel.Location = new System.Drawing.Point(13, 273);
-			this.DescLabel.Name = "lblDesc";
-			this.DescLabel.Size = new System.Drawing.Size(63, 13);
-			this.DescLabel.TabIndex = 13;
-			this.DescLabel.Text = "Description:";
-
-			this.TheaterText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.TheaterText.Location = new System.Drawing.Point(16, 252);
-			this.TheaterText.Name = "txtTheater";
-			this.TheaterText.ReadOnly = true;
-			this.TheaterText.Size = new System.Drawing.Size(162, 20);
-			this.TheaterText.TabIndex = 12;
-
-			this.TheaterLabel.AutoSize = true;
-			this.TheaterLabel.Location = new System.Drawing.Point(13, 236);
-			this.TheaterLabel.Name = "lblTheater";
-			this.TheaterLabel.Size = new System.Drawing.Size(47, 13);
-			this.TheaterLabel.TabIndex = 11;
-			this.TheaterLabel.Text = "Tileset:";
-
-			this.AuthorText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.AuthorText.Location = new System.Drawing.Point(16, 214);
-			this.AuthorText.Name = "txtAuthor";
-			this.AuthorText.ReadOnly = true;
-			this.AuthorText.Size = new System.Drawing.Size(162, 20);
-			this.AuthorText.TabIndex = 10;
-
-			this.AuthorLabel.AutoSize = true;
-			this.AuthorLabel.Location = new System.Drawing.Point(13, 198);
-			this.AuthorLabel.Name = "lblAuthor";
-			this.AuthorLabel.Size = new System.Drawing.Size(41, 13);
-			this.AuthorLabel.TabIndex = 9;
-			this.AuthorLabel.Text = "Author:";
-
-			this.TitleText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.TitleText.Location = new System.Drawing.Point(16, 177);
-			this.TitleText.Name = "txtTitle";
-			this.TitleText.ReadOnly = true;
-			this.TitleText.Size = new System.Drawing.Size(162, 20);
-			this.TitleText.TabIndex = 8;
-
-			this.MapNameLabel.AutoSize = true;
-			this.MapNameLabel.Location = new System.Drawing.Point(13, 161);
-			this.MapNameLabel.Name = "lblMapName";
-			this.MapNameLabel.Size = new System.Drawing.Size(30, 13);
-			this.MapNameLabel.TabIndex = 7;
-			this.MapNameLabel.Text = "Title:";
-
-			this.MiniMapLabel.AutoSize = true;
-			this.MiniMapLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.MiniMapLabel.Location = new System.Drawing.Point(29, 9);
-			this.MiniMapLabel.Name = "lblMinimap";
-			this.MiniMapLabel.Size = new System.Drawing.Size(71, 13);
-			this.MiniMapLabel.TabIndex = 6;
-			this.MiniMapLabel.Text = "Map preview:";
-
-			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;
-
-			this.AcceptButton = this.ButtonOkay;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.ButtonCancel;
-			this.ClientSize = new System.Drawing.Size(494, 402);
-			this.Controls.Add(this.SplitContainer1);
-			this.Controls.Add(this.BottomPanel);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "MapSelect";
-			this.ShowIcon = false;
-			this.ShowInTaskbar = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Select map";
-			this.Load += new System.EventHandler(this.MapSelect_Load);
-			((System.ComponentModel.ISupportInitialize)this.MiniMapBox).EndInit();
-			this.BottomPanel.ResumeLayout(false);
-			this.BottomPanel.PerformLayout();
-			this.SplitContainer1.Panel1.ResumeLayout(false);
-			this.SplitContainer1.Panel1.PerformLayout();
-			this.SplitContainer1.Panel2.ResumeLayout(false);
-			this.SplitContainer1.Panel2.PerformLayout();
-			this.SplitContainer1.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)this.pictureBox1).EndInit();
-			this.ResumeLayout(false);
-		}
-
-		public System.Windows.Forms.ListView MapList;
-		public System.Windows.Forms.Button ButtonCancel;
-		public System.Windows.Forms.Button ButtonOkay;
-		public System.Windows.Forms.Label NewLabel;
-		public System.Windows.Forms.TextBox NewText;
-		public System.Windows.Forms.ColumnHeader ColumnMapName;
-		public System.Windows.Forms.ImageList MapIconsList;
-		public System.Windows.Forms.PictureBox MiniMapBox;
-		public System.Windows.Forms.Panel BottomPanel;
-		public System.Windows.Forms.SplitContainer SplitContainer1;
-		public System.Windows.Forms.Label MiniMapLabel;
-		public System.Windows.Forms.TextBox TheaterText;
-		public System.Windows.Forms.Label TheaterLabel;
-		public System.Windows.Forms.TextBox AuthorText;
-		public System.Windows.Forms.Label AuthorLabel;
-		public System.Windows.Forms.TextBox TitleText;
-		public System.Windows.Forms.Label MapNameLabel;
-		public System.Windows.Forms.TextBox DescTxt;
-		public System.Windows.Forms.Label DescLabel;
-		public System.Windows.Forms.Label MapListLabel;
-		public System.Windows.Forms.Label PathOutLabel;
-		public System.Windows.Forms.Label PathLabel;
-		public System.Windows.Forms.TextBox PathOutText;
-		private System.Windows.Forms.PictureBox pictureBox1;
-	}
-}

OpenRA.Editor/MapSelect.cs

@@ -1,92 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.Graphics;
-
-namespace OpenRA.Editor
-{
-	public partial class MapSelect : Form
-	{
-		public string MapFolderPath;
-
-		public bool DirectoryIsEmpty(string path)
-		{
-			return !Directory.GetFileSystemEntries(path).Any();
-		}
-
-		public MapSelect(string currentMod)
-		{
-			MapFolderPath = Platform.ResolvePath("^", "maps", currentMod);
-
-			if (!Directory.Exists(MapFolderPath))
-				Directory.CreateDirectory(MapFolderPath);
-
-			InitializeComponent();
-			MapIconsList.Images.Add(pictureBox1.Image);
-		}
-
-		void MapSelect_Load(object sender, EventArgs e)
-		{
-			MapList.Items.Clear();
-			PathOutText.Text = MapFolderPath;
-
-			if (DirectoryIsEmpty(MapFolderPath))
-				return;
-
-			foreach (var map in MapCache.FindMapsIn(MapFolderPath))
-			{
-				var map1 = new ListViewItem();
-				map1.Tag = map;
-				map1.Text = Path.GetFileNameWithoutExtension(map);
-				map1.ImageIndex = 0;
-				MapList.Items.Add(map1);
-			}
-
-			// hack
-			if (NewText.Text != "unnamed")
-				MapList.Items[0].Selected = true;
-		}
-
-		void MapList_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			if (MapList.SelectedItems.Count == 1)
-			{
-				NewText.Text = MapList.SelectedItems[0].Text;
-				NewText.Tag = MapList.SelectedItems[0].Tag;
-
-				var map = new Map((string)NewText.Tag);
-				TitleText.Text = map.Title;
-				AuthorText.Text = map.Author;
-				TheaterText.Text = map.Tileset;
-				DescTxt.Text = map.Description;
-				MiniMapBox.Image = null;
-
-				try
-				{
-					var tileset = Program.Rules.TileSets[map.Tileset];
-					MiniMapBox.Image = Minimap.RenderMapPreview(tileset, map, true);
-				}
-				catch (Exception ed)
-				{
-					Console.WriteLine("No map preview image found: {0}", ed);
-				}
-			}
-		}
-
-		void PathOutTextChanged(object sender, EventArgs e)
-		{
-			MapFolderPath = PathOutText.Text;
-		}
-	}
-}

OpenRA.Editor/MapSelect.resx

@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
-        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
-        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
-        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
-        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
-        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
-        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
-        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
-        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
-        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
-        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
-        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
-        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
-        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
-        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
-        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
-        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
-        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
-        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
-        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
-        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
-        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
-        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
-        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
-        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
-        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
-        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
-        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
-        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
-        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
-        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
-        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
-        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
-        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
-        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
-        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
-        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
-        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
-        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
-        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
-        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
-        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
-        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
-        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
-        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
-        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
-        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
-        ga8AAAAASUVORK5CYII=
-</value>
-  </data>
-</root>

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -1,295 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class NewMapDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.label1 = new System.Windows.Forms.Label();
-			this.CordonBottom = new System.Windows.Forms.NumericUpDown();
-			this.CordonTop = new System.Windows.Forms.NumericUpDown();
-			this.CordonRight = new System.Windows.Forms.NumericUpDown();
-			this.CordonLeft = new System.Windows.Forms.NumericUpDown();
-			this.MapHeight = new System.Windows.Forms.NumericUpDown();
-			this.MapWidth = new System.Windows.Forms.NumericUpDown();
-			this.label4 = new System.Windows.Forms.Label();
-			this.TheaterBox = new System.Windows.Forms.ComboBox();
-			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).BeginInit();
-			this.SuspendLayout();
-			//
-			// button2
-			//
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(229, 160);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 7;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// button1
-			//
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(310, 160);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 8;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(31, 77);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(107, 13);
-			this.label3.TabIndex = 9;
-			this.label3.Text = "Cordon Right/Bottom";
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(31, 51);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(86, 13);
-			this.label2.TabIndex = 11;
-			this.label2.Text = "Cordon Left/Top";
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(31, 25);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 10;
-			this.label1.Text = "Size";
-			//
-			// cordonBottom
-			//
-			this.CordonBottom.Location = new System.Drawing.Point(280, 75);
-			this.CordonBottom.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonBottom.Name = "cordonBottom";
-			this.CordonBottom.Size = new System.Drawing.Size(105, 20);
-			this.CordonBottom.TabIndex = 5;
-			this.CordonBottom.Value = new decimal(new int[] {
-			112,
-			0,
-			0,
-			0});
-			this.CordonBottom.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonTop
-			//
-			this.CordonTop.Location = new System.Drawing.Point(280, 49);
-			this.CordonTop.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonTop.Name = "cordonTop";
-			this.CordonTop.Size = new System.Drawing.Size(105, 20);
-			this.CordonTop.TabIndex = 3;
-			this.CordonTop.Value = new decimal(new int[] {
-			16,
-			0,
-			0,
-			0});
-			this.CordonTop.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonRight
-			//
-			this.CordonRight.Location = new System.Drawing.Point(169, 75);
-			this.CordonRight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonRight.Name = "cordonRight";
-			this.CordonRight.Size = new System.Drawing.Size(105, 20);
-			this.CordonRight.TabIndex = 4;
-			this.CordonRight.Value = new decimal(new int[] {
-			112,
-			0,
-			0,
-			0});
-			this.CordonRight.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonLeft
-			//
-			this.CordonLeft.Location = new System.Drawing.Point(169, 49);
-			this.CordonLeft.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonLeft.Name = "cordonLeft";
-			this.CordonLeft.Size = new System.Drawing.Size(105, 20);
-			this.CordonLeft.TabIndex = 2;
-			this.CordonLeft.Value = new decimal(new int[] {
-			16,
-			0,
-			0,
-			0});
-			this.CordonLeft.Enter += new System.EventHandler(this.SelectText);
-			//
-			// height
-			//
-			this.MapHeight.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.MapHeight.Location = new System.Drawing.Point(280, 23);
-			this.MapHeight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.MapHeight.Name = "height";
-			this.MapHeight.Size = new System.Drawing.Size(105, 20);
-			this.MapHeight.TabIndex = 1;
-			this.MapHeight.Value = new decimal(new int[] {
-			128,
-			0,
-			0,
-			0});
-			this.MapHeight.Enter += new System.EventHandler(this.SelectText);
-			//
-			// width
-			//
-			this.MapWidth.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.MapWidth.Location = new System.Drawing.Point(169, 23);
-			this.MapWidth.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.MapWidth.Name = "width";
-			this.MapWidth.Size = new System.Drawing.Size(105, 20);
-			this.MapWidth.TabIndex = 0;
-			this.MapWidth.Value = new decimal(new int[] {
-			128,
-			0,
-			0,
-			0});
-			this.MapWidth.Enter += new System.EventHandler(this.SelectText);
-			//
-			// label4
-			//
-			this.label4.AutoSize = true;
-			this.label4.Location = new System.Drawing.Point(31, 124);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(44, 13);
-			this.label4.TabIndex = 14;
-			this.label4.Text = "Tileset";
-			//
-			// theater
-			//
-			this.TheaterBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.TheaterBox.FormattingEnabled = true;
-			this.TheaterBox.Location = new System.Drawing.Point(169, 121);
-			this.TheaterBox.Name = "theater";
-			this.TheaterBox.Size = new System.Drawing.Size(216, 21);
-			this.TheaterBox.TabIndex = 6;
-			//
-			// NewMapDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(418, 210);
-			this.Controls.Add(this.TheaterBox);
-			this.Controls.Add(this.label4);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.CordonBottom);
-			this.Controls.Add(this.CordonTop);
-			this.Controls.Add(this.CordonRight);
-			this.Controls.Add(this.CordonLeft);
-			this.Controls.Add(this.MapHeight);
-			this.Controls.Add(this.MapWidth);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "NewMapDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "New Map";
-			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.NumericUpDown CordonBottom;
-		public System.Windows.Forms.NumericUpDown CordonTop;
-		public System.Windows.Forms.NumericUpDown CordonRight;
-		public System.Windows.Forms.NumericUpDown CordonLeft;
-		public System.Windows.Forms.NumericUpDown MapHeight;
-		public System.Windows.Forms.NumericUpDown MapWidth;
-		private System.Windows.Forms.Label label4;
-		public System.Windows.Forms.ComboBox TheaterBox;
-	}
-}

OpenRA.Editor/NewMapDialog.cs

@@ -1,28 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class NewMapDialog : Form
-	{
-		public NewMapDialog()
-		{
-			InitializeComponent();
-		}
-
-		void SelectText(object sender, System.EventArgs e)
-		{
-			var ud = sender as NumericUpDown;
-			ud.Select(0, ud.ToString().Length);
-		}
-	}
-}

OpenRA.Editor/NewMapDialog.resx

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

OpenRA.Editor/OpenRA.Editor.csproj

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{00038B75-405B-44F5-8691-BD2546DBE224}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.Editor</RootNamespace>
-    <AssemblyName>OpenRA.Editor</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Eluant">
-      <HintPath>..\thirdparty\Eluant.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ActorPropertiesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ActorPropertiesDialog.Designer.cs">
-      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ActorTemplate.cs" />
-    <Compile Include="ActorTool.cs" />
-    <Compile Include="BrushTool.cs" />
-    <Compile Include="ErrorListDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ErrorListDialog.Designer.cs">
-      <DependentUpon>ErrorListDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ITool.cs" />
-    <Compile Include="MapSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MapSelect.Designer.cs">
-      <DependentUpon>MapSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewMapDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NewMapDialog.Designer.cs">
-      <DependentUpon>NewMapDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="PropertiesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PropertiesDialog.Designer.cs">
-      <DependentUpon>PropertiesDialog.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="ActorPropertiesDialog.resx">
-      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MapSelect.resx">
-      <DependentUpon>MapSelect.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewMapDialog.resx">
-      <DependentUpon>NewMapDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PropertiesDialog.resx">
-      <DependentUpon>PropertiesDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ResizeDialog.resx">
-      <DependentUpon>ResizeDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="RenderUtils.cs" />
-    <Compile Include="ResizeDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ResizeDialog.Designer.cs">
-      <DependentUpon>ResizeDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ResourceTool.cs" />
-    <Compile Include="Surface.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TileSetRenderer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
-      <Project>{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}</Project>
-      <Name>OpenRA.Mods.Common</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="OpenRA.Editor.Icon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

OpenRA.Editor/Program.cs

@@ -1,33 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Globalization;
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	static class Program
-	{
-		public static Ruleset Rules;
-
-		[STAThread]
-		static void Main(string[] args)
-		{
-			Log.AddChannel("perf", null);
-
-			Application.CurrentCulture = CultureInfo.InvariantCulture;
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
-
-			Application.Run(new Form1(args));
-		}
-	}
-}

OpenRA.Editor/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenRA.Editor.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.Editor.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

OpenRA.Editor/Properties/Resources.resx

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

OpenRA.Editor/Properties/Settings.Designer.cs

@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenRA.Editor.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}

OpenRA.Editor/Properties/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -1,181 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class PropertiesDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.TitleBox = new System.Windows.Forms.TextBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.DescBox = new System.Windows.Forms.TextBox();
-			this.SelectableCheckBox = new System.Windows.Forms.CheckBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.AuthorBox = new System.Windows.Forms.TextBox();
-			this.ShellmapCheckBox = 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.TitleBox.Location = new System.Drawing.Point(66, 47);
-			this.TitleBox.Name = "title";
-			this.TitleBox.Size = new System.Drawing.Size(286, 20);
-			this.TitleBox.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.DescBox.Location = new System.Drawing.Point(66, 73);
-			this.DescBox.Name = "desc";
-			this.DescBox.Size = new System.Drawing.Size(286, 20);
-			this.DescBox.TabIndex = 17;
-			//
-			// selectable
-			//
-			this.SelectableCheckBox.AutoSize = true;
-			this.SelectableCheckBox.Location = new System.Drawing.Point(118, 138);
-			this.SelectableCheckBox.Name = "selectable";
-			this.SelectableCheckBox.Size = new System.Drawing.Size(130, 17);
-			this.SelectableCheckBox.TabIndex = 18;
-			this.SelectableCheckBox.Text = "Show in Map Chooser";
-			this.SelectableCheckBox.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.AuthorBox.Location = new System.Drawing.Point(66, 99);
-			this.AuthorBox.Name = "author";
-			this.AuthorBox.Size = new System.Drawing.Size(286, 20);
-			this.AuthorBox.TabIndex = 17;
-			//
-			// checkBox1
-			//
-			this.ShellmapCheckBox.AutoSize = true;
-			this.ShellmapCheckBox.Location = new System.Drawing.Point(118, 161);
-			this.ShellmapCheckBox.Name = "checkBox1";
-			this.ShellmapCheckBox.Size = new System.Drawing.Size(105, 17);
-			this.ShellmapCheckBox.TabIndex = 18;
-			this.ShellmapCheckBox.Text = "Use as Shellmap";
-			this.ShellmapCheckBox.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.ShellmapCheckBox);
-			this.Controls.Add(this.SelectableCheckBox);
-			this.Controls.Add(this.AuthorBox);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.DescBox);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.TitleBox);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "PropertiesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Properties";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.TextBox TitleBox;
-		private System.Windows.Forms.Label label2;
-		public System.Windows.Forms.TextBox DescBox;
-		public System.Windows.Forms.CheckBox SelectableCheckBox;
-		private System.Windows.Forms.Label label3;
-		public System.Windows.Forms.TextBox AuthorBox;
-		public System.Windows.Forms.CheckBox ShellmapCheckBox;
-	}
-}

OpenRA.Editor/PropertiesDialog.cs

@@ -1,22 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class PropertiesDialog : Form
-	{
-		public PropertiesDialog()
-		{
-			InitializeComponent();
-		}
-	}
-}

OpenRA.Editor/PropertiesDialog.resx

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

OpenRA.Editor/RenderUtils.cs

@@ -1,108 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.FileSystem;
-using OpenRA.Graphics;
-using OpenRA.Mods.Common.SpriteLoaders;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	static class RenderUtils
-	{
-		static Bitmap RenderShp(ShpTDSprite shp, IPalette p)
-		{
-			var frame = shp.Frames.First();
-
-			var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				var q = (byte*)data.Scan0.ToPointer();
-				var stride2 = data.Stride;
-
-				for (var i = 0; i < frame.Size.Width; i++)
-					for (var j = 0; j < frame.Size.Height; j++)
-						q[j * stride2 + i] = frame.Data[i + frame.Size.Width * j];
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, IPalette p)
-		{
-			var image = info.Traits.Get<ILegacyEditorRenderInfo>().EditorImage(info);
-			using (var s = GlobalFileSystem.OpenWithExts(image, tileset.Extensions))
-			{
-				var shp = new ShpTDSprite(s);
-				var bitmap = RenderShp(shp, p);
-
-				try
-				{
-					using (var s2 = GlobalFileSystem.OpenWithExts(image + "2", tileset.Extensions))
-					{
-						var shp2 = new ShpTDSprite(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, IPalette p)
-		{
-			var image = info.EditorSprite;
-			using (var s = GlobalFileSystem.OpenWithExts(image, exts))
-			{
-				// TODO: Do this properly
-				var shp = new ShpTDSprite(s);
-				var frame = shp.Frames.Last();
-
-				var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
-				bitmap.Palette = p.AsSystemPalette();
-				var data = bitmap.LockBits(bitmap.Bounds(),
-					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-				unsafe
-				{
-					var q = (byte*)data.Scan0.ToPointer();
-					var stride = data.Stride;
-
-					for (var i = 0; i < frame.Size.Width; i++)
-						for (var j = 0; j < frame.Size.Height; j++)
-							q[j * stride + i] = frame.Data[i + frame.Size.Width * j];
-				}
-
-				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.Frames.Count - 1 };
-			}
-		}
-	}
-}

OpenRA.Editor/ResizeDialog.Designer.cs

@@ -1,235 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class ResizeDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.MapWidth = new System.Windows.Forms.NumericUpDown();
-			this.label1 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.CordonLeft = new System.Windows.Forms.NumericUpDown();
-			this.CordonTop = new System.Windows.Forms.NumericUpDown();
-			this.CordonRight = new System.Windows.Forms.NumericUpDown();
-			this.CordonBottom = new System.Windows.Forms.NumericUpDown();
-			this.label3 = new System.Windows.Forms.Label();
-			this.button1 = new System.Windows.Forms.Button();
-			this.button2 = new System.Windows.Forms.Button();
-			this.MapHeight = new System.Windows.Forms.NumericUpDown();
-			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).BeginInit();
-			this.SuspendLayout();
-			//
-			// width
-			//
-			this.MapWidth.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.MapWidth.Location = new System.Drawing.Point(161, 18);
-			this.MapWidth.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.MapWidth.Name = "width";
-			this.MapWidth.Size = new System.Drawing.Size(105, 20);
-			this.MapWidth.TabIndex = 0;
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(23, 20);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 1;
-			this.label1.Text = "Size";
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(23, 46);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(86, 13);
-			this.label2.TabIndex = 1;
-			this.label2.Text = "Cordon Left/Top";
-			//
-			// cordonLeft
-			//
-			this.CordonLeft.Location = new System.Drawing.Point(161, 44);
-			this.CordonLeft.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonLeft.Name = "cordonLeft";
-			this.CordonLeft.Size = new System.Drawing.Size(105, 20);
-			this.CordonLeft.TabIndex = 0;
-			//
-			// cordonTop
-			//
-			this.CordonTop.Location = new System.Drawing.Point(272, 44);
-			this.CordonTop.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonTop.Name = "cordonTop";
-			this.CordonTop.Size = new System.Drawing.Size(105, 20);
-			this.CordonTop.TabIndex = 0;
-			//
-			// cordonRight
-			//
-			this.CordonRight.Location = new System.Drawing.Point(161, 70);
-			this.CordonRight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonRight.Name = "cordonRight";
-			this.CordonRight.Size = new System.Drawing.Size(105, 20);
-			this.CordonRight.TabIndex = 0;
-			//
-			// cordonBottom
-			//
-			this.CordonBottom.Location = new System.Drawing.Point(272, 70);
-			this.CordonBottom.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonBottom.Name = "cordonBottom";
-			this.CordonBottom.Size = new System.Drawing.Size(105, 20);
-			this.CordonBottom.TabIndex = 0;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(23, 72);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(107, 13);
-			this.label3.TabIndex = 1;
-			this.label3.Text = "Cordon Right/Bottom";
-			//
-			// button1
-			//
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(302, 111);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// button2
-			//
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(221, 111);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 2;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// height
-			//
-			this.MapHeight.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.MapHeight.Location = new System.Drawing.Point(272, 18);
-			this.MapHeight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.MapHeight.Name = "height";
-			this.MapHeight.Size = new System.Drawing.Size(105, 20);
-			this.MapHeight.TabIndex = 0;
-			//
-			// ResizeDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(409, 146);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.CordonBottom);
-			this.Controls.Add(this.CordonTop);
-			this.Controls.Add(this.CordonRight);
-			this.Controls.Add(this.CordonLeft);
-			this.Controls.Add(this.MapHeight);
-			this.Controls.Add(this.MapWidth);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ResizeDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Resize Map";
-			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Button button2;
-		public System.Windows.Forms.NumericUpDown MapWidth;
-		public System.Windows.Forms.NumericUpDown CordonLeft;
-		public System.Windows.Forms.NumericUpDown CordonTop;
-		public System.Windows.Forms.NumericUpDown CordonRight;
-		public System.Windows.Forms.NumericUpDown CordonBottom;
-		public System.Windows.Forms.NumericUpDown MapHeight;
-	}
-}

OpenRA.Editor/ResizeDialog.resx

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

OpenRA.Editor/ResourceTool.cs

@@ -1,45 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class ResourceTool : ITool
-	{
-		ResourceTemplate resourceTemplate;
-
-		public ResourceTool(ResourceTemplate resource) { resourceTemplate = resource; }
-
-		public void Apply(Surface surface)
-		{
-			var type = (byte)resourceTemplate.Info.ResourceType;
-			var index = (byte)random.Next(resourceTemplate.Info.MaxDensity);
-			surface.Map.MapResources.Value[surface.GetBrushLocation()] = new ResourceTile(type, index);
-
-			var ch = new int2(surface.GetBrushLocation().X / Surface.ChunkSize,
-				surface.GetBrushLocation().Y / Surface.ChunkSize);
-
-			if (surface.Chunks.ContainsKey(ch))
-			{
-				surface.Chunks[ch].Dispose();
-				surface.Chunks.Remove(ch);
-			}
-		}
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			surface.DrawImage(g, resourceTemplate.Bitmap, surface.GetBrushLocation(), false, null);
-		}
-
-		Random random = new Random();
-	}
-}

OpenRA.Editor/Surface.cs

@@ -1,566 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
-using OpenRA.Traits;
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	static class ActorReferenceExts
-	{
-		public static CPos Location(this ActorReference ar)
-		{
-			return (CPos)ar.InitDict.Get<LocationInit>().value;
-		}
-
-		public static void DrawStringContrast(this SGraphics g, Font f, string s, int x, int y, Brush fg, Brush bg)
-		{
-			g.DrawString(s, f, bg, x - 1, y - 1);
-			g.DrawString(s, f, bg, x + 1, y - 1);
-			g.DrawString(s, f, bg, x - 1, y + 1);
-			g.DrawString(s, f, bg, x + 1, y + 1);
-
-			g.DrawString(s, f, fg, x, y);
-		}
-	}
-
-	class Surface : Control
-	{
-		public Map Map { get; private set; }
-		public TileSet TileSet { get; private set; }
-		public TileSetRenderer TileSetRenderer { get; private set; }
-		public IPalette Palette { get; private set; }
-		public IPalette PlayerPalette { get; private set; }
-		public int2 Offset;
-
-		public int2 GetOffset() { return Offset; }
-
-		public float Zoom = 1.0f;
-
-		ITool currentTool;
-
-		public bool IsPanning;
-		public bool IsErasing;
-		public bool ShowActorNames;
-		public bool ShowGrid;
-		public bool ShowRuler;
-
-		public bool IsPaste { get { return TileSelection != null && ResourceSelection != null; } }
-		public TerrainTile[,] TileSelection;
-		public ResourceTile[,] ResourceSelection;
-		public CPos SelectionStart;
-		public CPos SelectionEnd;
-
-		public string NewActorOwner;
-
-		public event Action AfterChange = () => { };
-		public event Action<string> MousePositionChanged = _ => { };
-		public event Action<KeyValuePair<string, ActorReference>> ActorDoubleClicked = _ => { };
-
-		Dictionary<string, ActorTemplate> actorTemplates = new Dictionary<string, ActorTemplate>();
-		public Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
-
-		static readonly Font MarkerFont = new Font(FontFamily.GenericSansSerif, 12.0f, FontStyle.Regular);
-		static readonly SolidBrush TextBrush = new SolidBrush(Color.Red);
-
-		public Keys GetModifiers() { return ModifierKeys; }
-
-		public void Bind(Map m, TileSet ts, TileSetRenderer tsr, IPalette p, IPalette pp)
-		{
-			Map = m;
-			TileSet = ts;
-			TileSetRenderer = tsr;
-			Palette = p;
-			PlayerPalette = pp;
-			playerPalettes = null;
-			Chunks.Clear();
-			currentTool = null;
-		}
-
-		public void SetTool(ITool tool) { currentTool = tool; ClearSelection(); }
-
-		public void BindActorTemplates(IEnumerable<ActorTemplate> templates)
-		{
-			actorTemplates = templates.ToDictionary(a => a.Info.Name.ToLowerInvariant());
-		}
-
-		public void BindResourceTemplates(IEnumerable<ResourceTemplate> templates)
-		{
-			ResourceTemplates = templates.ToDictionary(a => a.Info.ResourceType);
-		}
-
-		public Dictionary<int2, Bitmap> Chunks = new Dictionary<int2, Bitmap>();
-
-		public Surface()
-		{
-			BackColor = Color.Black;
-
-			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
-			SetStyle(ControlStyles.ResizeRedraw, true);
-			UpdateStyles();
-		}
-
-		static readonly Pen SelectionPen = new Pen(Color.Blue);
-		static readonly Pen PastePen = new Pen(Color.Green);
-		static readonly Pen CordonPen = new Pen(Color.Red);
-
-		int2 mousePos;
-
-		public void Scroll(int2 dx)
-		{
-			Offset -= dx;
-			Invalidate();
-		}
-
-		protected override void OnDoubleClick(EventArgs e)
-		{
-			base.OnDoubleClick(e);
-
-			var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
-			if (x.Key != null)
-				ActorDoubleClicked(x);
-		}
-
-		protected override void OnMouseWheel(MouseEventArgs e)
-		{
-			base.OnMouseWheel(e);
-
-			if (Map == null) return;
-
-			Zoom *= e.Delta > 0 ? 4.0f / 3.0f : .75f;
-
-			Invalidate();
-		}
-
-		protected override void OnMouseLeave(EventArgs e)
-		{
-			base.OnMouseLeave(e);
-
-			this.Parent.Focus();
-
-			Invalidate();
-		}
-
-		protected override void OnMouseEnter(EventArgs e)
-		{
-			base.OnMouseLeave(e);
-
-			this.Focus();
-
-			Invalidate();
-		}
-
-		protected override void OnMouseMove(MouseEventArgs e)
-		{
-			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);
-			else
-			{
-				if (e.Button == MouseButtons.Right || (IsErasing && e.Button == MouseButtons.Left))
-					Erase();
-
-				if (e.Button == MouseButtons.Left && !IsErasing)
-					Draw();
-
-				Invalidate();
-			}
-		}
-
-		void Erase()
-		{
-			// Crash preventing
-			var brushLocation = GetBrushLocation();
-
-			if (Map == null || brushLocation.X >= Map.MapSize.X ||
-				brushLocation.Y >= Map.MapSize.Y ||
-				brushLocation.X < 0 ||
-				brushLocation.Y < 0)
-				return;
-
-			currentTool = null;
-
-			var key = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == brushLocation);
-			if (key.Key != null) Map.Actors.Value.Remove(key.Key);
-
-			if (Map.MapResources.Value[brushLocation].Type != 0)
-			{
-				Map.MapResources.Value[brushLocation] = new ResourceTile(0, 0);
-				var ch = new int2(brushLocation.X / ChunkSize, brushLocation.Y / ChunkSize);
-				if (Chunks.ContainsKey(ch))
-				{
-					Chunks[ch].Dispose();
-					Chunks.Remove(ch);
-				}
-			}
-
-			AfterChange();
-			ClearSelection();
-		}
-
-		void Draw()
-		{
-			if (currentTool != null)
-			{
-				currentTool.Apply(this);
-				AfterChange();
-			}
-			else if (IsPaste)
-				PasteSelection();
-			else
-				SelectionEnd = GetBrushLocationBR();
-		}
-
-		protected override void OnMouseDown(MouseEventArgs e)
-		{
-			base.OnMouseDown(e);
-
-			if (Map == null) return;
-
-			if (!IsPanning)
-			{
-				if (e.Button == MouseButtons.Right) Erase();
-				if (e.Button == MouseButtons.Left && !IsErasing)
-				{
-					Draw();
-					if (!IsPaste)
-						SelectionStart = SelectionEnd = GetBrushLocation();
-				}
-			}
-
-			Invalidate();
-		}
-
-		public const int ChunkSize = 8;		// 8x8 chunks ==> 192x192 bitmaps.
-
-		Bitmap RenderChunk(int u, int v)
-		{
-			var bitmap = new Bitmap(ChunkSize * TileSetRenderer.TileSize, ChunkSize * TileSetRenderer.TileSize);
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				var p = (int*)data.Scan0.ToPointer();
-				var stride = data.Stride >> 2;
-
-				for (var i = 0; i < ChunkSize; i++)
-					for (var j = 0; j < ChunkSize; j++)
-					{
-						var ui = u * ChunkSize + i;
-						var vj = v * ChunkSize + j;
-						var tr = Map.MapTiles.Value[ui, vj];
-						var tile = TileSetRenderer.Data(tr.Type);
-						var index = (tr.Index < tile.Length) ? tr.Index : (byte)0;
-						var rawImage = tile[index];
-						for (var x = 0; x < TileSetRenderer.TileSize; x++)
-							for (var y = 0; y < TileSetRenderer.TileSize; y++)
-								p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = Palette.GetColor(rawImage[x + TileSetRenderer.TileSize * y]).ToArgb();
-
-						if (Map.MapResources.Value[ui, vj].Type != 0)
-						{
-							var resourceImage = ResourceTemplates[Map.MapResources.Value[ui, vj].Type].Bitmap;
-							var srcdata = resourceImage.LockBits(resourceImage.Bounds(),
-								ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-
-							var q = (int*)srcdata.Scan0.ToPointer();
-							var srcstride = srcdata.Stride >> 2;
-
-							for (var x = 0; x < TileSetRenderer.TileSize; x++)
-								for (var y = 0; y < TileSetRenderer.TileSize; y++)
-								{
-									var c = q[y * srcstride + x];
-									if ((c & 0xff000000) != 0)	/* quick & dirty, i cbf doing real alpha */
-										p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = c;
-								}
-
-							resourceImage.UnlockBits(srcdata);
-						}
-					}
-			}
-
-			bitmap.UnlockBits(data);
-
-			if (ShowGrid)
-			{
-				using (var g = SGraphics.FromImage(bitmap))
-				{
-					var ts = Game.modData.Manifest.TileSize;
-					var rect = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
-					ControlPaint.DrawGrid(g, rect, new Size(2, ts.Height), Color.DarkRed);
-					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, 2), Color.DarkRed);
-					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, ts.Height), Color.Red);
-				}
-			}
-			return bitmap;
-		}
-
-		public CPos GetBrushLocation()
-		{
-			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
-			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
-			return new CPos(vX / TileSetRenderer.TileSize, vY / TileSetRenderer.TileSize);
-		}
-
-		public CPos GetBrushLocationBR()
-		{
-			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
-			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
-			return new CPos((vX + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize,
-			                (vY + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize);
-		}
-
-		public void DrawActor(SGraphics g, CPos p, ActorTemplate t, ColorPalette cp)
-		{
-			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
-			var actorPalette = cp;
-			if (t.Appearance != null && t.Appearance.UseTerrainPalette)
-				actorPalette = Palette.AsSystemPalette();
-			DrawImage(g, t.Bitmap, p, centered, actorPalette);
-		}
-
-		float2 GetDrawPosition(CPos location, Bitmap bmp, bool centered)
-		{
-			float offsetX = centered ? bmp.Width / 2 - TileSetRenderer.TileSize / 2 : 0;
-			var drawX = TileSetRenderer.TileSize * location.X * Zoom + Offset.X - offsetX;
-
-			float offsetY = centered ? bmp.Height / 2 - TileSetRenderer.TileSize / 2 : 0;
-			var drawY = TileSetRenderer.TileSize * location.Y * Zoom + Offset.Y - offsetY;
-
-			return new float2(drawX, drawY);
-		}
-
-		public void DrawImage(SGraphics g, Bitmap bmp, CPos location, bool centered, ColorPalette cp)
-		{
-			var drawPos = GetDrawPosition(location, bmp, centered);
-
-			var sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
-			var destRect = new RectangleF(drawPos.X, drawPos.Y, bmp.Width * Zoom, bmp.Height * Zoom);
-
-			var restorePalette = bmp.Palette;
-			if (cp != null) bmp.Palette = cp;
-			g.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
-			if (cp != null) bmp.Palette = restorePalette;
-		}
-
-		void DrawActorBorder(SGraphics g, CPos p, ActorTemplate t)
-		{
-			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
-			var drawPos = GetDrawPosition(p, t.Bitmap, centered);
-
-			g.DrawRectangle(CordonPen,
-				drawPos.X, drawPos.Y,
-				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);
-		}
-
-		ColorPalette GetPaletteForPlayerInner(string name)
-		{
-			var pr = Map.Players[name];
-			var pcpi = Program.Rules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>();
-			var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp);
-			return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette();
-		}
-
-		Cache<string, ColorPalette> playerPalettes;
-
-		public ColorPalette GetPaletteForPlayer(string player)
-		{
-			if (playerPalettes == null)
-				playerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayerInner);
-
-			return playerPalettes[player];
-		}
-
-		ColorPalette GetPaletteForActor(ActorReference ar)
-		{
-			var ownerInit = ar.InitDict.GetOrDefault<OwnerInit>();
-			if (ownerInit == null)
-				return null;
-
-			return GetPaletteForPlayer(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 v = 0; v < Map.MapSize.Y; v += ChunkSize)
-				{
-					var x = new int2(u / ChunkSize, v / ChunkSize);
-					if (!Chunks.ContainsKey(x)) Chunks[x] = RenderChunk(u / ChunkSize, v / ChunkSize);
-
-					var bmp = Chunks[x];
-
-					var drawX = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
-					var drawY = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
-					var sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
-					var destRect = new RectangleF(drawX, drawY, bmp.Width * Zoom, bmp.Height * Zoom);
-					e.Graphics.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
-				}
-
-			e.Graphics.DrawRectangle(CordonPen,
-				Map.Bounds.Left * TileSetRenderer.TileSize * Zoom + Offset.X,
-				Map.Bounds.Top * TileSetRenderer.TileSize * Zoom + Offset.Y,
-				Map.Bounds.Width * TileSetRenderer.TileSize * Zoom,
-				Map.Bounds.Height * TileSetRenderer.TileSize * Zoom);
-
-			e.Graphics.DrawRectangle(SelectionPen,
-				(SelectionStart.X * TileSetRenderer.TileSize * Zoom) + Offset.X,
-				(SelectionStart.Y * TileSetRenderer.TileSize * Zoom) + Offset.Y,
-				(SelectionEnd - SelectionStart).X * TileSetRenderer.TileSize * Zoom,
-				(SelectionEnd - SelectionStart).Y * TileSetRenderer.TileSize * Zoom);
-
-			if (IsPaste)
-			{
-				var loc = GetBrushLocation();
-				var width = Math.Abs((SelectionStart - SelectionEnd).X);
-				var height = Math.Abs((SelectionStart - SelectionEnd).Y);
-
-				e.Graphics.DrawRectangle(PastePen,
-					(loc.X * TileSetRenderer.TileSize * Zoom) + Offset.X,
-					(loc.Y * TileSetRenderer.TileSize * Zoom) + Offset.Y,
-					width * (TileSetRenderer.TileSize * Zoom),
-					height * (TileSetRenderer.TileSize * Zoom));
-			}
-
-			foreach (var ar in Map.Actors.Value)
-			{
-				if (actorTemplates.ContainsKey(ar.Value.Type))
-					DrawActor(e.Graphics, ar.Value.Location(), actorTemplates[ar.Value.Type],
-						GetPaletteForActor(ar.Value));
-				else
-					Console.WriteLine("Warning: Unknown or excluded actor: {0}", ar.Value.Type);
-			}
-
-			if (ShowActorNames)
-				foreach (var ar in Map.Actors.Value)
-					if (!ar.Key.StartsWith("Actor"))	// if it has a custom name
-						e.Graphics.DrawStringContrast(Font, ar.Key,
-							(int)(ar.Value.Location().X * TileSetRenderer.TileSize * Zoom + Offset.X),
-							(int)(ar.Value.Location().Y * TileSetRenderer.TileSize * Zoom + Offset.Y),
-							Brushes.White,
-							Brushes.Black);
-
-			if (ShowRuler && Zoom > 0.2)
-			{
-				for (var i = Map.Bounds.Left; i <= Map.Bounds.Right; i += 8)
-				{
-					if (i % 8 == 0)
-					{
-						var point = new PointF(i * TileSetRenderer.TileSize * Zoom + Offset.X, (Map.Bounds.Top - 8) * TileSetRenderer.TileSize * Zoom + Offset.Y);
-						e.Graphics.DrawString((i - Map.Bounds.Left).ToString(), MarkerFont, TextBrush, point);
-					}
-				}
-
-				for (var i = Map.Bounds.Top; i <= Map.Bounds.Bottom; i += 8)
-				{
-					if (i % 8 == 0)
-					{
-						var point = new PointF((Map.Bounds.Left - 8) * TileSetRenderer.TileSize * Zoom + Offset.X, i * TileSetRenderer.TileSize * Zoom + Offset.Y);
-						e.Graphics.DrawString((i - Map.Bounds.Left).ToString(), MarkerFont, TextBrush, point);
-					}
-				}
-			}
-
-			if (currentTool != null)
-				currentTool.Preview(this, e.Graphics);
-
-			if (currentTool == null)
-			{
-				var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
-				if (x.Key != null && actorTemplates.ContainsKey(x.Value.Type))
-					DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]);
-			}
-		}
-
-		public void CopySelection()
-		{
-			// Grab tiles and resources within selection (doesn't do actors)
-			var start = SelectionStart;
-			var end = SelectionEnd;
-
-			if (start == end) return;
-
-			var width = Math.Abs((start - end).X);
-			var height = Math.Abs((start - end).Y);
-
-			TileSelection = new TerrainTile[width, height];
-			ResourceSelection = new ResourceTile[width, height];
-
-			for (var x = 0; x < width; x++)
-			{
-				for (var y = 0; y < height; y++)
-				{
-					// TODO: crash prevention
-					var cell = new CPos(start.X + x, start.Y + y);
-					TileSelection[x, y] = Map.MapTiles.Value[cell];
-					ResourceSelection[x, y] = Map.MapResources.Value[cell];
-				}
-			}
-		}
-
-		void PasteSelection()
-		{
-			var loc = GetBrushLocation();
-			var width = Math.Abs((SelectionStart - SelectionEnd).X);
-			var height = Math.Abs((SelectionStart - SelectionEnd).Y);
-
-			for (var x = 0; x < width; x++)
-			{
-				for (var y = 0; y < height; y++)
-				{
-					var mapX = loc.X + x;
-					var mapY = loc.Y + y;
-					var cell = new CPos(mapX, mapY);
-
-					// TODO: crash prevention for outside of bounds
-					Map.MapTiles.Value[cell] = TileSelection[x, y];
-					Map.MapResources.Value[cell] = ResourceSelection[x, y];
-
-					var ch = new int2(mapX / ChunkSize, mapY / ChunkSize);
-					if (Chunks.ContainsKey(ch))
-					{
-						Chunks[ch].Dispose();
-						Chunks.Remove(ch);
-					}
-				}
-			}
-
-			AfterChange();
-		}
-
-		void ClearSelection()
-		{
-			SelectionStart = CPos.Zero;
-			SelectionEnd = CPos.Zero;
-			TileSelection = null;
-			ResourceSelection = null;
-		}
-	}
-}

OpenRA.Editor/TileSetRenderer.cs

@@ -1,110 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using OpenRA.FileSystem;
-using OpenRA.Graphics;
-
-namespace OpenRA.Editor
-{
-	public class TileSetRenderer
-	{
-		public readonly int TileSize;
-		public TileSet TileSet;
-		Dictionary<ushort, byte[][]> templates;
-
-		// Extract a square tile that the editor can render
-		byte[] ExtractSquareTile(ISpriteFrame frame)
-		{
-			var data = new byte[TileSize * TileSize];
-
-			// Invalid tile size: return blank tile
-			if (frame.Size.Width < TileSize || frame.Size.Height < TileSize)
-				return new byte[0];
-
-			var frameData = frame.Data;
-			var xOffset = (frame.Size.Width - TileSize) / 2;
-			var yOffset = (frame.Size.Height - TileSize) / 2;
-
-			for (var y = 0; y < TileSize; y++)
-				for (var x = 0; x < TileSize; x++)
-					data[y * TileSize + x] = frameData[(yOffset + y) * frame.Size.Width + x + xOffset];
-
-			return data;
-		}
-
-		public TileSetRenderer(TileSet tileset, Size tileSize)
-		{
-			this.TileSet = tileset;
-			this.TileSize = Math.Min(tileSize.Width, tileSize.Height);
-
-			templates = new Dictionary<ushort, byte[][]>();
-			var frameCache = new FrameCache(Game.modData.SpriteLoaders, tileset.Extensions);
-			foreach (var t in tileset.Templates)
-			{
-				var allFrames = frameCache[t.Value.Image];
-				var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
-				templates.Add(t.Value.Id, frames.Select(f => ExtractSquareTile(f)).ToArray());
-			}
-		}
-
-		public Bitmap RenderTemplate(ushort id, IPalette p)
-		{
-			var template = TileSet.Templates[id];
-			var templateData = templates[id];
-
-			var bitmap = new Bitmap(TileSize * template.Size.X, TileSize * template.Size.Y,
-				PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				var 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++)
-					{
-						var rawImage = templateData[u + v * template.Size.X];
-						if (rawImage != null && rawImage.Length > 0)
-						{
-							for (var i = 0; i < TileSize; i++)
-								for (var j = 0; j < TileSize; j++)
-									q[(v * TileSize + j) * stride + u * TileSize + i] = rawImage[i + TileSize * j];
-						}
-						else
-						{
-							for (var i = 0; i < TileSize; i++)
-								for (var j = 0; j < TileSize; j++)
-									q[(v * TileSize + j) * stride + u * TileSize + i] = 0;
-						}
-					}
-				}
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		public byte[][] Data(ushort id)
-		{
-			return templates[id];
-		}
-	}
-}

OpenRA.Game.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
+</configuration>

OpenRA.Game/Activities/Activity.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -10,8 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Activities
 {
 	public abstract class Activity
 	{

OpenRA.Game/Activities/CallFunc.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -9,9 +9,8 @@
 #endregion
 
 using System;
-using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Activities
 {
 	public class CallFunc : Activity
 	{

OpenRA.Game/Actor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -14,6 +14,7 @@ using System.Drawing;
 using System.Linq;
 using Eluant;
 using Eluant.ObjectBinding;
+using OpenRA.Activities;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Scripting;
@@ -21,22 +22,39 @@ using OpenRA.Traits;
 
 namespace OpenRA
 {
-	public class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>
+	public sealed class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IDisposable
 	{
 		public readonly ActorInfo Info;
 
 		public readonly World World;
-		public readonly uint ActorID;
-		public Lazy<Rectangle> Bounds;
 
-		Lazy<IOccupySpace> occupySpace;
+		public readonly uint ActorID;
+
+		[Sync] public Player Owner { get; set; }
+
+		public bool IsInWorld { get; internal set; }
+		public bool Disposed { get; private set; }
+
+		Activity currentActivity;
+
+		public Group Group;
+		public int Generation;
+
+		Lazy<Rectangle> bounds;
+		Lazy<Rectangle> visualBounds;
 		Lazy<IFacing> facing;
 		Lazy<Health> health;
+		Lazy<IOccupySpace> occupySpace;
 		Lazy<IEffectiveOwner> effectiveOwner;
 
+		public Rectangle Bounds { get { return bounds.Value; } }
+		public Rectangle VisualBounds { get { return visualBounds.Value; } }
 		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
 		public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } }
 
+		public bool IsIdle { get { return currentActivity == null; } }
+		public bool IsDead { get { return Disposed || (health.Value == null ? false : health.Value.IsDead); } }
+
 		public CPos Location { get { return occupySpace.Value.TopLeft; } }
 		public WPos CenterPosition { get { return occupySpace.Value.CenterPosition; } }
 
@@ -50,11 +68,9 @@ namespace OpenRA
 			}
 		}
 
-		[Sync] public Player Owner;
-
-		Activity currentActivity;
-		public Group Group;
-		public int Generation;
+		readonly IRenderModifier[] renderModifiers;
+		readonly IRender[] renders;
+		readonly IDisable[] disables;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -69,10 +85,12 @@ namespace OpenRA
 
 			if (name != null)
 			{
-				if (!world.Map.Rules.Actors.ContainsKey(name.ToLowerInvariant()))
-					throw new NotImplementedException("No rules definition for unit {0}".F(name.ToLowerInvariant()));
+				name = name.ToLowerInvariant();
 
-				Info = world.Map.Rules.Actors[name.ToLowerInvariant()];
+				if (!world.Map.Rules.Actors.ContainsKey(name))
+					throw new NotImplementedException("No rules definition for unit " + name);
+
+				Info = world.Map.Rules.Actors[name];
 				foreach (var trait in Info.TraitsInConstructOrder())
 					AddTrait(trait.Create(init));
 			}
@@ -81,7 +99,7 @@ namespace OpenRA
 			health = Exts.Lazy(() => TraitOrDefault<Health>());
 			effectiveOwner = Exts.Lazy(() => TraitOrDefault<IEffectiveOwner>());
 
-			Bounds = Exts.Lazy(() =>
+			bounds = Exts.Lazy(() =>
 			{
 				var si = Info.Traits.GetOrDefault<SelectableInfo>();
 				var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
@@ -93,39 +111,52 @@ namespace OpenRA
 
 				return new Rectangle(offset.X, offset.Y, size.X, size.Y);
 			});
+
+			visualBounds = Exts.Lazy(() =>
+			{
+				var sd = Info.Traits.GetOrDefault<ISelectionDecorationsInfo>();
+				if (sd == null || sd.SelectionBoxBounds == null)
+					return bounds.Value;
+
+				var size = new int2(sd.SelectionBoxBounds[0], sd.SelectionBoxBounds[1]);
+
+				var offset = -size / 2;
+				if (sd.SelectionBoxBounds.Length > 2)
+					offset += new int2(sd.SelectionBoxBounds[2], sd.SelectionBoxBounds[3]);
+
+				return new Rectangle(offset.X, offset.Y, size.X, size.Y);
+			});
+
+			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
+			renders = TraitsImplementing<IRender>().ToArray();
+			disables = TraitsImplementing<IDisable>().ToArray();
 		}
 
 		public void Tick()
 		{
 			var wasIdle = IsIdle;
 			currentActivity = Traits.Util.RunActivity(this, currentActivity);
+
 			if (!wasIdle && IsIdle)
 				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
 					n.OnBecomingIdle(this);
 		}
 
-		public bool IsIdle
-		{
-			get { return currentActivity == null; }
-		}
-
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
 			var renderables = Renderables(wr);
-			foreach (var modifier in TraitsImplementing<IRenderModifier>())
+			foreach (var modifier in renderModifiers)
 				renderables = modifier.ModifyRender(this, wr, renderables);
 			return renderables;
 		}
 
 		IEnumerable<IRenderable> Renderables(WorldRenderer wr)
 		{
-			foreach (var render in TraitsImplementing<IRender>())
+			foreach (var render in renders)
 				foreach (var renderable in render.Render(this, wr))
 					yield return renderable;
 		}
 
-		public bool IsInWorld { get; internal set; }
-
 		public void QueueActivity(bool queued, Activity nextActivity)
 		{
 			if (!queued)
@@ -170,48 +201,52 @@ namespace OpenRA
 
 		public override string ToString()
 		{
-			return "{0} {1}{2}".F(Info.Name, ActorID, IsInWorld ? "" : " (not in world)");
+			var name = Info.Name + " " + ActorID;
+			if (!IsInWorld)
+				name += " (not in world)";
+			return name;
 		}
 
 		public T Trait<T>()
 		{
-			return World.traitDict.Get<T>(this);
+			return World.TraitDict.Get<T>(this);
 		}
 
 		public T TraitOrDefault<T>()
 		{
-			return World.traitDict.GetOrDefault<T>(this);
+			return World.TraitDict.GetOrDefault<T>(this);
 		}
 
 		public IEnumerable<T> TraitsImplementing<T>()
 		{
-			return World.traitDict.WithInterface<T>(this);
+			return World.TraitDict.WithInterface<T>(this);
 		}
 
 		public bool HasTrait<T>()
 		{
-			return World.traitDict.Contains<T>(this);
+			return World.TraitDict.Contains<T>(this);
 		}
 
 		public void AddTrait(object trait)
 		{
-			World.traitDict.AddTrait(this, trait);
+			World.TraitDict.AddTrait(this, trait);
 		}
 
-		public bool Destroyed { get; private set; }
-
-		public void Destroy()
+		public void Dispose()
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (Destroyed)
+				if (Disposed)
 					return;
 
 				if (IsInWorld)
 					World.Remove(this);
 
-				World.traitDict.RemoveActor(this);
-				Destroyed = true;
+				foreach (var t in TraitsImplementing<INotifyActorDisposing>())
+					t.Disposing(this);
+
+				World.TraitDict.RemoveActor(this);
+				Disposed = true;
 
 				if (luaInterface != null)
 					luaInterface.Value.OnActorDestroyed();
@@ -223,35 +258,27 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (this.Destroyed)
+				if (Disposed)
 					return;
 
 				var oldOwner = Owner;
+				var wasInWorld = IsInWorld;
 
 				// momentarily remove from world so the ownership queries don't get confused
-				w.Remove(this);
+				if (wasInWorld)
+					w.Remove(this);
+
 				Owner = newOwner;
 				Generation++;
-				w.Add(this);
+
+				if (wasInWorld)
+					w.Add(this);
 
 				foreach (var t in this.TraitsImplementing<INotifyOwnerChanged>())
 					t.OnOwnerChanged(this, oldOwner, newOwner);
 			});
 		}
 
-		public bool IsDead()
-		{
-			if (Destroyed)
-				return true;
-
-			return (health.Value == null) ? false : health.Value.IsDead;
-		}
-
-		public bool IsDisguised()
-		{
-			return effectiveOwner.Value != null && effectiveOwner.Value.Disguised;
-		}
-
 		public void Kill(Actor attacker)
 		{
 			if (health.Value == null)
@@ -260,6 +287,14 @@ namespace OpenRA
 			health.Value.InflictDamage(this, attacker, health.Value.MaxHP, null, true);
 		}
 
+		public bool IsDisabled()
+		{
+			foreach (var disable in disables)
+				if (disable.Disabled)
+					return true;
+			return false;
+		}
+
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;

OpenRA.Game/CPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -9,7 +9,6 @@
 #endregion
 
 using System;
-using System.Drawing;
 using Eluant;
 using Eluant.ObjectBinding;
 using OpenRA.Scripting;
@@ -28,28 +27,46 @@ namespace OpenRA
 		public static CPos operator +(CVec a, CPos b) { return new CPos(a.X + b.X, a.Y + b.Y); }
 		public static CPos operator +(CPos a, CVec b) { return new CPos(a.X + b.X, a.Y + b.Y); }
 		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y); }
-
 		public static CVec operator -(CPos a, CPos b) { return new CVec(a.X - b.X, a.Y - b.Y); }
 
-		public static bool operator ==(CPos me, CPos other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator ==(CPos me, CPos other) { return me.X == other.X && me.Y == other.Y; }
 		public static bool operator !=(CPos me, CPos other) { return !(me == other); }
 
 		public static CPos Max(CPos a, CPos b) { return new CPos(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
 		public static CPos Min(CPos a, CPos b) { return new CPos(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
 
-		public CPos Clamp(Rectangle r)
-		{
-			return new CPos(Math.Min(r.Right, Math.Max(X, r.Left)),
-							Math.Min(r.Bottom, Math.Max(Y, r.Top)));
-		}
-
 		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
 
-		public bool Equals(CPos other) { return other == this; }
+		public bool Equals(CPos other) { return X == other.X && Y == other.Y; }
 		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
 
 		public override string ToString() { return X + "," + Y; }
 
+		public MPos ToMPos(Map map)
+		{
+			return ToMPos(map.TileShape);
+		}
+
+		public MPos ToMPos(TileShape shape)
+		{
+			if (shape == TileShape.Rectangle)
+				return new MPos(X, Y);
+
+			// Convert from diamond cell (x, y) position to rectangular map position (u, v)
+			//  - The staggered rows make this fiddly (hint: draw a diagram!)
+			// (a) Consider the relationships:
+			//  - +1x (even -> odd) adds (0, 1) to (u, v)
+			//  - +1x (odd -> even) adds (1, 1) to (u, v)
+			//  - +1y (even -> odd) adds (-1, 1) to (u, v)
+			//  - +1y (odd -> even) adds (0, 1) to (u, v)
+			// (b) Therefore:
+			//  - ax + by adds (a - b)/2 to u (only even increments count)
+			//  - ax + by adds a + b to v
+			var u = (X - Y) / 2;
+			var v = X + Y;
+			return new MPos(u, v);
+		}
+
 		#region Scripting interface
 
 		public LuaValue Add(LuaRuntime runtime, LuaValue left, LuaValue right)

OpenRA.Game/CVec.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -31,7 +31,7 @@ namespace OpenRA
 
 		public static CVec operator -(CVec a) { return new CVec(-a.X, -a.Y); }
 
-		public static bool operator ==(CVec me, CVec other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator ==(CVec me, CVec other) { return me.X == other.X && me.Y == other.Y; }
 		public static bool operator !=(CVec me, CVec other) { return !(me == other); }
 
 		public static CVec Max(CVec a, CVec b) { return new CVec(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
@@ -48,8 +48,7 @@ namespace OpenRA
 		{
 			return new CVec(
 				Math.Min(r.Right, Math.Max(X, r.Left)),
-				Math.Min(r.Bottom, Math.Max(Y, r.Top))
-			);
+				Math.Min(r.Bottom, Math.Max(Y, r.Top)));
 		}
 
 		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
@@ -59,7 +58,7 @@ namespace OpenRA
 
 		public override string ToString() { return X + "," + Y; }
 
-		public static readonly CVec[] directions =
+		public static readonly CVec[] Directions =
 		{
 			new CVec(-1, -1),
 			new CVec(-1,  0),

OpenRA.Game/CacheStorage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -8,15 +8,12 @@
  */
 #endregion
 
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
+namespace OpenRA
 {
-	public partial class ResizeDialog : Form
+	public interface ICacheStorage<T>
 	{
-		public ResizeDialog()
-		{
-			InitializeComponent();
-		}
+		void Remove(string key);
+		void Store(string key, T data);
+		T Retrieve(string key);
 	}
-}
+}

OpenRA.Game/Download.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Game/Effects/AsyncAction.cs

@@ -0,0 +1,38 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using OpenRA.Graphics;
+
+namespace OpenRA.Effects
+{
+	public class AsyncAction : IEffect
+	{
+		Action a;
+		IAsyncResult ar;
+
+		public AsyncAction(IAsyncResult ar, Action a)
+		{
+			this.a = a;
+			this.ar = ar;
+		}
+
+		public void Tick(World world)
+		{
+			if (ar.IsCompleted)
+			{
+				world.AddFrameEndTask(w => { w.Remove(this); a(); });
+			}
+		}
+
+		public IEnumerable<IRenderable> Render(WorldRenderer r) { yield break; }
+	}
+}

OpenRA.Game/Effects/DelayedAction.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Game/Effects/FlashTarget.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
@@ -25,8 +25,11 @@ namespace OpenRA.Effects
 			this.target = target;
 			player = asPlayer;
 			remainingTicks = ticks;
-			foreach (var e in target.World.Effects.OfType<FlashTarget>().Where(a => a.target == target).ToArray())
-				target.World.Remove(e);
+			target.World.RemoveAll(effect =>
+			{
+				var flashTarget = effect as FlashTarget;
+				return flashTarget != null && flashTarget.target == target;
+			});
 		}
 
 		public void Tick(World world)

OpenRA.Game/Effects/IEffect.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Game/Effects/SpriteEffect.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -15,15 +15,15 @@ namespace OpenRA.Effects
 {
 	public class SpriteEffect : IEffect
 	{
-		string palette;
-		Animation anim;
-		WPos pos;
+		readonly string palette;
+		readonly Animation anim;
+		readonly WPos pos;
 
-		public SpriteEffect(WPos pos, World world, string sprite, string palette)
+		public SpriteEffect(WPos pos, World world, string image, string palette)
 		{
 			this.pos = pos;
 			this.palette = palette;
-			anim = new Animation(world, sprite);
+			anim = new Animation(world, image);
 			anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
 		}
 

OpenRA.Game/Exts.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -11,10 +11,12 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using OpenRA.Support;
+using OpenRA.Traits;
 
 namespace OpenRA
 {
@@ -86,12 +88,34 @@ namespace OpenRA
 			return r.Contains(p.ToPointF());
 		}
 
+		static int WindingDirectionTest(int2 v0, int2 v1, int2 p)
+		{
+			return (v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y);
+		}
+
+		public static bool PolygonContains(this int2[] polygon, int2 p)
+		{
+			var windingNumber = 0;
+
+			for (var i = 0; i < polygon.Length; i++)
+			{
+				var tv = polygon[i];
+				var nv = polygon[(i + 1) % polygon.Length];
+
+				if (tv.Y <= p.Y && nv.Y > p.Y && WindingDirectionTest(tv, nv, p) > 0)
+					windingNumber++;
+				else if (tv.Y > p.Y && nv.Y <= p.Y && WindingDirectionTest(tv, nv, p) < 0)
+					windingNumber--;
+			}
+
+			return windingNumber != 0;
+		}
+
 		public static bool HasModifier(this Modifiers k, Modifiers mod)
 		{
 			return (k & mod) == mod;
 		}
 
-
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
 			where V : new()
 		{
@@ -106,21 +130,34 @@ namespace OpenRA
 			return ret;
 		}
 
+		public static int IndexOf<T>(this T[] array, T value)
+		{
+			return Array.IndexOf(array, value);
+		}
+
 		public static T Random<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
-			var xs = ts as ICollection<T>;
-			if (xs != null)
-				return xs.ElementAt(r.Next(xs.Count));
-			var ys = ts.ToList();
-			return ys[r.Next(ys.Count)];
+			return Random(ts, r, true);
 		}
 
 		public static T RandomOrDefault<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
-			if (!ts.Any())
-				return default(T);
+			return Random(ts, r, false);
+		}
 
-			return ts.Random(r);
+		static T Random<T>(IEnumerable<T> ts, MersenneTwister r, bool throws)
+		{
+			var xs = ts as ICollection<T>;
+			xs = xs ?? ts.ToList();
+			if (xs.Count == 0)
+			{
+				if (throws)
+					throw new ArgumentException("Collection must not be empty.", "ts");
+				else
+					return default(T);
+			}
+			else
+				return xs.ElementAt(r.Next(xs.Count));
 		}
 
 		public static float Product(this IEnumerable<float> xs)
@@ -183,6 +220,7 @@ namespace OpenRA
 						u = nextU;
 					}
 				}
+
 				return t;
 			}
 		}
@@ -241,7 +279,6 @@ namespace OpenRA
 			// Adjust for other rounding modes
 			if (round == ISqrtRoundMode.Nearest && remainder > root)
 				root += 1;
-
 			else if (round == ISqrtRoundMode.Ceiling && root * root < number)
 				root += 1;
 
@@ -283,7 +320,6 @@ namespace OpenRA
 			// Adjust for other rounding modes
 			if (round == ISqrtRoundMode.Nearest && remainder > root)
 				root += 1;
-
 			else if (round == ISqrtRoundMode.Ceiling && root * root < number)
 				root += 1;
 
@@ -300,12 +336,21 @@ namespace OpenRA
 			return ts.Concat(moreTs);
 		}
 
-		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
+		public static HashSet<T> ToHashSet<T>(this IEnumerable<T> source)
+		{
+			return new HashSet<T>(source);
+		}
+
+		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(
+			this IEnumerable<TSource> source, Func<TSource, TKey> keySelector,
+			string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
 		{
 			return ToDictionaryWithConflictLog(source, keySelector, x => x, debugName, logKey, logValue);
 		}
 
-		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector, string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
+		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(
+			this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector,
+			string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
 		{
 			// Fall back on ToString() if null functions are provided:
 			logKey = logKey ?? (s => s.ToString());
@@ -342,7 +387,7 @@ namespace OpenRA
 			// If any duplicates were found, throw a descriptive error
 			if (dupKeys.Count > 0)
 			{
-				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value.ToArray()))).ToArray());
+				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value))));
 				var msg = "{0}, duplicate values found for the following keys: {1}".F(debugName, badKeysFormatted);
 				throw new ArgumentException(msg);
 			}
@@ -373,14 +418,42 @@ namespace OpenRA
 		{
 			var result = new T[width, height];
 			for (var i = 0; i < width; i++)
+			{
 				for (var j = 0; j < height; j++)
-					result[i, j] = i <= ts.GetUpperBound(0) && j <= ts.GetUpperBound(1)
-						? ts[i, j] : t;
+				{
+					// Workaround for broken ternary operators in certain versions of mono
+					// (3.10 and certain versions of the 3.8 series): https://bugzilla.xamarin.com/show_bug.cgi?id=23319
+					if (i <= ts.GetUpperBound(0) && j <= ts.GetUpperBound(1))
+						result[i, j] = ts[i, j];
+					else
+						result[i, j] = t;
+				}
+			}
+
 			return result;
 		}
 
 		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
 
+		public static Bitmap CloneWith32bbpArgbPixelFormat(this Bitmap original)
+		{
+			// Note: We would use original.Clone(original.Bounds(), PixelFormat.Format32bppArgb)
+			// but this doesn't work on mono.
+			var clone = new Bitmap(original.Width, original.Height, PixelFormat.Format32bppArgb);
+			try
+			{
+				using (var g = System.Drawing.Graphics.FromImage(clone))
+					g.DrawImage(original, original.Bounds());
+			}
+			catch (Exception)
+			{
+				clone.Dispose();
+				throw;
+			}
+
+			return clone;
+		}
+
 		public static int ToBits(this IEnumerable<bool> bits)
 		{
 			var i = 0;
@@ -404,6 +477,16 @@ namespace OpenRA
 		{
 			return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
 		}
+
+		public static bool IsTraitEnabled(this object trait)
+		{
+			return trait as IDisabledTrait == null || !(trait as IDisabledTrait).IsTraitDisabled;
+		}
+
+		public static bool IsTraitEnabled<T>(T t)
+		{
+			return IsTraitEnabled(t as object);
+		}
 	}
 
 	public static class Enum<T>

OpenRA.Game/FieldLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -23,6 +24,26 @@ namespace OpenRA
 {
 	public static class FieldLoader
 	{
+		public class MissingFieldsException : YamlException
+		{
+			public readonly string[] Missing;
+			public readonly string Header;
+			public override string Message
+			{
+				get
+				{
+					return (string.IsNullOrEmpty(Header) ? "" : Header + ": ") + Missing[0]
+						+ string.Concat(Missing.Skip(1).Select(m => ", " + m));
+				}
+			}
+
+			public MissingFieldsException(string[] missing, string header = null, string headerSingle = null) : base(null)
+			{
+				Header = missing.Length > 1 ? header : headerSingle ?? header;
+				Missing = missing;
+			}
+		}
+
 		public static Func<string, Type, string, object> InvalidValueAction = (s, t, f) =>
 		{
 			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s, f, t));
@@ -33,9 +54,18 @@ namespace OpenRA
 			throw new NotImplementedException("FieldLoader: Missing field `{0}` on `{1}`".F(s, f.Name));
 		};
 
+		static readonly ConcurrentCache<Type, FieldLoadInfo[]> TypeLoadInfo =
+			new ConcurrentCache<Type, FieldLoadInfo[]>(BuildTypeLoadInfo);
+		static readonly ConcurrentCache<MemberInfo, bool> MemberHasTranslateAttribute =
+			new ConcurrentCache<MemberInfo, bool>(member => member.HasAttribute<TranslateAttribute>());
+
+		static readonly object TranslationsLock = new object();
+		static Dictionary<string, string> translations;
+
 		public static void Load(object self, MiniYaml my)
 		{
-			var loadInfo = typeLoadInfo[self.GetType()];
+			var loadInfo = TypeLoadInfo[self.GetType()];
+			var missing = new List<string>();
 
 			Dictionary<string, MiniYaml> md = null;
 
@@ -43,19 +73,33 @@ namespace OpenRA
 			{
 				object val;
 
+				if (md == null)
+					md = my.ToDictionary();
 				if (fli.Loader != null)
-					val = fli.Loader(my);
+				{
+					if (!fli.Attribute.Required || md.ContainsKey(fli.YamlName))
+						val = fli.Loader(my);
+					else
+					{
+						missing.Add(fli.YamlName);
+						continue;
+					}
+				}
 				else
 				{
-					if (md == null)
-						md = my.ToDictionary();
-
 					if (!TryGetValueFromYaml(fli.YamlName, fli.Field, md, out val))
+					{
+						if (fli.Attribute.Required)
+							missing.Add(fli.YamlName);
 						continue;
+					}
 				}
 
 				fli.Field.SetValue(self, val);
 			}
+
+			if (missing.Any())
+				throw new MissingFieldsException(missing.ToArray());
 		}
 
 		static bool TryGetValueFromYaml(string yamlName, FieldInfo field, Dictionary<string, MiniYaml> md, out object ret)
@@ -82,14 +126,13 @@ namespace OpenRA
 			return t;
 		}
 
-		static readonly object[] NoIndexes = { };
 		public static void LoadField(object target, string key, string value)
 		{
-			const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+			const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 
 			key = key.Trim();
 
-			var field = target.GetType().GetField(key, flags);
+			var field = target.GetType().GetField(key, Flags);
 			if (field != null)
 			{
 				var sa = field.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
@@ -98,12 +141,12 @@ namespace OpenRA
 				return;
 			}
 
-			var prop = target.GetType().GetProperty(key, flags);
+			var prop = target.GetType().GetProperty(key, Flags);
 			if (prop != null)
 			{
 				var sa = prop.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
 				if (!sa.FromYamlKey)
-					prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
+					prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), null);
 				return;
 			}
 
@@ -131,7 +174,6 @@ namespace OpenRA
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(ushort))
 			{
 				ushort res;
@@ -147,61 +189,87 @@ namespace OpenRA
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(float))
 			{
 				float res;
-				if (float.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+				if (value != null && float.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
 					return res * (value.Contains('%') ? 0.01f : 1f);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(decimal))
 			{
 				decimal res;
-				if (decimal.TryParse(value.Replace("%", ""),  NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+				if (value != null && decimal.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
 					return res * (value.Contains('%') ? 0.01m : 1m);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(string))
 			{
-				if (field != null && field.HasAttribute<TranslateAttribute>())
+				if (field != null && MemberHasTranslateAttribute[field] && value != null)
 					return Regex.Replace(value, "@[^@]+@", m => Translate(m.Value.Substring(1, m.Value.Length - 2)), RegexOptions.Compiled);
 				return value;
 			}
-
 			else if (fieldType == typeof(Color))
 			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
-					return Color.FromArgb(
-						Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
-				if (parts.Length == 4)
-					return Color.FromArgb(
-						Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[3]).Clamp(0, 255));
+				if (value != null)
+				{
+					var parts = value.Split(',');
+					if (parts.Length == 3)
+						return Color.FromArgb(
+							Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
+					if (parts.Length == 4)
+						return Color.FromArgb(
+							Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[3]).Clamp(0, 255));
+				}
+
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(Color[]))
+			{
+				if (value != null)
+				{
+					var parts = value.Split(',');
 
+					if (parts.Length % 4 != 0)
+						return InvalidValueAction(value, fieldType, fieldName);
+
+					var colors = new Color[parts.Length / 4];
+
+					for (var i = 0; i < colors.Length; i++)
+					{
+						colors[i] = Color.FromArgb(
+							Exts.ParseIntegerInvariant(parts[4 * i]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[4 * i + 1]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[4 * i + 2]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[4 * i + 3]).Clamp(0, 255));
+					}
+
+					return colors;
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(HSLColor))
 			{
-				var parts = value.Split(',');
+				if (value != null)
+				{
+					var parts = value.Split(',');
 
-				// Allow old ColorRamp format to be parsed as HSLColor
-				if (parts.Length == 3 || parts.Length == 4)
-					return new HSLColor(
-						(byte)Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-						(byte)Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-						(byte)Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
+					// Allow old ColorRamp format to be parsed as HSLColor
+					if (parts.Length == 3 || parts.Length == 4)
+						return new HSLColor(
+							(byte)Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
+							(byte)Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
+							(byte)Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
+				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(Hotkey))
 			{
 				Hotkey res;
@@ -210,63 +278,67 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
-			else if (fieldType == typeof(WRange))
+			else if (fieldType == typeof(WDist))
 			{
-				WRange res;
-				if (WRange.TryParse(value, out res))
+				WDist res;
+				if (WDist.TryParse(value, out res))
 					return res;
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(WVec))
 			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
+				if (value != null)
 				{
-					WRange rx, ry, rz;
-					if (WRange.TryParse(parts[0], out rx) && WRange.TryParse(parts[1], out ry) && WRange.TryParse(parts[2], out rz))
-						return new WVec(rx, ry, rz);
+					var parts = value.Split(',');
+					if (parts.Length == 3)
+					{
+						WDist rx, ry, rz;
+						if (WDist.TryParse(parts[0], out rx) && WDist.TryParse(parts[1], out ry) && WDist.TryParse(parts[2], out rz))
+							return new WVec(rx, ry, rz);
+					}
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(WVec[]))
 			{
-				var parts = value.Split(',');
-
-				if (parts.Length % 3 != 0)
-					return InvalidValueAction(value, fieldType, fieldName);
-
-				var vecs = new WVec[parts.Length / 3];
-
-				for (var i = 0; i < vecs.Length; ++i)
+				if (value != null)
 				{
-					WRange rx, ry, rz;
-					if (WRange.TryParse(parts[3 * i], out rx)
-							&& WRange.TryParse(parts[3 * i + 1], out ry)
-							&& WRange.TryParse(parts[3 * i + 2], out rz))
-						vecs[i] = new WVec(rx, ry, rz);
-				}
+					var parts = value.Split(',');
 
-				return vecs;
-			}
+					if (parts.Length % 3 != 0)
+						return InvalidValueAction(value, fieldType, fieldName);
 
-			else if (fieldType == typeof(WPos))
-			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
-				{
-					WRange rx, ry, rz;
-					if (WRange.TryParse(parts[0], out rx) && WRange.TryParse(parts[1], out ry) && WRange.TryParse(parts[2], out rz))
-						return new WPos(rx, ry, rz);
+					var vecs = new WVec[parts.Length / 3];
+
+					for (var i = 0; i < vecs.Length; ++i)
+					{
+						WDist rx, ry, rz;
+						if (WDist.TryParse(parts[3 * i], out rx) && WDist.TryParse(parts[3 * i + 1], out ry) && WDist.TryParse(parts[3 * i + 2], out rz))
+							vecs[i] = new WVec(rx, ry, rz);
+					}
+
+					return vecs;
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(WPos))
+			{
+				if (value != null)
+				{
+					var parts = value.Split(',');
+					if (parts.Length == 3)
+					{
+						WDist rx, ry, rz;
+						if (WDist.TryParse(parts[0], out rx) && WDist.TryParse(parts[1], out ry) && WDist.TryParse(parts[2], out rz))
+							return new WPos(rx, ry, rz);
+					}
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(WAngle))
 			{
 				int res;
@@ -274,38 +346,41 @@ namespace OpenRA
 					return new WAngle(res);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(WRot))
 			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
+				if (value != null)
 				{
-					int rr, rp, ry;
-					if (Exts.TryParseIntegerInvariant(value, out rr)
-						&& Exts.TryParseIntegerInvariant(value, out rp)
-						&& Exts.TryParseIntegerInvariant(value, out ry))
+					var parts = value.Split(',');
+					if (parts.Length == 3)
+					{
+						int rr, rp, ry;
+						if (Exts.TryParseIntegerInvariant(value, out rr) && Exts.TryParseIntegerInvariant(value, out rp) && Exts.TryParseIntegerInvariant(value, out ry))
 							return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
+					}
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else if (fieldType == typeof(CPos))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new CPos(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]));
-			}
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new CPos(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(CVec))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new CVec(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]));
-			}
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new CVec(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType.IsEnum)
 			{
 				try
@@ -317,10 +392,31 @@ namespace OpenRA
 					return InvalidValueAction(value, fieldType, fieldName);
 				}
 			}
+			else if (fieldType == typeof(ImageFormat))
+			{
+				if (value != null)
+				{
+					switch (value.ToLowerInvariant())
+					{
+					case "bmp":
+						return ImageFormat.Bmp;
+					case "gif":
+						return ImageFormat.Gif;
+					case "jpg":
+					case "jpeg":
+						return ImageFormat.Jpeg;
+					case "tif":
+					case "tiff":
+						return ImageFormat.Tiff;
+					default:
+						return ImageFormat.Png;
+					}
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(bool))
 				return ParseYesNo(value, fieldType, fieldName);
-
 			else if (fieldType.IsArray)
 			{
 				if (value == null)
@@ -333,61 +429,75 @@ namespace OpenRA
 					ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
 				return ret;
 			}
-
 			else if (fieldType == typeof(Size))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new Size(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]));
-			}
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new Size(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(int2))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new int2(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]));
-			}
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new int2(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(float2))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				float xx = 0;
-				float yy = 0;
-				float res;
-				if (float.TryParse(parts[0].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
-					xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
-				if (float.TryParse(parts[1].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
-					yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
-				return new float2(xx, yy);
-			}
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					float xx = 0;
+					float yy = 0;
+					float res;
+					if (float.TryParse(parts[0].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+						xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
+					if (float.TryParse(parts[1].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+						yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
+					return new float2(xx, yy);
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(Rectangle))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new Rectangle(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]),
-					Exts.ParseIntegerInvariant(parts[2]),
-					Exts.ParseIntegerInvariant(parts[3]));
-			}
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new Rectangle(
+						Exts.ParseIntegerInvariant(parts[0]),
+						Exts.ParseIntegerInvariant(parts[1]),
+						Exts.ParseIntegerInvariant(parts[2]),
+						Exts.ParseIntegerInvariant(parts[3]));
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				var argTypes = new Type[] { typeof(string[]) };
-				var argValues = new object[] { parts };
-				return fieldType.GetConstructor(argTypes).Invoke(argValues);
-			}
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					var argTypes = new Type[] { typeof(string[]) };
+					var argValues = new object[] { parts };
+					return fieldType.GetConstructor(argTypes).Invoke(argValues);
+				}
 
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Nullable<>))
 			{
 				var innerType = fieldType.GetGenericArguments().First();
 				var innerValue = GetValue("Nullable<T>", innerType, value, field);
 				return fieldType.GetConstructor(new[] { innerType }).Invoke(new[] { innerValue });
 			}
-
 			else if (fieldType == typeof(DateTime))
 			{
 				DateTime dt;
@@ -395,7 +505,6 @@ namespace OpenRA
 					return dt;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-
 			else
 			{
 				var conv = TypeDescriptor.GetConverter(fieldType);
@@ -418,11 +527,15 @@ namespace OpenRA
 
 		static object ParseYesNo(string p, Type fieldType, string field)
 		{
+			if (string.IsNullOrEmpty(p))
+				return InvalidValueAction(p, fieldType, field);
+
 			p = p.ToLowerInvariant();
 			if (p == "yes") return true;
 			if (p == "true") return true;
 			if (p == "no") return false;
 			if (p == "false") return false;
+
 			return InvalidValueAction(p, fieldType, field);
 		}
 
@@ -444,12 +557,10 @@ namespace OpenRA
 
 		public static IEnumerable<FieldLoadInfo> GetTypeLoadInfo(Type type, bool includePrivateByDefault = false)
 		{
-			return typeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
+			return TypeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
 		}
 
-		static Cache<Type, List<FieldLoadInfo>> typeLoadInfo = new Cache<Type, List<FieldLoadInfo>>(BuildTypeLoadInfo);
-
-		static List<FieldLoadInfo> BuildTypeLoadInfo(Type type)
+		static FieldLoadInfo[] BuildTypeLoadInfo(Type type)
 		{
 			var ret = new List<FieldLoadInfo>();
 
@@ -471,7 +582,7 @@ namespace OpenRA
 				ret.Add(fli);
 			}
 
-			return ret;
+			return ret.ToArray();
 		}
 
 		[AttributeUsage(AttributeTargets.Field)]
@@ -481,12 +592,20 @@ namespace OpenRA
 				: base(false) { }
 		}
 
+		[AttributeUsage(AttributeTargets.Field)]
+		public sealed class RequireAttribute : SerializeAttribute
+		{
+			public RequireAttribute()
+				: base(true, true) { }
+		}
+
 		[AttributeUsage(AttributeTargets.Field)]
 		public sealed class LoadUsingAttribute : SerializeAttribute
 		{
-			public LoadUsingAttribute(string loader)
+			public LoadUsingAttribute(string loader, bool required = false)
 			{
 				Loader = loader;
+				Required = required;
 			}
 		}
 
@@ -501,19 +620,21 @@ namespace OpenRA
 			public string YamlName;
 			public string Loader;
 			public bool FromYamlKey;
+			public bool Required;
 
-			public SerializeAttribute(bool serialize = true)
+			public SerializeAttribute(bool serialize = true, bool required = false)
 			{
 				Serialize = serialize;
+				Required = required;
 			}
 
 			internal Func<MiniYaml, object> GetLoader(Type type)
 			{
-				const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.FlattenHierarchy;
+				const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.FlattenHierarchy;
 
 				if (!string.IsNullOrEmpty(Loader))
 				{
-					var method = type.GetMethod(Loader, flags);
+					var method = type.GetMethod(Loader, Flags);
 					if (method == null)
 						throw new InvalidOperationException("{0} does not specify a loader function '{1}'".F(type.Name, Loader));
 
@@ -526,17 +647,27 @@ namespace OpenRA
 
 		public static string Translate(string key)
 		{
-			if (Translations == null || string.IsNullOrEmpty(key))
+			if (string.IsNullOrEmpty(key))
 				return key;
 
-			string value;
-			if (!Translations.TryGetValue(key, out value))
-				return key;
+			lock (TranslationsLock)
+			{
+				if (translations == null)
+					return key;
 
-			return value;
+				string value;
+				if (!translations.TryGetValue(key, out value))
+					return key;
+
+				return value;
+			}
 		}
 
-		public static Dictionary<string, string> Translations = new Dictionary<string, string>();
+		public static void SetTranslations(IDictionary<string, string> translations)
+		{
+			lock (TranslationsLock)
+				FieldLoader.translations = new Dictionary<string, string>(translations);
+		}
 	}
 
 	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
@@ -552,6 +683,7 @@ namespace OpenRA
 	}
 
 	// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
+	[AttributeUsage(AttributeTargets.All)]
 	public sealed class DescAttribute : Attribute
 	{
 		public readonly string[] Lines;

OpenRA.Game/FieldSaver.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -46,8 +47,7 @@ namespace OpenRA
 
 			return new MiniYaml(
 				null,
-				fields.Select(info => new MiniYamlNode(info.YamlName, FormatValue(o, info.Field))).ToList()
-			);
+				fields.Select(info => new MiniYamlNode(info.YamlName, FormatValue(o, info.Field))).ToList());
 		}
 
 		public static MiniYamlNode SaveField(object o, string field)
@@ -78,6 +78,11 @@ namespace OpenRA
 			if (t == typeof(double))
 				return ((double)v).ToString(CultureInfo.InvariantCulture);
 
+			if (t == typeof(ImageFormat))
+			{
+				return ((ImageFormat)v).ToString();
+			}
+
 			if (t == typeof(Rectangle))
 			{
 				var r = (Rectangle)v;

OpenRA.Game/FileFormats/AudLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -45,8 +45,8 @@ namespace OpenRA.FileFormats
 	public static class AudLoader
 	{
 		static int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
-		static int[] stepTable = 
-		{	
+		static int[] stepTable =
+		{
 			7, 8, 9, 10, 11, 12, 13, 14, 16,
 			17, 19, 21, 23, 25, 28, 31, 34, 37,
 			41, 45, 50, 55, 60, 66, 73, 80, 88,
@@ -56,7 +56,7 @@ namespace OpenRA.FileFormats
 			1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749,
 			3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484,
 			7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289,
-			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 
+			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
 		};
 
 		static short DecodeSample(byte b, ref int index, ref int current)

OpenRA.Game/FileFormats/Blast.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -66,7 +66,7 @@ namespace OpenRA.FileFormats
 
 			if (coded < 0 || coded > 1)
 				throw new NotImplementedException("Invalid datastream");
-			var EncodedLiterals = coded == 1;
+			var encodedLiterals = coded == 1;
 
 			// log2(dictionary size) - 6
 			var dict = br.ReadBits(8);
@@ -142,10 +142,10 @@ namespace OpenRA.FileFormats
 						}
 					} while (len != 0);
 				}
-				// literal value
 				else
 				{
-					var symbol = EncodedLiterals ? Decode(litcode, br) : br.ReadBits(8);
+					// literal value
+					var symbol = encodedLiterals ? Decode(litcode, br) : br.ReadBits(8);
 					outBuffer[next++] = (byte)symbol;
 					if (next == MAXWIN)
 					{
@@ -241,9 +241,8 @@ namespace OpenRA.FileFormats
 				var num = (code >> 4) + 1; // Number of codes (top four bits plus 1)
 				var len = (byte)(code & 15); // Code length (low four bits)
 				do
-				{
 					length[s++] = len;
-				} while (--num > 0);
+				while (--num > 0);
 			}
 
 			n = s;

OpenRA.Game/FileFormats/Blowfish.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -21,31 +21,31 @@ namespace OpenRA.FileFormats
 				uint c = key[j++ % key.Length];
 				uint d = key[j++ % key.Length];
 
-				m_p[i] ^= a << 24 | b << 16 | c << 8 | d;
+				lookupMfromP[i] ^= a << 24 | b << 16 | c << 8 | d;
 			}
 
 			uint l = 0, r = 0;
 
-			for (var i = 0; i < 18; )
+			for (var i = 0; i < 18;)
 			{
 				Encrypt(ref l, ref r);
-				m_p[i++] = l;
-				m_p[i++] = r;
+				lookupMfromP[i++] = l;
+				lookupMfromP[i++] = r;
 			}
 
 			for (var i = 0; i < 4; ++i)
-				for (var j = 0; j < 256; )
+				for (var j = 0; j < 256;)
 				{
 					Encrypt(ref l, ref r);
-					m_s[i, j++] = l;
-					m_s[i, j++] = r;
+					lookupMfromS[i, j++] = l;
+					lookupMfromS[i, j++] = r;
 				}
 		}
 
 		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
 		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
 
-		delegate void CipherFunc( ref uint a, ref uint b );
+		delegate void CipherFunc(ref uint a, ref uint b);
 
 		static uint[] RunCipher(uint[] data, CipherFunc f)
 		{
@@ -56,7 +56,7 @@ namespace OpenRA.FileFormats
 			while (size-- > 0)
 			{
 				var a = SwapBytes(data[i]);
-				var b = SwapBytes(data[i+1]);
+				var b = SwapBytes(data[i + 1]);
 
 				f(ref a, ref b);
 
@@ -69,55 +69,57 @@ namespace OpenRA.FileFormats
 
 		void Encrypt(ref uint a, ref uint b)
 		{
-			uint _a = a, _b = b;
-			_a ^= m_p[0];
+			uint tempA = a, tempB = b;
+			tempA ^= lookupMfromP[0];
 
 			var x = false;
-			for( var i = 1; i <= 16; i++, x ^= true)
+			for (var i = 1; i <= 16; i++, x ^= true)
 			{
 				if (x)
-					Round(ref _a, _b, i);
+					Round(ref tempA, tempB, i);
 				else
-					Round(ref _b, _a, i);
+					Round(ref tempB, tempA, i);
 			}
-			_b ^= m_p[17];
 
-			a = _b;
-			b = _a;
+			tempB ^= lookupMfromP[17];
+
+			a = tempB;
+			b = tempA;
 		}
 
 		void Decrypt(ref uint a, ref uint b)
 		{
-			uint _a = a, _b = b;
-			_a ^= m_p[17];
+			uint tempA = a, tempB = b;
+			tempA ^= lookupMfromP[17];
 
 			var x = false;
 			for (var i = 16; i >= 1; i--, x ^= true)
 			{
 				if (x)
-					Round(ref _a, _b, i);
+					Round(ref tempA, tempB, i);
 				else
-					Round(ref _b, _a, i);
+					Round(ref tempB, tempA, i);
 			}
-			_b ^= m_p[0];
 
-			a = _b;
-			b = _a;
+			tempB ^= lookupMfromP[0];
+
+			a = tempB;
+			b = tempA;
 		}
 
 		uint S(uint x, int i)
 		{
-			return m_s[i, (x >> ((3 - i) << 3)) & 0xff];
+			return lookupMfromS[i, (x >> ((3 - i) << 3)) & 0xff];
 		}
 
-		uint bf_f(uint x)
+		uint ConvertBFtoF(uint x)
 		{
 			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
 		}
 
 		void Round(ref uint a, uint b, int n)
 		{
-			a ^= bf_f(b) ^ m_p[n];
+			a ^= ConvertBFtoF(b) ^ lookupMfromP[n];
 		}
 
 		static uint SwapBytes(uint i)
@@ -127,7 +129,7 @@ namespace OpenRA.FileFormats
 			return i;
 		}
 
-		uint[] m_p = new uint[] {
+		uint[] lookupMfromP = new uint[] {
 			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
 			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
 			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
@@ -135,7 +137,7 @@ namespace OpenRA.FileFormats
 			0x9216d5d9, 0x8979fb1b
 		};
 
-		uint[,] m_s = new uint[,] {
+		uint[,] lookupMfromS = new uint[,] {
 			{
 				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
 				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
@@ -400,7 +402,6 @@ namespace OpenRA.FileFormats
 				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
 				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
 			}
-
 		};
 	}
 }

OpenRA.Game/FileFormats/BlowfishKeyProvider.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -13,35 +13,36 @@ using System.Linq;
 
 namespace OpenRA.FileFormats
 {
-	/* possibly the fugliest C# i've ever seen. */
+	/* TODO: Convert this direct C port into readable code. */
 
 	class BlowfishKeyProvider
 	{
-		const string pubkeyStr = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
+		const string PublicKeyString = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
 
 		class PublicKey
 		{
-			public uint[] key1 = new uint[64];
-			public uint[] key2 = new uint[64];
-			public uint len;
+			public uint[] KeyOne = new uint[64];
+			public uint[] KeyTwo = new uint[64];
+			public uint Len;
 		}
+
 		PublicKey pubkey = new PublicKey();
 
-		uint[] glob1 = new uint[64];
-		uint glob1_bitlen, glob1_len_x2;
-		uint[] glob2 = new uint[130];
-		uint[] glob1_hi = new uint[4];
-		uint[] glob1_hi_inv = new uint[4];
-		uint glob1_hi_bitlen;
-		uint glob1_hi_inv_lo, glob1_hi_inv_hi;
+		uint[] globOne = new uint[64];
+		uint globOneBitLen, globOneLenXTwo;
+		uint[] globTwo = new uint[130];
+		uint[] globOneHigh = new uint[4];
+		uint[] globOneHighInv = new uint[4];
+		uint globOneHighBitLen;
+		uint globOneHighInvLow, globOneHighInvHigh;
 
-		static void init_bignum(uint[] n, uint val, uint len)
+		static void InitBigNum(uint[] n, uint val, uint len)
 		{
 			for (var i = 0; i < len; i++) n[i] = 0;
 			n[0] = val;
 		}
 
-		static void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
+		static void MoveKeyToBig(uint[] n, byte[] key, uint klen, uint blen)
 		{
 			byte sign;
 
@@ -50,9 +51,9 @@ namespace OpenRA.FileFormats
 
 			unsafe
 			{
-				fixed (uint* _pn = &n[0])
+				fixed (uint* tempPn = &n[0])
 				{
-					var pn = (byte*)_pn;
+					var pn = (byte*)tempPn;
 					var i = blen * 4;
 					for (; i > klen; i--) pn[i - 1] = (byte)sign;
 					for (; i > 0; i--) pn[i - 1] = key[klen - i];
@@ -60,7 +61,7 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		static void key_to_bignum(uint[] n, byte[] key, uint len)
+		static void KeyToBigNum(uint[] n, byte[] key, uint len)
 		{
 			uint keylen;
 			int i;
@@ -81,11 +82,12 @@ namespace OpenRA.FileFormats
 				keylen = key[j];
 				j++;
 			}
+
 			if (keylen <= len * 4)
-				move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
+				MoveKeyToBig(n, key.Skip(j).ToArray(), keylen, len);
 		}
 
-		static uint len_bignum(uint[] n, uint len)
+		static uint LenBigNum(uint[] n, uint len)
 		{
 			uint i;
 			i = len - 1;
@@ -93,10 +95,10 @@ namespace OpenRA.FileFormats
 			return i + 1;
 		}
 
-		static uint bitlen_bignum(uint[] n, uint len)
+		static uint BitLenBigNum(uint[] n, uint len)
 		{
 			uint ddlen, bitlen, mask;
-			ddlen = len_bignum(n, len);
+			ddlen = LenBigNum(n, len);
 			if (ddlen == 0) return 0;
 			bitlen = ddlen * 32;
 			mask = 0x80000000;
@@ -105,41 +107,42 @@ namespace OpenRA.FileFormats
 				mask >>= 1;
 				bitlen--;
 			}
+
 			return bitlen;
 		}
 
-		void init_pubkey()
+		void InitPublicKey()
 		{
-			init_bignum(pubkey.key2, 0x10001, 64);
+			InitBigNum(pubkey.KeyTwo, 0x10001, 64);
 
-			key_to_bignum(pubkey.key1, Convert.FromBase64String(pubkeyStr), 64);
-			pubkey.len = bitlen_bignum(pubkey.key1, 64) - 1;
+			KeyToBigNum(pubkey.KeyOne, Convert.FromBase64String(PublicKeyString), 64);
+			pubkey.Len = BitLenBigNum(pubkey.KeyOne, 64) - 1;
 		}
 
-		uint len_predata()
+		uint LenPreData()
 		{
-			var a = (pubkey.len - 1) / 8;
+			var a = (pubkey.Len - 1) / 8;
 			return (55 / a + 1) * (a + 1);
 		}
 
-		static int cmp_bignum(uint[] n1, uint[] n2, uint len)
+		static int CompareBigNum(uint[] n1, uint[] n2, uint len)
 		{
-
 			while (len > 0)
 			{
 				--len;
 				if (n1[len] < n2[len]) return -1;
 				if (n1[len] > n2[len]) return 1;
 			}
+
 			return 0;
 		}
 
-		static void mov_bignum(uint[] dest, uint[] src, uint len)
+		static void MoveBigNum(uint[] dest, uint[] src, uint len)
 		{
 			Array.Copy(src, dest, len);
 		}
 
-		static void shr_bignum(uint[] n, int bits, int len)
+		static void ShrBigNum(uint[] n, int bits, int len)
 		{
 			int i; var i2 = bits / 32;
 
@@ -149,13 +152,13 @@ namespace OpenRA.FileFormats
 				for (; i < len; i++) n[i] = 0;
 				bits = bits % 32;
 			}
+
 			if (bits == 0) return;
-			for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 -
-		  bits));
+			for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 - bits));
 			n[i] = n[i] >> bits;
 		}
 
-		static void shl_bignum(uint[] n, int bits, int len)
+		static void ShlBigNum(uint[] n, int bits, int len)
 		{
 			int i, i2;
 
@@ -166,26 +169,26 @@ namespace OpenRA.FileFormats
 				for (; i > 0; i--) n[i] = 0;
 				bits = bits % 32;
 			}
+
 			if (bits == 0) return;
-			for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 -
-		  bits));
+			for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 - bits));
 			n[0] <<= bits;
 		}
 
-		static uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
+		static uint SubBigNum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
 		{
 			uint i1, i2;
 
 			len += len;
 			unsafe
 			{
-				fixed (uint* _ps1 = &src1[0])
-				fixed (uint* _ps2 = &src2[0])
-				fixed (uint* _pd = &dest[0])
+				fixed (uint* tempPs1 = &src1[0])
+				fixed (uint* tempPs2 = &src2[0])
+				fixed (uint* tempPd = &dest[0])
 				{
-					var ps1 = (ushort*)_ps1;
-					var ps2 = (ushort*)_ps2;
-					var pd = (ushort*)_pd;
+					var ps1 = (ushort*)tempPs1;
+					var ps2 = (ushort*)tempPs2;
+					var pd = (ushort*)tempPd;
 
 					while (--len != -1)
 					{
@@ -196,10 +199,11 @@ namespace OpenRA.FileFormats
 					}
 				}
 			}
+
 			return carry;
 		}
 
-		static unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
+		static unsafe uint SubBigNum(uint* dest, uint* src1, uint* src2, uint carry, int len)
 		{
 			uint i1, i2;
 
@@ -215,36 +219,37 @@ namespace OpenRA.FileFormats
 				i2 = *ps2++;
 				*pd++ = (ushort)(i1 - i2 - carry);
 				if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
-
 			}
+
 			return carry;
 		}
 
-		static void inv_bignum(uint[] n1, uint[] n2, uint len)
+		static void InvertBigNum(uint[] n1, uint[] n2, uint len)
 		{
-			var n_tmp = new uint[64];
-			uint n2_bytelen, bit;
-			int n2_bitlen;
+			var nTmp = new uint[64];
+			uint nTwoByteLen, bit;
+			int nTwoBitLen;
 
 			var j = 0;
 
-			init_bignum(n_tmp, 0, len);
-			init_bignum(n1, 0, len);
-			n2_bitlen = (int)bitlen_bignum(n2, len);
-			bit = ((uint)1) << (n2_bitlen % 32);
-			j = ((n2_bitlen + 32) / 32) - 1;
-			n2_bytelen = (uint)((n2_bitlen - 1) / 32) * 4;
-			n_tmp[n2_bytelen / 4] |= ((uint)1) << ((n2_bitlen - 1) & 0x1f);
+			InitBigNum(nTmp, 0, len);
+			InitBigNum(n1, 0, len);
+			nTwoBitLen = (int)BitLenBigNum(n2, len);
+			bit = ((uint)1) << (nTwoBitLen % 32);
+			j = ((nTwoBitLen + 32) / 32) - 1;
+			nTwoByteLen = (uint)((nTwoBitLen - 1) / 32) * 4;
+			nTmp[nTwoByteLen / 4] |= ((uint)1) << ((nTwoBitLen - 1) & 0x1f);
 
-			while (n2_bitlen > 0)
+			while (nTwoBitLen > 0)
 			{
-				n2_bitlen--;
-				shl_bignum(n_tmp, 1, (int)len);
-				if (cmp_bignum(n_tmp, n2, len) != -1)
+				nTwoBitLen--;
+				ShlBigNum(nTmp, 1, (int)len);
+				if (CompareBigNum(nTmp, n2, len) != -1)
 				{
-					sub_bignum(n_tmp, n_tmp, n2, 0, (int)len);
+					SubBigNum(nTmp, nTmp, n2, 0, (int)len);
 					n1[j] |= bit;
 				}
+
 				bit >>= 1;
 				if (bit == 0)
 				{
@@ -252,44 +257,46 @@ namespace OpenRA.FileFormats
 					bit = 0x80000000;
 				}
 			}
-			init_bignum(n_tmp, 0, len);
+
+			InitBigNum(nTmp, 0, len);
 		}
 
-		static void inc_bignum(uint[] n, uint len)
+		static void IncrementBigNum(uint[] n, uint len)
 		{
 			var i = 0;
 			while ((++n[i] == 0) && (--len > 0)) i++;
 		}
 
-		void init_two_dw(uint[] n, uint len)
+		void InitTwoDw(uint[] n, uint len)
 		{
-			mov_bignum(glob1, n, len);
-			glob1_bitlen = bitlen_bignum(glob1, len);
-			glob1_len_x2 = (glob1_bitlen + 15) / 16;
-			mov_bignum(glob1_hi, glob1.Skip((int)len_bignum(glob1, len) - 2).ToArray(), 2);
-			glob1_hi_bitlen = bitlen_bignum(glob1_hi, 2) - 32;
-			shr_bignum(glob1_hi, (int)glob1_hi_bitlen, 2);
-			inv_bignum(glob1_hi_inv, glob1_hi, 2);
-			shr_bignum(glob1_hi_inv, 1, 2);
-			glob1_hi_bitlen = (glob1_hi_bitlen + 15) % 16 + 1;
-			inc_bignum(glob1_hi_inv, 2);
-			if (bitlen_bignum(glob1_hi_inv, 2) > 32)
+			MoveBigNum(globOne, n, len);
+			globOneBitLen = BitLenBigNum(globOne, len);
+			globOneLenXTwo = (globOneBitLen + 15) / 16;
+			MoveBigNum(globOneHigh, globOne.Skip((int)LenBigNum(globOne, len) - 2).ToArray(), 2);
+			globOneHighBitLen = BitLenBigNum(globOneHigh, 2) - 32;
+			ShrBigNum(globOneHigh, (int)globOneHighBitLen, 2);
+			InvertBigNum(globOneHighInv, globOneHigh, 2);
+			ShrBigNum(globOneHighInv, 1, 2);
+			globOneHighBitLen = (globOneHighBitLen + 15) % 16 + 1;
+			IncrementBigNum(globOneHighInv, 2);
+			if (BitLenBigNum(globOneHighInv, 2) > 32)
 			{
-				shr_bignum(glob1_hi_inv, 1, 2);
-				glob1_hi_bitlen--;
+				ShrBigNum(globOneHighInv, 1, 2);
+				globOneHighBitLen--;
 			}
-			glob1_hi_inv_lo = (ushort)glob1_hi_inv[0];
-			glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
+
+			globOneHighInvLow = (ushort)globOneHighInv[0];
+			globOneHighInvHigh = (ushort)(globOneHighInv[0] >> 16);
 		}
 
-		static unsafe void mul_bignum_word(ushort* pn1, uint[] n2, uint mul, uint len)
+		static unsafe void MulBignumWord(ushort* pn1, uint[] n2, uint mul, uint len)
 		{
 			uint i, tmp;
 			unsafe
 			{
-				fixed (uint* _pn2 = &n2[0])
+				fixed (uint* tempPn2 = &n2[0])
 				{
-					var pn2 = (ushort*)_pn2;
+					var pn2 = (ushort*)tempPn2;
 
 					tmp = 0;
 					for (i = 0; i < len; i++)
@@ -305,110 +312,113 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		static void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
+		static void MulBigNum(uint[] dest, uint[] src1, uint[] src2, uint len)
 		{
-		  uint i;
+			uint i;
 
-		  unsafe
-		  {
-			  fixed( uint * _psrc2 = &src2[0] )
-			  fixed(uint* _pdest = &dest[0])
-			  {
-				  var psrc2 = (ushort*)_psrc2;
-				  var pdest = (ushort*)_pdest;
+			unsafe
+			{
+				fixed (uint* tempSrc2 = &src2[0])
+				fixed (uint* tempPdest = &dest[0])
+				{
+					var psrc2 = (ushort*)tempSrc2;
+					var pdest = (ushort*)tempPdest;
 
-				  init_bignum(dest, 0, len * 2);
-				  for (i = 0; i < len * 2; i++)
-					  mul_bignum_word(pdest++, src1, *psrc2++, len * 2);
-			  }
-		  }
+					InitBigNum(dest, 0, len * 2);
+					for (i = 0; i < len * 2; i++)
+						MulBignumWord(pdest++, src1, *psrc2++, len * 2);
+				}
+			}
 		}
 
-		static void not_bignum(uint[] n, uint len)
+		static void NotBigNum(uint[] n, uint len)
 		{
-		  uint i;
-		  for (i = 0; i < len; i++) n[i] = ~n[i];
+			uint i;
+			for (i = 0; i < len; i++) n[i] = ~n[i];
 		}
 
-		static void neg_bignum(uint[] n, uint len)
+		static void NegBigNum(uint[] n, uint len)
 		{
-		  not_bignum(n, len);
-		  inc_bignum(n, len);
+			NotBigNum(n, len);
+			IncrementBigNum(n, len);
 		}
 
-		unsafe uint get_mulword(uint* n)
+		unsafe uint GetMulWord(uint* n)
 		{
 			var wn = (ushort*)n;
-			var i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
-				 + (((*(wn - 2) ^ 0xffff) * glob1_hi_inv_hi + glob1_hi_inv_hi) >> 1) + 1)
-				 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_hi) >> 1) +
-				 (((*wn ^ 0xffff) * glob1_hi_inv_lo) >> 1) + 1) >> 14) + glob1_hi_inv_hi
-				 * (*wn ^ 0xffff) * 2) >> (int)glob1_hi_bitlen);
+			var i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * globOneHighInvLow + 0x10000) >> 1)
+				 + (((*(wn - 2) ^ 0xffff) * globOneHighInvHigh + globOneHighInvHigh) >> 1) + 1)
+				 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * globOneHighInvHigh) >> 1) +
+				 (((*wn ^ 0xffff) * globOneHighInvLow) >> 1) + 1) >> 14) + globOneHighInvHigh
+				 * (*wn ^ 0xffff) * 2) >> (int)globOneHighBitLen);
 			if (i > 0xffff) i = 0xffff;
 			return i & 0xffff;
 		}
 
-		static void dec_bignum(uint[] n, uint len)
+		static void DecBigNum(uint[] n, uint len)
 		{
 			var i = 0;
 			while ((--n[i] == 0xffffffff) && (--len > 0))
 				i++;
 		}
 
-		void calc_a_bignum(uint[] n1, uint[] n2, uint[] n3, uint len)
+		void CalcBigNum(uint[] n1, uint[] n2, uint[] n3, uint len)
 		{
-			uint g2_len_x2, len_diff;
+			uint globTwoXtwo, lenDiff;
 			unsafe
 			{
-				fixed( uint* g1 = &glob1[0])
-				fixed (uint* g2 = &glob2[0])
+				fixed (uint* g1 = &globOne[0])
+				fixed (uint* g2 = &globTwo[0])
 				{
-					mul_bignum(glob2, n2, n3, len);
-					glob2[len * 2] = 0;
-					g2_len_x2 = len_bignum(glob2, len * 2 + 1) * 2;
-					if (g2_len_x2 >= glob1_len_x2)
+					MulBigNum(globTwo, n2, n3, len);
+					globTwo[len * 2] = 0;
+					globTwoXtwo = LenBigNum(globTwo, len * 2 + 1) * 2;
+					if (globTwoXtwo >= globOneLenXTwo)
 					{
-						inc_bignum(glob2, len * 2 + 1);
-						neg_bignum(glob2, len * 2 + 1);
-						len_diff = g2_len_x2 + 1 - glob1_len_x2;
-						var esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
-						var edi = ((ushort*)g2) + (g2_len_x2 + 1);
-						for (; len_diff != 0; len_diff--)
+						IncrementBigNum(globTwo, len * 2 + 1);
+						NegBigNum(globTwo, len * 2 + 1);
+						lenDiff = globTwoXtwo + 1 - globOneLenXTwo;
+						var esi = ((ushort*)g2) + (1 + globTwoXtwo - globOneLenXTwo);
+						var edi = ((ushort*)g2) + (globTwoXtwo + 1);
+						for (; lenDiff != 0; lenDiff--)
 						{
 							edi--;
-							var tmp = get_mulword((uint*)edi);
+							var tmp = GetMulWord((uint*)edi);
 							esi--;
 							if (tmp > 0)
 							{
-								mul_bignum_word(esi, glob1, tmp, 2 * len);
+								MulBignumWord(esi, globOne, tmp, 2 * len);
 								if ((*edi & 0x8000) == 0)
 								{
-									if (0 != sub_bignum((uint*)esi, (uint*)esi, g1, 0, (int)len)) (*edi)--;
+									if (0 != SubBigNum((uint*)esi, (uint*)esi, g1, 0, (int)len))
+										(*edi)--;
 								}
 							}
 						}
-						neg_bignum(glob2, len);
-						dec_bignum(glob2, len);
+
+						NegBigNum(globTwo, len);
+						DecBigNum(globTwo, len);
 					}
-					mov_bignum(n1, glob2, len);
+
+					MoveBigNum(n1, globTwo, len);
 				}
 			}
 		}
 
-		void clear_tmp_vars(uint len)
+		void ClearTempVars(uint len)
 		{
-			init_bignum(glob1, 0, len);
-			init_bignum(glob2, 0, len);
-			init_bignum(glob1_hi_inv, 0, 4);
-			init_bignum(glob1_hi, 0, 4);
-			glob1_bitlen = 0;
-			glob1_hi_bitlen = 0;
-			glob1_len_x2 = 0;
-			glob1_hi_inv_lo = 0;
-			glob1_hi_inv_hi = 0;
+			InitBigNum(globOne, 0, len);
+			InitBigNum(globTwo, 0, len);
+			InitBigNum(globOneHighInv, 0, 4);
+			InitBigNum(globOneHigh, 0, 4);
+			globOneBitLen = 0;
+			globOneHighBitLen = 0;
+			globOneLenXTwo = 0;
+			globOneHighInvLow = 0;
+			globOneHighInvHigh = 0;
 		}
 
-		void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
+		void CalcKey(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
 		{
 			var n_tmp = new uint[64];
 			uint n3_len, n4_len;
@@ -417,19 +427,19 @@ namespace OpenRA.FileFormats
 
 			unsafe
 			{
-				fixed (uint* _pn3 = &n3[0])
+				fixed (uint* tempPn3 = &n3[0])
 				{
-					var pn3 = _pn3;
+					var pn3 = tempPn3;
 
-					init_bignum(n1, 1, len);
-					n4_len = len_bignum(n4, len);
-					init_two_dw(n4, n4_len);
-					n3_bitlen = (int)bitlen_bignum(n3, n4_len);
+					InitBigNum(n1, 1, len);
+					n4_len = LenBigNum(n4, len);
+					InitTwoDw(n4, n4_len);
+					n3_bitlen = (int)BitLenBigNum(n3, n4_len);
 					n3_len = (uint)((n3_bitlen + 31) / 32);
 					bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
 					pn3 += n3_len - 1;
 					n3_bitlen--;
-					mov_bignum(n1, n2, n4_len);
+					MoveBigNum(n1, n2, n4_len);
 					while (--n3_bitlen != -1)
 					{
 						if (bit_mask == 0)
@@ -437,39 +447,41 @@ namespace OpenRA.FileFormats
 							bit_mask = 0x80000000;
 							pn3--;
 						}
-						calc_a_bignum(n_tmp, n1, n1, n4_len);
+
+						CalcBigNum(n_tmp, n1, n1, n4_len);
 						if ((*pn3 & bit_mask) != 0)
-							calc_a_bignum(n1, n_tmp, n2, n4_len);
+							CalcBigNum(n1, n_tmp, n2, n4_len);
 						else
-							mov_bignum(n1, n_tmp, n4_len);
+							MoveBigNum(n1, n_tmp, n4_len);
 						bit_mask >>= 1;
 					}
-					init_bignum(n_tmp, 0, n4_len);
-					clear_tmp_vars(len);
+
+					InitBigNum(n_tmp, 0, n4_len);
+					ClearTempVars(len);
 				}
 			}
 		}
 
-		static unsafe void memcpy(byte* dest, byte* src, int len)
+		static unsafe void Memcopy(byte* dest, byte* src, int len)
 		{
 			while (len-- != 0) *dest++ = *src++;
 		}
 
-		unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
+		unsafe void ProcessPredata(byte* pre, uint pre_len, byte* buf)
 		{
 			var n2 = new uint[64];
 			var n3 = new uint[64];
 
-			var a = (pubkey.len - 1) / 8;
+			var a = (pubkey.Len - 1) / 8;
 			while (a + 1 <= pre_len)
 			{
-				init_bignum(n2, 0, 64);
-				fixed( uint * pn2 = &n2[0] )
-					memcpy((byte *)pn2, pre, (int)a + 1);
-				calc_a_key(n3, n2, pubkey.key2, pubkey.key1, 64);
+				InitBigNum(n2, 0, 64);
+				fixed (uint* pn2 = &n2[0])
+					Memcopy((byte*)pn2, pre, (int)a + 1);
+				CalcKey(n3, n2, pubkey.KeyTwo, pubkey.KeyOne, 64);
 
-				fixed( uint * pn3 = &n3[0] )
-					memcpy(buf, (byte *)pn3, (int)a);
+				fixed (uint* pn3 = &n3[0])
+					Memcopy(buf, (byte*)pn3, (int)a);
 
 				pre_len -= a + 1;
 				pre += a + 1;
@@ -479,15 +491,16 @@ namespace OpenRA.FileFormats
 
 		public byte[] DecryptKey(byte[] src)
 		{
-			init_pubkey();
+			InitPublicKey();
 			var dest = new byte[256];
 
 			unsafe
 			{
 				fixed (byte* pdest = &dest[0])
 				fixed (byte* psrc = &src[0])
-					process_predata(psrc, len_predata(), pdest);
+					ProcessPredata(psrc, LenPreData(), pdest);
 			}
+
 			return dest.Take(56).ToArray();
 		}
 	}

OpenRA.Game/FileFormats/CRC32.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -10,7 +10,6 @@
 
 namespace OpenRA.FileFormats
 {
-
 	/// <summary>
 	/// Static class that uses a lookup table to calculates CRC32
 	/// checksums of input strings.
@@ -104,6 +103,7 @@ namespace OpenRA.FileFormats
 			crc ^= polynomial;
 			return crc;
 		}
+
 		public static uint Calculate(byte[] data)
 		{
 			return Calculate(data, 0xFFFFFFFF);
@@ -125,6 +125,7 @@ namespace OpenRA.FileFormats
 			crc ^= polynomial;
 			return crc;
 		}
+
 		public static unsafe uint Calculate(byte* data, uint len)
 		{
 			return Calculate(data, len, 0xFFFFFFFF);

OpenRA.Game/FileFormats/Format2.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,

OpenRA.Game/FileFormats/Format40.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -50,7 +50,7 @@ namespace OpenRA.FileFormats
 						if ((count & 0x8000) == 0)
 						{
 							// case 2
-							destIndex += (count & 0x7FFF);
+							destIndex += count & 0x7FFF;
 						}
 						else if ((count & 0x4000) == 0)
 						{

OpenRA.Game/FileFormats/Format80.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -60,11 +60,10 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		public static int DecodeInto(byte[] src, byte[] dest, int srcOffset = 0)
+		public static int DecodeInto(byte[] src, byte[] dest, int srcOffset = 0, bool reverse = false)
 		{
 			var ctx = new FastByteReader(src, srcOffset);
 			var destIndex = 0;
-
 			while (true)
 			{
 				var i = ctx.ReadByte();
@@ -75,6 +74,9 @@ namespace OpenRA.FileFormats
 					var count = ((i & 0x70) >> 4) + 3;
 					var rpos = ((i & 0xf) << 8) + secondByte;
 
+					if (destIndex + count > dest.Length)
+						return destIndex;
+
 					ReplicatePrevious(dest, destIndex, destIndex - rpos, count);
 					destIndex += count;
 				}
@@ -104,7 +106,7 @@ namespace OpenRA.FileFormats
 					{
 						// case 5
 						var count = ctx.ReadWord();
-						var srcIndex = ctx.ReadWord();
+						var srcIndex = reverse ? destIndex - ctx.ReadWord() : ctx.ReadWord();
 						if (srcIndex >= destIndex)
 							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
 
@@ -115,7 +117,7 @@ namespace OpenRA.FileFormats
 					{
 						// case 3
 						var count = count3 + 3;
-						var srcIndex = ctx.ReadWord();
+						var srcIndex = reverse ? destIndex - ctx.ReadWord() : ctx.ReadWord();
 						if (srcIndex >= destIndex)
 							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
 
@@ -174,10 +176,13 @@ namespace OpenRA.FileFormats
 
 						// Command 4: Repeat byte n times
 						ms.WriteByte(0xFE);
+
 						// Low byte
 						ms.WriteByte((byte)(repeatCount & 0xFF));
+
 						// High byte
 						ms.WriteByte((byte)(repeatCount >> 8));
+
 						// Value to repeat
 						ms.WriteByte(src[offset]);
 
@@ -185,9 +190,7 @@ namespace OpenRA.FileFormats
 						blockStart = offset;
 					}
 					else
-					{
 						offset++;
-					}
 				}
 
 				// Write what we haven't written up to now

OpenRA.Game/FileFormats/HvaReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -22,28 +22,28 @@ namespace OpenRA.FileFormats
 		public HvaReader(Stream s)
 		{
 			// Index swaps for transposing a matrix
-			var ids = new byte[]{0,4,8,12,1,5,9,13,2,6,10,14};
+			var ids = new byte[] { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14 };
 
 			s.Seek(16, SeekOrigin.Begin);
 			FrameCount = s.ReadUInt32();
 			LimbCount = s.ReadUInt32();
 
 			// Skip limb names
-			s.Seek(16*LimbCount, SeekOrigin.Current);
-			Transforms = new float[16*FrameCount*LimbCount];
+			s.Seek(16 * LimbCount, SeekOrigin.Current);
+			Transforms = new float[16 * FrameCount * LimbCount];
 			for (var j = 0; j < FrameCount; j++)
 				for (var i = 0; i < LimbCount; i++)
-			{
-				// Convert to column-major matrices and add the final matrix row
-				var c = 16*(LimbCount*j + i);
-				Transforms[c + 3] = 0;
-				Transforms[c + 7] = 0;
-				Transforms[c + 11] = 0;
-				Transforms[c + 15] = 1;
+				{
+					// Convert to column-major matrices and add the final matrix row
+					var c = 16 * (LimbCount * j + i);
+					Transforms[c + 3] = 0;
+					Transforms[c + 7] = 0;
+					Transforms[c + 11] = 0;
+					Transforms[c + 15] = 1;
 
-				for (var k = 0; k < 12; k++)
-					Transforms[c + ids[k]] = s.ReadFloat();
-			}
+					for (var k = 0; k < 12; k++)
+						Transforms[c + ids[k]] = s.ReadFloat();
+				}
 		}
 
 		public static HvaReader Load(string filename)

OpenRA.Game/FileFormats/IdxReader.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using OpenRA.FileSystem;
+
+namespace OpenRA.FileFormats
+{
+	public class IdxReader
+	{
+		public readonly int SoundCount;
+		public List<IdxEntry> Entries;
+
+		public IdxReader(Stream s)
+		{
+			s.Seek(0, SeekOrigin.Begin);
+
+			var id = s.ReadASCII(4);
+
+			if (id != "GABA")
+				throw new InvalidDataException("Unable to load Idx file, did not find magic id, found {0} instead".F(id));
+
+			var two = s.ReadInt32();
+
+			if (two != 2)
+				throw new InvalidDataException("Unable to load Idx file, did not find magic number 2, found {0} instead".F(two));
+
+			SoundCount = s.ReadInt32();
+
+			Entries = new List<IdxEntry>();
+
+			for (var i = 0; i < SoundCount; i++)
+				Entries.Add(new IdxEntry(s));
+		}
+	}
+}

OpenRA.Game/FileFormats/ImaAdpcmLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -31,9 +31,9 @@ namespace OpenRA.FileFormats
 
 	public static class ImaAdpcmLoader
 	{
-		static readonly int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
-		static readonly int[] stepTable = 
-		{	
+		static readonly int[] IndexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
+		static readonly int[] StepTable =
+		{
 			7, 8, 9, 10, 11, 12, 13, 14, 16,
 			17, 19, 21, 23, 25, 28, 31, 34, 37,
 			41, 45, 50, 55, 60, 66, 73, 80, 88,
@@ -43,7 +43,7 @@ namespace OpenRA.FileFormats
 			1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749,
 			3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484,
 			7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289,
-			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 
+			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
 		};
 
 		static short DecodeImaAdpcmSample(byte b, ref int index, ref int current)
@@ -51,14 +51,14 @@ namespace OpenRA.FileFormats
 			var sb = (b & 8) != 0;
 			b &= 7;
 
-			var delta = (stepTable[index] * b) / 4 + stepTable[index] / 8;
+			var delta = (StepTable[index] * b) / 4 + StepTable[index] / 8;
 			if (sb) delta = -delta;
 
 			current += delta;
 			if (current > short.MaxValue) current = short.MaxValue;
 			if (current < short.MinValue) current = short.MinValue;
 
-			index += indexAdjust[b];
+			index += IndexAdjust[b];
 			if (index < 0) index = 0;
 			if (index > 88) index = 88;
 

OpenRA.Game/FileFormats/IniFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -22,7 +22,8 @@ namespace OpenRA.FileFormats
 
 		public IniFile(Stream s)
 		{
-			Load(s);
+			using (s)
+				Load(s);
 		}
 
 		public IniFile(params Stream[] streams)
@@ -44,9 +45,9 @@ namespace OpenRA.FileFormats
 
 				switch (line[0])
 				{
-				case ';': break;
-				case '[': currentSection = ProcessSection(line); break;
-				default: ProcessEntry(line, currentSection); break;
+					case ';': break;
+					case '[': currentSection = ProcessSection(line); break;
+					default: ProcessEntry(line, currentSection); break;
 				}
 			}
 		}

OpenRA.Game/FileFormats/PngLoader.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -41,7 +41,7 @@ namespace OpenRA.FileFormats
 				Color[] palette = null;
 				var data = new List<byte>();
 
-				for (; ; )
+				for (;;)
 				{
 					var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
 					var type = Encoding.UTF8.GetString(br.ReadBytes(4));
@@ -54,7 +54,6 @@ namespace OpenRA.FileFormats
 						{
 							case "IHDR":
 								{
-
 									var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
 									var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
 									var bitDepth = cr.ReadByte();
@@ -67,8 +66,8 @@ namespace OpenRA.FileFormats
 									if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
 
 									bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
-
 								}
+
 								break;
 
 							case "PLTE":
@@ -80,23 +79,32 @@ namespace OpenRA.FileFormats
 										palette[i] = Color.FromArgb(r, g, b);
 									}
 								}
+
 								break;
 
 							case "tRNS":
 								{
+									if (palette == null)
+										throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
 									for (var i = 0; i < length; i++)
 										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
 								}
+
 								break;
 
 							case "IDAT":
 								{
 									data.AddRange(content);
 								}
+
 								break;
 
 							case "IEND":
 								{
+									if (bitmap == null)
+										throw new InvalidDataException("Image header not found.");
+
 									var bits = bitmap.LockBits(bitmap.Bounds(),
 										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
@@ -128,6 +136,9 @@ namespace OpenRA.FileFormats
 
 									bitmap.UnlockBits(bits);
 
+									if (palette == null)
+										throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
 									using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
 									{
 										var cp = temp.Palette;
@@ -168,8 +179,8 @@ namespace OpenRA.FileFormats
 		}
 
 		[Flags]
-		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 };
-		enum PngFilter { None, Sub, Up, Average, Paeth };
+		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 }
+		enum PngFilter { None, Sub, Up, Average, Paeth }
 
 		static PixelFormat MakePixelFormat(byte bitDepth, PngColorType colorType)
 		{

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -71,7 +71,7 @@ namespace OpenRA.FileFormats
 
 		public void RenameFile(string newFilenameWithoutExtension)
 		{
-			var newPath = Path.Combine(Path.GetDirectoryName(FilePath), newFilenameWithoutExtension) + ".rep";
+			var newPath = Path.Combine(Path.GetDirectoryName(FilePath), newFilenameWithoutExtension) + ".orarep";
 			File.Move(FilePath, newPath);
 			FilePath = newPath;
 		}

OpenRA.Game/FileFormats/VqaReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
@@ -25,16 +25,28 @@ namespace OpenRA.FileFormats
 		ushort numColors;
 		ushort blockWidth;
 		ushort blockHeight;
-		byte cbParts;
+		byte chunkBufferParts;
 		int2 blocks;
-		UInt32[] offsets;
+		uint[] offsets;
 		uint[] palette;
+		uint videoFlags; // if 0x10 is set the video is a 16 bit hq video (ts and later)
+		int sampleRate;
+		int sampleBits;
+		int audioChannels;
 
 		// Stores a list of subpixels, referenced by the VPTZ chunk
 		byte[] cbf;
 		byte[] cbp;
-		int cbChunk = 0;
-		int cbOffset = 0;
+		byte[] cbfBuffer;
+
+		// Buffer for loading file subchunks, the maximum chunk size of a file is not defined
+		// and the header definition for the size of the biggest chunks (color data) isn't accurate.
+		// But 256k is large enough for all TS videos(< 200k).
+		byte[] fileBuffer = new byte[256000];
+		int maxCbfzSize = 256000;
+		int vtprSize = 0;
+		int currentChunkBuffer = 0;
+		int chunkBufferOffset = 0;
 
 		// Top half contains block info, bottom half contains references to cbf array
 		byte[] origData;
@@ -42,9 +54,14 @@ namespace OpenRA.FileFormats
 		// Final frame output
 		uint[,] frameData;
 		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
+		bool hasAudio;
 
 		public byte[] AudioData { get { return audioData; } }
 		public int CurrentFrame { get { return currentFrame; } }
+		public int SampleRate { get { return sampleRate; } }
+		public int SampleBits { get { return sampleBits; } }
+		public int AudioChannels { get { return audioChannels; } }
+		public bool HasAudio { get { return hasAudio; } }
 
 		public VqaReader(Stream stream)
 		{
@@ -53,14 +70,14 @@ namespace OpenRA.FileFormats
 			// Decode FORM chunk
 			if (stream.ReadASCII(4) != "FORM")
 				throw new InvalidDataException("Invalid vqa (invalid FORM section)");
-			/*var length = */ stream.ReadUInt32();
+			/*var length = */stream.ReadUInt32();
 
 			if (stream.ReadASCII(8) != "WVQAVQHD")
 				throw new InvalidDataException("Invalid vqa (not WVQAVQHD)");
-			/* var length = */stream.ReadUInt32();
+			/*var length2 = */stream.ReadUInt32();
 
 			/*var version = */stream.ReadUInt16();
-			/*var flags = */stream.ReadUInt16();
+			videoFlags = stream.ReadUInt16();
 			Frames = stream.ReadUInt16();
 			Width = stream.ReadUInt16();
 			Height = stream.ReadUInt16();
@@ -68,7 +85,7 @@ namespace OpenRA.FileFormats
 			blockWidth = stream.ReadUInt8();
 			blockHeight = stream.ReadUInt8();
 			Framerate = stream.ReadUInt8();
-			cbParts = stream.ReadUInt8();
+			chunkBufferParts = stream.ReadUInt8();
 			blocks = new int2(Width / blockWidth, Height / blockHeight);
 
 			numColors = stream.ReadUInt16();
@@ -77,30 +94,53 @@ namespace OpenRA.FileFormats
 			/*var unknown2 = */stream.ReadUInt32();
 
 			// Audio
-			/*var freq = */stream.ReadUInt16();
-			/*var channels = */stream.ReadByte();
-			/*var bits = */stream.ReadByte();
-			/*var unknown3 = */stream.ReadBytes(14);
+			sampleRate = stream.ReadUInt16();
+			audioChannels = stream.ReadByte();
+			sampleBits = stream.ReadByte();
+
+			/*var unknown3 =*/stream.ReadUInt32();
+			/*var unknown4 =*/stream.ReadUInt16();
+			/*maxCbfzSize =*/stream.ReadUInt32(); // Unreliable
+
+			/*var unknown5 =*/stream.ReadUInt32();
 
 			var frameSize = Exts.NextPowerOf2(Math.Max(Width, Height));
-			cbf = new byte[Width*Height];
-			cbp = new byte[Width*Height];
-			palette = new uint[numColors];
-			origData = new byte[2*blocks.X*blocks.Y];
-			frameData = new uint[frameSize, frameSize];
 
-			var type = stream.ReadASCII(4);
-			if (type != "FINF")
+			if (IsHqVqa)
 			{
-				stream.Seek(27, SeekOrigin.Current);
-				type = stream.ReadASCII(4);
+				cbfBuffer = new byte[maxCbfzSize];
+				cbf = new byte[maxCbfzSize * 3];
+				origData = new byte[maxCbfzSize];
+			}
+			else
+			{
+				cbfBuffer = new byte[Width * Height];
+				cbf = new byte[Width * Height];
+				cbp = new byte[Width * Height];
+				origData = new byte[2 * blocks.X * blocks.Y];
+			}
+
+			palette = new uint[numColors];
+			frameData = new uint[frameSize, frameSize];
+			var type = stream.ReadASCII(4);
+			while (type != "FINF")
+			{
+				// Sub type is a file tag
+				if (type[3] == 'F')
+				{
+					var jmp = int2.Swap(stream.ReadUInt32());
+					stream.Seek(jmp, SeekOrigin.Current);
+					type = stream.ReadASCII(4);
+				}
+				else
+					throw new NotSupportedException("Vqa uses unknown Subtype: {0}".F(type));
 			}
 
 			/*var length = */stream.ReadUInt16();
 			/*var unknown4 = */stream.ReadUInt16();
 
 			// Frame offsets
-			offsets = new UInt32[Frames];
+			offsets = new uint[Frames];
 			for (var i = 0; i < Frames; i++)
 			{
 				offsets[i] = stream.ReadUInt32();
@@ -116,15 +156,15 @@ namespace OpenRA.FileFormats
 
 		public void Reset()
 		{
-			currentFrame = cbOffset = cbChunk = 0;
+			currentFrame = chunkBufferOffset = currentChunkBuffer = 0;
 			LoadFrame();
 		}
 
 		void CollectAudioData()
 		{
-			var ms = new MemoryStream();
+			var audio1 = new MemoryStream(); // left channel / mono
+			var audio2 = new MemoryStream(); // right channel
 			var adpcmIndex = 0;
-
 			var compressed = false;
 			for (var i = 0; i < Frames; i++)
 			{
@@ -134,17 +174,41 @@ namespace OpenRA.FileFormats
 				while (stream.Position < end)
 				{
 					var type = stream.ReadASCII(4);
+					if (type == "SN2J")
+					{
+						var jmp = int2.Swap(stream.ReadUInt32());
+						stream.Seek(jmp, SeekOrigin.Current);
+						type = stream.ReadASCII(4);
+					}
+
 					var length = int2.Swap(stream.ReadUInt32());
 
 					switch (type)
 					{
 						case "SND0":
 						case "SND2":
-							var rawAudio = stream.ReadBytes((int)length);
-							ms.Write(rawAudio);
-							compressed = (type == "SND2");
+							if (audioChannels == 0)
+								throw new NotSupportedException();
+							else if (audioChannels == 1)
+							{
+								var rawAudio = stream.ReadBytes((int)length);
+								audio1.Write(rawAudio);
+							}
+							else
+							{
+								var rawAudio = stream.ReadBytes((int)length / 2);
+								audio1.Write(rawAudio);
+								rawAudio = stream.ReadBytes((int)length / 2);
+								audio2.Write(rawAudio);
+								if (length % 2 != 0)
+									stream.ReadBytes(2);
+							}
+
+							compressed = type == "SND2";
 							break;
 						default:
+							if (length + stream.Position > stream.Length)
+								throw new NotSupportedException("Vqa uses unknown Subtype: {0}".F(type));
 							stream.ReadBytes((int)length);
 							break;
 					}
@@ -154,7 +218,37 @@ namespace OpenRA.FileFormats
 				}
 			}
 
-			audioData = (compressed) ? AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex) : ms.ToArray();
+			if (audioChannels == 1)
+				audioData = compressed ? AudLoader.LoadSound(audio1.ToArray(), ref adpcmIndex) : audio1.ToArray();
+			else
+			{
+				byte[] leftData, rightData;
+				if (!compressed)
+				{
+					leftData = audio1.ToArray();
+					rightData = audio2.ToArray();
+				}
+				else
+				{
+					adpcmIndex = 0;
+					leftData = AudLoader.LoadSound(audio1.ToArray(), ref adpcmIndex);
+					adpcmIndex = 0;
+					rightData = AudLoader.LoadSound(audio2.ToArray(), ref adpcmIndex);
+				}
+
+				audioData = new byte[rightData.Length + leftData.Length];
+				var rightIndex = 0;
+				var leftIndex = 0;
+				for (var i = 0; i < audioData.Length;)
+				{
+					audioData[i++] = leftData[leftIndex++];
+					audioData[i++] = leftData[leftIndex++];
+					audioData[i++] = rightData[rightIndex++];
+					audioData[i++] = rightData[rightIndex++];
+				}
+			}
+
+			hasAudio = audioData.Length > 0;
 		}
 
 		public void AdvanceFrame()
@@ -170,18 +264,41 @@ namespace OpenRA.FileFormats
 
 			// Seek to the start of the frame
 			stream.Seek(offsets[currentFrame], SeekOrigin.Begin);
-			var end = (currentFrame < Frames - 1) ? offsets[currentFrame+1] : stream.Length;
+			var end = (currentFrame < Frames - 1) ? offsets[currentFrame + 1] : stream.Length;
 
 			while (stream.Position < end)
 			{
 				var type = stream.ReadASCII(4);
-				var length = int2.Swap(stream.ReadUInt32());
+				var length = 0U;
+				if (type == "SN2J")
+				{
+					var jmp = int2.Swap(stream.ReadUInt32());
+					stream.Seek(jmp, SeekOrigin.Current);
+					type = stream.ReadASCII(4);
+					if (type == "SND2")
+					{
+						length = int2.Swap(stream.ReadUInt32());
+						stream.Seek(length, SeekOrigin.Current);
+						type = stream.ReadASCII(4);
+					}
+					else
+						throw new NotSupportedException();
+				}
 
-				switch(type)
+				length = int2.Swap(stream.ReadUInt32());
+
+				switch (type)
 				{
 					case "VQFR":
 						DecodeVQFR(stream);
-					break;
+						break;
+					case "\0VQF":
+						stream.ReadByte();
+						DecodeVQFR(stream);
+						break;
+					case "VQFL":
+						DecodeVQFR(stream, "VQFL");
+						break;
 					default:
 						// Don't parse sound here.
 						stream.ReadBytes((int)length);
@@ -194,7 +311,7 @@ namespace OpenRA.FileFormats
 		}
 
 		// VQA Frame
-		public void DecodeVQFR(Stream s)
+		public void DecodeVQFR(Stream s, string parentType = "VQFR")
 		{
 			while (true)
 			{
@@ -203,35 +320,61 @@ namespace OpenRA.FileFormats
 				var type = s.ReadASCII(4);
 				var subchunkLength = (int)int2.Swap(s.ReadUInt32());
 
-				switch(type)
+				switch (type)
 				{
 					// Full frame-modifier
 					case "CBFZ":
-						Format80.DecodeInto(s.ReadBytes(subchunkLength), cbf);
-					break;
+						var decodeMode = s.Peek() == 0;
+						s.ReadBytes(fileBuffer, 0, subchunkLength);
+						Array.Clear(cbf, 0, cbf.Length);
+						Array.Clear(cbfBuffer, 0, cbfBuffer.Length);
+						var decodeCount = 0;
+						decodeCount = Format80.DecodeInto(fileBuffer, cbfBuffer, decodeMode ? 1 : 0, decodeMode);
+						if ((videoFlags & 0x10) == 16)
+						{
+							var p = 0;
+							for (var i = 0; i < decodeCount; i += 2)
+							{
+								var packed = cbfBuffer[i + 1] << 8 | cbfBuffer[i];
+								/* 15      bit      0
+								   0rrrrrgg gggbbbbb
+								   HI byte  LO byte*/
+								cbf[p++] = (byte)((packed & 0x7C00) >> 7);
+								cbf[p++] = (byte)((packed & 0x3E0) >> 2);
+								cbf[p++] = (byte)((packed & 0x1f) << 3);
+							}
+						}
+						else
+						{
+							cbf = cbfBuffer;
+						}
+
+						if (parentType == "VQFL")
+							return;
+						break;
 					case "CBF0":
 						cbf = s.ReadBytes(subchunkLength);
-					break;
+						break;
 
 					// frame-modifier chunk
 					case "CBP0":
 					case "CBPZ":
 						// Partial buffer is full; dump and recreate
-						if (cbChunk == cbParts)
+						if (currentChunkBuffer == chunkBufferParts)
 						{
 							if (type == "CBP0")
 								cbf = (byte[])cbp.Clone();
 							else
 								Format80.DecodeInto(cbp, cbf);
 
-							cbOffset = cbChunk = 0;
+							chunkBufferOffset = currentChunkBuffer = 0;
 						}
 
 						var bytes = s.ReadBytes(subchunkLength);
-						bytes.CopyTo(cbp,cbOffset);
-						cbOffset += subchunkLength;
-						cbChunk++;
-					break;
+						bytes.CopyTo(cbp, chunkBufferOffset);
+						chunkBufferOffset += subchunkLength;
+						currentChunkBuffer++;
+						break;
 
 					// Palette
 					case "CPL0":
@@ -242,13 +385,28 @@ namespace OpenRA.FileFormats
 							var b = (byte)(s.ReadUInt8() << 2);
 							palette[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 						}
-					break;
+
+						break;
 
 					// Frame data
 					case "VPTZ":
 						Format80.DecodeInto(s.ReadBytes(subchunkLength), origData);
+
 						// This is the last subchunk
 						return;
+					case "VPRZ":
+						Array.Clear(origData, 0, origData.Length);
+						s.ReadBytes(fileBuffer, 0, subchunkLength);
+						if (fileBuffer[0] != 0)
+							vtprSize = Format80.DecodeInto(fileBuffer, origData);
+						else
+							Format80.DecodeInto(fileBuffer, origData, 1, true);
+						return;
+					case "VPTR":
+						Array.Clear(origData, 0, origData.Length);
+						s.ReadBytes(origData, 0, subchunkLength);
+						vtprSize = subchunkLength;
+						return;
 					default:
 						throw new InvalidDataException("Unknown sub-chunk {0}".F(type));
 				}
@@ -260,19 +418,76 @@ namespace OpenRA.FileFormats
 		void DecodeFrameData()
 		{
 			cachedFrame = currentFrame;
-			for (var y = 0; y < blocks.Y; y++)
-				for (var x = 0; x < blocks.X; x++)
+			if (IsHqVqa)
+			{
+				/* The VP?? chunks of the video file contains an array of instructions for
+				 * how the blocks of the finished frame will be filled with color data blocks
+				 * contained in the CBF? chunks.
+				 */
+				var p = 0;
+				for (var y = 0; y < blocks.Y;)
 				{
-					var px = origData[x + y*blocks.X];
-					var mod = origData[x + (y + blocks.Y)*blocks.X];
-					for (var j = 0; j < blockHeight; j++)
-						for (var i = 0; i < blockWidth; i++)
+					for (var x = 0; x < blocks.X;)
+					{
+						if (y >= blocks.Y)
+							break;
+
+						// The first 3 bits of the short determine the type of instruction with the rest being one or two parameters.
+						var val = (int)origData[p++];
+						val |= origData[p++] << 8;
+						var para_A = val & 0x1fff;
+						var para_B1 = val & 0xFF;
+						var para_B2 = (((val / 256) & 0x1f) + 1) * 2;
+						switch (val >> 13)
 						{
-							var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
-							var color = (mod == 0x0f) ? px : cbf[cbfi];
-							frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
+							case 0:
+								x += para_A;
+								break;
+							case 1:
+								WriteBlock(para_B1, para_B2, ref x, ref y);
+								break;
+							case 2:
+								WriteBlock(para_B1, 1, ref x, ref y);
+								for (var i = 0; i < para_B2; i++)
+									WriteBlock(origData[p++], 1, ref x, ref y);
+								break;
+							case 3:
+								WriteBlock(para_A, 1, ref x, ref y);
+								break;
+							case 5:
+								WriteBlock(para_A, origData[p++], ref x, ref y);
+								break;
+							default:
+								throw new NotSupportedException();
 						}
+					}
+
+					y++;
 				}
+
+				if (p != vtprSize)
+					throw new IndexOutOfRangeException();
+			}
+			else
+			{
+				for (var y = 0; y < blocks.Y; y++)
+				{
+					for (var x = 0; x < blocks.X; x++)
+					{
+						var px = origData[x + y * blocks.X];
+						var mod = origData[x + (y + blocks.Y) * blocks.X];
+						for (var j = 0; j < blockHeight; j++)
+						{
+							for (var i = 0; i < blockWidth; i++)
+							{
+								var cbfi = (mod * 256 + px) * 8 + j * blockWidth + i;
+								var color = (mod == 0x0f) ? px : cbf[cbfi];
+								frameData[y * blockHeight + j, x * blockWidth + i] = palette[color];
+							}
+						}
+					}
+				}
+			}
 		}
 
 		public uint[,] FrameData
@@ -285,5 +500,33 @@ namespace OpenRA.FileFormats
 				return frameData;
 			}
 		}
+
+		bool IsHqVqa { get { return (videoFlags & 0x10) == 16; } }
+
+		void WriteBlock(int blockNumber, int count, ref int x, ref int y)
+		{
+			for (var i = 0; i < count; i++)
+			{
+				var frameX = x * blockWidth;
+				var frameY = y * blockHeight;
+				var offset = blockNumber * blockHeight * blockWidth * 3;
+				for (var by = 0; by < blockHeight; by++)
+					for (var bx = 0; bx < blockWidth; bx++)
+					{
+						var p = (bx + by * blockWidth) * 3;
+
+						frameData[frameY + by, frameX + bx] = (uint)(0xFF << 24 | cbf[offset + p] << 16 | cbf[offset + p + 1] << 8 | cbf[offset + p + 2]);
+					}
+
+				x++;
+				if (x >= blocks.X)
+				{
+					x = 0;
+					y++;
+					if (y >= blocks.Y && i != count - 1)
+						throw new IndexOutOfRangeException();
+				}
+			}
+		}
 	}
 }

OpenRA.Game/FileFormats/VxlReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -38,15 +38,15 @@ namespace OpenRA.FileFormats
 		public readonly uint LimbCount;
 		public VxlLimb[] Limbs;
 
-		uint BodySize;
+		uint bodySize;
 
 		static void ReadVoxelData(Stream s, VxlLimb l)
 		{
-			var baseSize = l.Size[0]*l.Size[1];
+			var baseSize = l.Size[0] * l.Size[1];
 			var colStart = new int[baseSize];
 			for (var i = 0; i < baseSize; i++)
 				colStart[i] = s.ReadInt32();
-			s.Seek(4*baseSize, SeekOrigin.Current);
+			s.Seek(4 * baseSize, SeekOrigin.Current);
 			var dataStart = s.Position;
 
 			// Count the voxels in this limb
@@ -65,12 +65,12 @@ namespace OpenRA.FileFormats
 					var count = s.ReadUInt8();
 					z += count;
 					l.VoxelCount += count;
-					s.Seek(2*count + 1, SeekOrigin.Current);
+					s.Seek(2 * count + 1, SeekOrigin.Current);
 				} while (z < l.Size[2]);
 			}
 
 			// Read the data
-			l.VoxelMap = new Dictionary<byte, VxlElement>[l.Size[0],l.Size[1]];
+			l.VoxelMap = new Dictionary<byte, VxlElement>[l.Size[0], l.Size[1]];
 			for (var i = 0; i < baseSize; i++)
 			{
 				// Empty column
@@ -82,7 +82,7 @@ namespace OpenRA.FileFormats
 				var x = (byte)(i % l.Size[0]);
 				var y = (byte)(i / l.Size[0]);
 				byte z = 0;
-				l.VoxelMap[x,y] = new Dictionary<byte, VxlElement>();
+				l.VoxelMap[x, y] = new Dictionary<byte, VxlElement>();
 				do
 				{
 					z += s.ReadUInt8();
@@ -93,9 +93,10 @@ namespace OpenRA.FileFormats
 						v.Color = s.ReadUInt8();
 						v.Normal = s.ReadUInt8();
 
-						l.VoxelMap[x,y].Add(z, v);
+						l.VoxelMap[x, y].Add(z, v);
 						z++;
 					}
+
 					// Skip duplicate count
 					s.ReadUInt8();
 				} while (z < l.Size[2]);
@@ -104,14 +105,13 @@ namespace OpenRA.FileFormats
 
 		public VxlReader(Stream s)
 		{
-
 			if (!s.ReadASCII(16).StartsWith("Voxel Animation"))
 				throw new InvalidDataException("Invalid vxl header");
 
 			s.ReadUInt32();
 			LimbCount = s.ReadUInt32();
 			s.ReadUInt32();
-			BodySize = s.ReadUInt32();
+			bodySize = s.ReadUInt32();
 			s.Seek(770, SeekOrigin.Current);
 
 			// Read Limb headers
@@ -124,12 +124,12 @@ namespace OpenRA.FileFormats
 			}
 
 			// Skip to the Limb footers
-			s.Seek(802 + 28*LimbCount + BodySize, SeekOrigin.Begin);
+			s.Seek(802 + 28 * LimbCount + bodySize, SeekOrigin.Begin);
 
-			var LimbDataOffset = new uint[LimbCount];
+			var limbDataOffset = new uint[LimbCount];
 			for (var i = 0; i < LimbCount; i++)
 			{
-				LimbDataOffset[i] = s.ReadUInt32();
+				limbDataOffset[i] = s.ReadUInt32();
 				s.Seek(8, SeekOrigin.Current);
 				Limbs[i].Scale = s.ReadFloat();
 				s.Seek(48, SeekOrigin.Current);
@@ -143,7 +143,7 @@ namespace OpenRA.FileFormats
 
 			for (var i = 0; i < LimbCount; i++)
 			{
-				s.Seek(802 + 28*LimbCount + LimbDataOffset[i], SeekOrigin.Begin);
+				s.Seek(802 + 28 * LimbCount + limbDataOffset[i], SeekOrigin.Begin);
 				ReadVoxelData(s, Limbs[i]);
 			}
 		}

OpenRA.Game/FileFormats/WavLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -30,9 +30,9 @@ namespace OpenRA.FileFormats
 		public readonly int DataSize;
 		public readonly byte[] RawOutput;
 
-		public enum WaveType { Pcm = 0x1, ImaAdpcm = 0x11 };
+		public enum WaveType { Pcm = 0x1, ImaAdpcm = 0x11 }
 		public static WaveType Type { get; private set; }
-		
+
 		public WavLoader(Stream s)
 		{
 			while (s.Position < s.Length)
@@ -69,6 +69,7 @@ namespace OpenRA.FileFormats
 							UncompressedSize = s.ReadInt32();
 							s.ReadBytes(chunkSize - 4);
 						}
+
 						break;
 					case "data":
 						DataSize = s.ReadInt32();
@@ -80,6 +81,7 @@ namespace OpenRA.FileFormats
 							var chunkSize = s.ReadInt32();
 							s.ReadBytes(chunkSize);
 						}
+
 						break;
 				}
 			}
@@ -90,7 +92,7 @@ namespace OpenRA.FileFormats
 				BitsPerSample = 16;
 			}
 		}
-		
+
 		public static float WaveLength(Stream s)
 		{
 			s.Position = 12;
@@ -127,7 +129,7 @@ namespace OpenRA.FileFormats
 			// Decode each block of IMA ADPCM data in RawOutput
 			for (var block = 0; block < numBlocks; block++)
 			{
-				// Each block starts with a initial state per-channel 
+				// Each block starts with a initial state per-channel
 				for (var c = 0; c < Channels; c++)
 				{
 					predictor[c] = s.ReadInt16();

OpenRA.Game/FileFormats/XccGlobalDatabase.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -34,7 +34,7 @@ namespace OpenRA.FileFormats
 					entries.Add(new string(chars.ToArray()));
 
 					// Skip comment
-					while ((c = reader.ReadChar()) != 0);
+					while ((c = reader.ReadChar()) != 0) { }
 				}
 			}
 

OpenRA.Game/FileFormats/XccLocalDatabase.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -47,9 +47,9 @@ namespace OpenRA.FileFormats
 			using (var writer = new BinaryWriter(data))
 			{
 				writer.Write(Encoding.ASCII.GetBytes("XCC by Olaf van der Spek"));
-				writer.Write(new byte[] {0x1A,0x04,0x17,0x27,0x10,0x19,0x80,0x00});
+				writer.Write(new byte[] { 0x1A, 0x04, 0x17, 0x27, 0x10, 0x19, 0x80, 0x00 });
 
-				writer.Write((int)(Entries.Aggregate(Entries.Length, (a,b) => a + b.Length) + 52)); // Size
+				writer.Write((int)(Entries.Aggregate(Entries.Length, (a, b) => a + b.Length) + 52)); // Size
 				writer.Write((int)0); // Type
 				writer.Write((int)0); // Version
 				writer.Write((int)0); // Game/Format (0 == TD)
@@ -64,4 +64,4 @@ namespace OpenRA.FileFormats
 			return data.ToArray();
 		}
 	}
-}
+}

OpenRA.Game/FileSystem/BagFile.cs

@@ -0,0 +1,187 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
+
+namespace OpenRA.FileSystem
+{
+	public sealed class BagFile : IFolder
+	{
+		static readonly uint[] Nothing = { };
+
+		readonly string bagFilename;
+		readonly Stream s;
+		readonly int bagFilePriority;
+		readonly Dictionary<uint, IdxEntry> index;
+
+		public BagFile(string filename, int priority)
+		{
+			bagFilename = filename;
+			bagFilePriority = priority;
+
+			// A bag file is always accompanied with an .idx counterpart
+			// For example: audio.bag requires the audio.idx file
+			var indexFilename = Path.ChangeExtension(filename, ".idx");
+
+			// Build the index and dispose the stream, it is no longer needed after this
+			List<IdxEntry> entries;
+			using (var indexStream = GlobalFileSystem.Open(indexFilename))
+				entries = new IdxReader(indexStream).Entries;
+
+			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
+				"{0} (bag format)".F(filename),
+				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
+
+			s = GlobalFileSystem.Open(filename);
+		}
+
+		public int Priority { get { return 1000 + bagFilePriority; } }
+		public string Name { get { return bagFilename; } }
+
+		public Stream GetContent(uint hash)
+		{
+			IdxEntry entry;
+			if (!index.TryGetValue(hash, out entry))
+				return null;
+
+			s.Seek(entry.Offset, SeekOrigin.Begin);
+
+			var waveHeaderMemoryStream = new MemoryStream();
+
+			var channels = (entry.Flags & 1) > 0 ? 2 : 1;
+
+			if ((entry.Flags & 2) > 0)
+			{
+				// PCM
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 36));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(16));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)WavLoader.WaveType.Pcm));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(2 * channels * entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)(2 * channels)));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)16));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
+			}
+
+			if ((entry.Flags & 8) > 0)
+			{
+				// IMA ADPCM
+				var samplesPerChunk = (2 * (entry.ChunkSize - 4)) + 1;
+				var bytesPerSec = (int)Math.Floor(((double)(2 * entry.ChunkSize) / samplesPerChunk) * ((double)entry.SampleRate / 2));
+				var chunkSize = entry.ChunkSize > entry.Length ? entry.Length : entry.ChunkSize;
+
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 52));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(20));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)WavLoader.WaveType.ImaAdpcm));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(bytesPerSec));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)chunkSize));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)4));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)2));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)samplesPerChunk));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fact"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(4));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(4 * entry.Length));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
+			}
+
+			waveHeaderMemoryStream.Seek(0, SeekOrigin.Begin);
+
+			// Construct a merged stream
+			var mergedStream = new MergedStream(waveHeaderMemoryStream, s);
+			mergedStream.SetLength(waveHeaderMemoryStream.Length + entry.Length);
+
+			return mergedStream;
+		}
+
+		uint? FindMatchingHash(string filename)
+		{
+			var hash = IdxEntry.HashFilename(filename, PackageHashType.CRC32);
+			if (index.ContainsKey(hash))
+				return hash;
+
+			// Maybe we were given a raw hash?
+			uint raw;
+			if (!uint.TryParse(filename, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out raw))
+				return null;
+
+			if ("{0:X}".F(raw) == filename && index.ContainsKey(raw))
+				return raw;
+
+			return null;
+		}
+
+		public Stream GetContent(string filename)
+		{
+			var hash = FindMatchingHash(filename);
+			return hash.HasValue ? GetContent(hash.Value) : null;
+		}
+
+		public bool Exists(string filename)
+		{
+			return FindMatchingHash(filename).HasValue;
+		}
+
+		public IEnumerable<uint> ClassicHashes()
+		{
+			return Nothing;
+		}
+
+		public IEnumerable<uint> CrcHashes()
+		{
+			return index.Keys;
+		}
+
+		public IEnumerable<string> AllFileNames()
+		{
+			var lookup = new Dictionary<uint, string>();
+			if (GlobalFileSystem.Exists("global mix database.dat"))
+			{
+				var db = new XccGlobalDatabase(GlobalFileSystem.Open("global mix database.dat"));
+				foreach (var e in db.Entries)
+				{
+					var hash = IdxEntry.HashFilename(e, PackageHashType.CRC32);
+					if (!lookup.ContainsKey(hash))
+						lookup.Add(hash, e);
+				}
+			}
+
+			return index.Keys.Select(k => lookup.ContainsKey(k) ? lookup[k] : "{0:X}".F(k));
+		}
+
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			GlobalFileSystem.Unmount(this);
+			throw new NotImplementedException("Updating bag files unsupported");
+		}
+
+		public void Dispose()
+		{
+			s.Dispose();
+		}
+	}
+}

OpenRA.Game/FileSystem/BigFile.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -15,37 +15,45 @@ using System.Linq;
 
 namespace OpenRA.FileSystem
 {
-	public class BigFile : IFolder
+	public sealed class BigFile : IFolder
 	{
 		public string Name { get; private set; }
 		public int Priority { get; private set; }
 		readonly Dictionary<string, Entry> entries = new Dictionary<string, Entry>();
+		readonly Stream s;
 
 		public BigFile(string filename, int priority)
 		{
 			Name = filename;
 			Priority = priority;
 
-			var s = GlobalFileSystem.Open(filename);
-
-			if (s.ReadASCII(4) != "BIGF")
-				throw new InvalidDataException("Header is not BIGF");
-
-			// Total archive size.
-			s.ReadUInt32();
-
-			var entryCount = s.ReadUInt32();
-			if (BitConverter.IsLittleEndian)
-				entryCount = int2.Swap(entryCount);
-
-			// First entry offset? This is apparently bogus for EA's .big files
-			// and we don't have to try seeking there since the entries typically start next in EA's .big files.
-			s.ReadUInt32();
-
-			for (var i = 0; i < entryCount; i++)
+			s = GlobalFileSystem.Open(filename);
+			try
 			{
-				var entry = new Entry(s);
-				entries.Add(entry.Path, entry);
+				if (s.ReadASCII(4) != "BIGF")
+					throw new InvalidDataException("Header is not BIGF");
+
+				// Total archive size.
+				s.ReadUInt32();
+
+				var entryCount = s.ReadUInt32();
+				if (BitConverter.IsLittleEndian)
+					entryCount = int2.Swap(entryCount);
+
+				// First entry offset? This is apparently bogus for EA's .big files
+				// and we don't have to try seeking there since the entries typically start next in EA's .big files.
+				s.ReadUInt32();
+
+				for (var i = 0; i < entryCount; i++)
+				{
+					var entry = new Entry(s);
+					entries.Add(entry.Path, entry);
+				}
+			}
+			catch
+			{
+				Dispose();
+				throw;
 			}
 		}
 
@@ -107,5 +115,10 @@ namespace OpenRA.FileSystem
 		{
 			throw new NotImplementedException();
 		}
+
+		public void Dispose()
+		{
+			s.Dispose();
+		}
 	}
 }

OpenRA.Game/FileSystem/D2kSoundResources.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -14,7 +14,7 @@ using System.IO;
 
 namespace OpenRA.FileSystem
 {
-	public class D2kSoundResources : IFolder
+	public sealed class D2kSoundResources : IFolder
 	{
 		readonly Stream s;
 
@@ -30,22 +30,28 @@ namespace OpenRA.FileSystem
 			this.priority = priority;
 
 			s = GlobalFileSystem.Open(filename);
-			s.Seek(0, SeekOrigin.Begin);
-
-			filenames = new List<string>();
-
-			var headerLength = s.ReadUInt32();
-			while (s.Position < headerLength + 4)
+			try
 			{
-				var name = s.ReadASCIIZ();
-				var offset = s.ReadUInt32();
-				var length = s.ReadUInt32();
+				filenames = new List<string>();
 
-				var hash = PackageEntry.HashFilename(name, PackageHashType.Classic);
-				if (!index.ContainsKey(hash))
-					index.Add(hash, new PackageEntry(hash, offset, length));
+				var headerLength = s.ReadUInt32();
+				while (s.Position < headerLength + 4)
+				{
+					var name = s.ReadASCIIZ();
+					var offset = s.ReadUInt32();
+					var length = s.ReadUInt32();
 
-				filenames.Add(name);
+					var hash = PackageEntry.HashFilename(name, PackageHashType.Classic);
+					if (!index.ContainsKey(hash))
+						index.Add(hash, new PackageEntry(hash, offset, length));
+
+					filenames.Add(name);
+				}
+			}
+			catch
+			{
+				Dispose();
+				throw;
 			}
 		}
 
@@ -76,7 +82,7 @@ namespace OpenRA.FileSystem
 
 		public string Name { get { return filename; } }
 
-		public int Priority { get { return 1000 + priority; }}
+		public int Priority { get { return 1000 + priority; } }
 
 		public IEnumerable<uint> ClassicHashes()
 		{
@@ -92,5 +98,10 @@ namespace OpenRA.FileSystem
 		{
 			throw new NotImplementedException("Cannot save Dune 2000 Sound Resources.");
 		}
+
+		public void Dispose()
+		{
+			s.Dispose();
+		}
 	}
 }

OpenRA.Game/FileSystem/Folder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -13,7 +13,7 @@ using System.IO;
 
 namespace OpenRA.FileSystem
 {
-	public class Folder : IFolder
+	public sealed class Folder : IFolder
 	{
 		readonly string path;
 		readonly int priority;
@@ -39,7 +39,7 @@ namespace OpenRA.FileSystem
 
 		public Stream GetContent(string filename)
 		{
-			try { return File.OpenRead( Path.Combine( path, filename ) ); }
+			try { return File.OpenRead(Path.Combine(path, filename)); }
 			catch { return null; }
 		}
 
@@ -75,8 +75,10 @@ namespace OpenRA.FileSystem
 
 			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);
+				using (var writer = new BinaryWriter(dataStream))
+					writer.Write(file.Value);
 		}
+
+		public void Dispose() { }
 	}
 }

OpenRA.Game/FileSystem/GlobalFileSystem.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -17,7 +17,7 @@ using OpenRA.Primitives;
 
 namespace OpenRA.FileSystem
 {
-	public interface IFolder
+	public interface IFolder : IDisposable
 	{
 		Stream GetContent(string filename);
 		bool Exists(string filename);
@@ -74,6 +74,8 @@ namespace OpenRA.FileSystem
 				throw new NotImplementedException("The creation of .PAK archives is unimplemented");
 			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
 				throw new NotImplementedException("The creation of .big archives is unimplemented");
+			if (filename.EndsWith(".cab", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("The creation of .cab archives is unimplemented");
 
 			return new Folder(filename, order, content);
 		}
@@ -88,6 +90,7 @@ namespace OpenRA.FileSystem
 
 				return new MixFile(filename, type, order);
 			}
+
 			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
 				return new ZipFile(filename, order);
 			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
@@ -100,6 +103,10 @@ namespace OpenRA.FileSystem
 				return new PakFile(filename, order);
 			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
 				return new BigFile(filename, order);
+			if (filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
+				return new BagFile(filename, order);
+			if (filename.EndsWith(".hdr", StringComparison.InvariantCultureIgnoreCase))
+				return new InstallShieldCABExtractor(filename, order);
 
 			return new Folder(filename, order);
 		}
@@ -124,6 +131,9 @@ namespace OpenRA.FileSystem
 
 		public static void UnmountAll()
 		{
+			foreach (var folder in MountedFolders)
+				folder.Dispose();
+
 			MountedFolders.Clear();
 			FolderPaths.Clear();
 			classicHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
@@ -132,6 +142,9 @@ namespace OpenRA.FileSystem
 
 		public static bool Unmount(IFolder mount)
 		{
+			if (MountedFolders.Contains(mount))
+				mount.Dispose();
+
 			return MountedFolders.RemoveAll(f => f == mount) > 0;
 		}
 
@@ -163,52 +176,72 @@ namespace OpenRA.FileSystem
 			return null;
 		}
 
-		public static Stream Open(string filename) { return OpenWithExts(filename, ""); }
-
-		public static Stream OpenWithExts(string filename, params string[] exts)
+		public static Stream Open(string filename)
 		{
 			Stream s;
-			if (!TryOpenWithExts(filename, exts, out s))
+			if (!TryOpen(filename, out s))
 				throw new FileNotFoundException("File not found: {0}".F(filename), filename);
 
 			return s;
 		}
 
-		public static bool TryOpenWithExts(string filename, string[] exts, out Stream s)
+		public static bool TryOpen(string name, out Stream s)
 		{
-			if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1)
-			{
-				foreach (var ext in exts)
-				{
-					s = GetFromCache(PackageHashType.Classic, filename + ext);
-					if (s != null)
-						return true;
+			var filename = name;
+			var foldername = string.Empty;
 
-					s = GetFromCache(PackageHashType.CRC32, filename + ext);
-					if (s != null)
-						return true;
-				}
+			// Used for faction specific packages; rule out false positive on Windows C:\ drive notation
+			var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
+			if (explicitFolder)
+			{
+				var divide = name.Split(':');
+				foldername = divide.First();
+				filename = divide.Last();
 			}
 
-			foreach (var ext in exts)
+			// Check the cache for a quick lookup if the folder name is unknown
+			// TODO: This disables caching for explicit folder requests
+			if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1 && !explicitFolder)
 			{
-				var possibleName = filename + ext;
-				var folder = MountedFolders
-					.Where(x => x.Exists(possibleName))
-					.MaxByOrDefault(x => x.Priority);
-
-				if (folder != null)
-				{
-					s = folder.GetContent(possibleName);
+				s = GetFromCache(PackageHashType.Classic, filename);
+				if (s != null)
 					return true;
-				}
+
+				s = GetFromCache(PackageHashType.CRC32, filename);
+				if (s != null)
+					return true;
+			}
+
+			// Ask each package individually
+			IFolder folder;
+			if (explicitFolder && !string.IsNullOrEmpty(foldername))
+				folder = MountedFolders.Where(x => x.Name == foldername).MaxByOrDefault(x => x.Priority);
+			else
+				folder = MountedFolders.Where(x => x.Exists(filename)).MaxByOrDefault(x => x.Priority);
+
+			if (folder != null)
+			{
+				s = folder.GetContent(filename);
+				return true;
 			}
 
 			s = null;
 			return false;
 		}
 
-		public static bool Exists(string filename) { return MountedFolders.Any(f => f.Exists(filename)); }
+		public static bool Exists(string name)
+		{
+			var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
+			if (explicitFolder)
+			{
+				var divide = name.Split(':');
+				var foldername = divide.First();
+				var filename = divide.Last();
+				return MountedFolders.Where(n => n.Name == foldername).Any(f => f.Exists(filename));
+			}
+			else
+				return MountedFolders.Any(f => f.Exists(name));
+		}
 
 		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
 

OpenRA.Game/FileSystem/IdxEntry.cs

@@ -0,0 +1,94 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileSystem
+{
+	public class IdxEntry
+	{
+		public const string DefaultExtension = "wav";
+
+		public readonly uint Hash;
+		public readonly string Name;
+		public readonly string Extension;
+		public readonly uint Offset;
+		public readonly uint Length;
+		public readonly uint SampleRate;
+		public readonly uint Flags;
+		public readonly uint ChunkSize;
+
+		public IdxEntry(uint hash, uint offset, uint length, uint sampleRate, uint flags, uint chuckSize)
+		{
+			Hash = hash;
+			Offset = offset;
+			Length = length;
+			SampleRate = sampleRate;
+			Flags = flags;
+			ChunkSize = chuckSize;
+		}
+
+		public IdxEntry(Stream s)
+		{
+			var asciiname = s.ReadASCII(16);
+
+			var pos = asciiname.IndexOf('\0');
+			if (pos != 0)
+				asciiname = asciiname.Substring(0, pos);
+
+			Name = asciiname;
+			Extension = DefaultExtension;
+			Offset = s.ReadUInt32();
+			Length = s.ReadUInt32();
+			SampleRate = s.ReadUInt32();
+			Flags = s.ReadUInt32();
+			ChunkSize = s.ReadUInt32();
+			Hash = HashFilename(string.Concat(Name, ".", Extension), PackageHashType.CRC32);
+		}
+
+		public void Write(BinaryWriter w)
+		{
+			w.Write(Name.PadRight(16, '\0'));
+			w.Write(Offset);
+			w.Write(Length);
+			w.Write(SampleRate);
+			w.Write(Flags);
+			w.Write(ChunkSize);
+		}
+
+		public override string ToString()
+		{
+			string filename;
+			if (names.TryGetValue(Hash, out filename))
+				return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(filename, Offset, Length);
+			else
+				return "0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}".F(Hash, Offset, Length);
+		}
+
+		public static uint HashFilename(string name, PackageHashType type)
+		{
+			return PackageEntry.HashFilename(name, type);
+		}
+
+		static Dictionary<uint, string> names = new Dictionary<uint, string>();
+
+		public static void AddStandardName(string s)
+		{
+			// RA1 and TD
+			var hash = HashFilename(s, PackageHashType.Classic);
+			names.Add(hash, s);
+
+			// TS
+			var crcHash = HashFilename(s, PackageHashType.CRC32);
+			names.Add(crcHash, s);
+		}
+	}
+}

OpenRA.Game/FileSystem/InstallShieldCABExtractor.cs

@@ -0,0 +1,526 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using ICSharpCode.SharpZipLib.Zip.Compression;
+using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
+
+namespace OpenRA.FileSystem
+{
+	public class InstallShieldCABExtractor : IDisposable, IFolder
+	{
+		const uint FileSplit = 0x1;
+		const uint FileObfuscated = 0x2;
+		const uint FileCompressed = 0x4;
+		const uint FileInvalid = 0x8;
+
+		const uint LinkPrev = 0x1;
+		const uint LinkNext = 0x2;
+		const uint MaxFileGroupCount = 71;
+
+#region Nested Structs
+
+		struct FileGroup
+		{
+			public readonly string Name;
+			public readonly uint FirstFile;
+			public readonly uint LastFile;
+
+			public FileGroup(Stream reader, long offset)
+			{
+				var nameOffset = reader.ReadUInt32();
+				/*   unknown  */ reader.ReadBytes(18);
+				FirstFile = reader.ReadUInt32();
+				LastFile = reader.ReadUInt32();
+
+				reader.Seek(offset + (long)nameOffset, SeekOrigin.Begin);
+				Name = reader.ReadASCIIZ();
+			}
+		}
+
+		struct VolumeHeader
+		{
+			public readonly uint DataOffset;
+			public readonly uint DataOffsetHigh;
+			public readonly uint FirstFileIndex;
+			public readonly uint LastFileIndex;
+
+			public readonly uint FirstFileOffset;
+			public readonly uint FirstFileOffsetHigh;
+			public readonly uint FirstFileSizeExpanded;
+			public readonly uint FirstFileSizeExpandedHigh;
+
+			public readonly uint FirstFileSizeCompressed;
+			public readonly uint FirstFileSizeCompressedHigh;
+			public readonly uint LastFileOffset;
+			public readonly uint LastFileOffsetHigh;
+
+			public readonly uint LastFileSizeExpanded;
+			public readonly uint LastFileSizeExpandedHigh;
+			public readonly uint LastFileSizeCompressed;
+			public readonly uint LastFileSizeCompressedHigh;
+
+			public VolumeHeader(Stream reader)
+			{
+				DataOffset = reader.ReadUInt32();
+				DataOffsetHigh = reader.ReadUInt32();
+
+				FirstFileIndex = reader.ReadUInt32();
+				LastFileIndex = reader.ReadUInt32();
+				FirstFileOffset = reader.ReadUInt32();
+				FirstFileOffsetHigh = reader.ReadUInt32();
+
+				FirstFileSizeExpanded = reader.ReadUInt32();
+				FirstFileSizeExpandedHigh = reader.ReadUInt32();
+				FirstFileSizeCompressed = reader.ReadUInt32();
+				FirstFileSizeCompressedHigh = reader.ReadUInt32();
+
+				LastFileOffset = reader.ReadUInt32();
+				LastFileOffsetHigh = reader.ReadUInt32();
+				LastFileSizeExpanded = reader.ReadUInt32();
+				LastFileSizeExpandedHigh = reader.ReadUInt32();
+
+				LastFileSizeCompressed = reader.ReadUInt32();
+				LastFileSizeCompressedHigh = reader.ReadUInt32();
+			}
+		}
+
+		struct CommonHeader
+		{
+			public const long Size = 16;
+			public readonly uint Version;
+			public readonly uint VolumeInfo;
+			public readonly long CabDescriptorOffset;
+			public readonly uint CabDescriptorSize;
+
+			public CommonHeader(Stream reader)
+			{
+				Version = reader.ReadUInt32();
+				VolumeInfo = reader.ReadUInt32();
+				CabDescriptorOffset = (long)reader.ReadUInt32();
+				CabDescriptorSize = reader.ReadUInt32();
+			}
+		}
+
+		struct CabDescriptor
+		{
+			public readonly long FileTableOffset;
+			public readonly uint FileTableSize;
+			public readonly uint FileTableSize2;
+			public readonly uint DirectoryCount;
+
+			public readonly uint FileCount;
+			public readonly long FileTableOffset2;
+
+			public CabDescriptor(Stream reader, CommonHeader commonHeader)
+			{
+				reader.Seek(commonHeader.CabDescriptorOffset + 12, SeekOrigin.Begin);
+				FileTableOffset = (long)reader.ReadUInt32();
+				/*    unknown  */ reader.ReadUInt32();
+				FileTableSize = reader.ReadUInt32();
+
+				FileTableSize2 = reader.ReadUInt32();
+				DirectoryCount = reader.ReadUInt32();
+				/*   unknown  */ reader.ReadBytes(8);
+				FileCount = reader.ReadUInt32();
+
+				FileTableOffset2 = (long)reader.ReadUInt32();
+			}
+		}
+
+		struct FileDescriptor
+		{
+			public readonly ushort	Flags;
+			public readonly uint	ExpandedSize;
+			public readonly uint	CompressedSize;
+			public readonly uint	DataOffset;
+
+			public readonly byte[]	MD5;
+			public readonly uint	NameOffset;
+			public readonly ushort	DirectoryIndex;
+			public readonly uint	LinkToPrevious;
+
+			public readonly uint	LinkToNext;
+			public readonly byte	LinkFlags;
+			public readonly ushort	Volume;
+			public readonly string	Filename;
+
+			public FileDescriptor(Stream reader, long tableOffset)
+			{
+				Flags = reader.ReadUInt16();
+				ExpandedSize = reader.ReadUInt32();
+				/*    unknown   */ reader.ReadUInt32();
+				CompressedSize = reader.ReadUInt32();
+
+				/*  unknown */ reader.ReadUInt32();
+				DataOffset   = reader.ReadUInt32();
+				/*  unknown */ reader.ReadUInt32();
+				MD5          = reader.ReadBytes(16);
+
+				/*   unknown  */ reader.ReadBytes(16);
+				NameOffset     = reader.ReadUInt32();
+				DirectoryIndex = reader.ReadUInt16();
+				/*   unknown  */ reader.ReadBytes(12);
+				LinkToPrevious = reader.ReadUInt32();
+				LinkToNext = reader.ReadUInt32();
+
+				LinkFlags = reader.ReadBytes(1)[0];
+				Volume = reader.ReadUInt16();
+				var posSave = reader.Position;
+
+				reader.Seek(tableOffset + NameOffset, SeekOrigin.Begin);
+				Filename = reader.ReadASCIIZ();
+				reader.Seek(posSave, SeekOrigin.Begin);
+			}
+		}
+
+		class CabReader : IDisposable
+		{
+			readonly FileDescriptor fileDes;
+			public uint RemainingArchiveStream;
+			public uint RemainingFileStream;
+			readonly uint index;
+			readonly string commonName;
+			ushort volumeNumber;
+			Stream cabFile;
+
+			public CabReader(FileDescriptor fileDes, uint index, string commonName)
+			{
+				this.fileDes = fileDes;
+				this.index = index;
+				this.commonName = commonName;
+				volumeNumber = (ushort)((uint)fileDes.Volume - 1u);
+				RemainingArchiveStream = 0;
+				if ((fileDes.Flags & FileCompressed) > 0)
+					RemainingFileStream = fileDes.CompressedSize;
+				else
+					RemainingFileStream = fileDes.ExpandedSize;
+
+				cabFile = null;
+				NextFile();
+			}
+
+			public void CopyTo(Stream dest)
+			{
+				if ((fileDes.Flags & FileCompressed) != 0)
+				{
+					var inf = new Inflater(true);
+					var buffer = new byte[165535];
+					do
+					{
+						var bytesToExtract = cabFile.ReadUInt16();
+						RemainingArchiveStream -= 2u;
+						RemainingFileStream -= 2u;
+						inf.SetInput(GetBytes(bytesToExtract));
+						RemainingFileStream -= bytesToExtract;
+						while (!inf.IsNeedingInput)
+						{
+							var inflated = inf.Inflate(buffer);
+							dest.Write(buffer, 0, inflated);
+						}
+
+						inf.Reset();
+					}
+					while (RemainingFileStream > 0);
+				}
+				else
+				{
+					do
+					{
+						RemainingFileStream -= RemainingArchiveStream;
+						dest.Write(GetBytes(RemainingArchiveStream), 0, (int)RemainingArchiveStream);
+					}
+					while (RemainingFileStream > 0);
+				}
+			}
+
+			public byte[] GetBytes(uint count)
+			{
+				if (count < RemainingArchiveStream)
+				{
+					RemainingArchiveStream -= count;
+					return cabFile.ReadBytes((int)count);
+				}
+				else
+				{
+					var outArray = new byte[count];
+					var read = cabFile.Read(outArray, 0, (int)RemainingArchiveStream);
+					if (RemainingFileStream > RemainingArchiveStream)
+					{
+						NextFile();
+						RemainingArchiveStream -= (uint)cabFile.Read(outArray, read, (int)count - read);
+					}
+
+					return outArray;
+				}
+			}
+
+			public void Dispose()
+			{
+				cabFile.Dispose();
+			}
+
+			public void NextFile()
+			{
+				if (cabFile != null)
+					cabFile.Dispose();
+
+				++volumeNumber;
+				cabFile = GlobalFileSystem.Open("{0}{1}.cab".F(commonName, volumeNumber));
+				if (cabFile.ReadUInt32() != 0x28635349)
+					throw new InvalidDataException("Not an Installshield CAB package");
+
+				uint fileOffset;
+				if ((fileDes.Flags & FileSplit) != 0)
+				{
+					cabFile.Seek(CommonHeader.Size, SeekOrigin.Current);
+					var head = new VolumeHeader(cabFile);
+					if (index == head.LastFileIndex)
+					{
+						if ((fileDes.Flags & FileCompressed) != 0)
+							RemainingArchiveStream = head.LastFileSizeCompressed;
+						else
+							RemainingArchiveStream = head.LastFileSizeExpanded;
+
+						fileOffset = head.LastFileOffset;
+					}
+					else if (index == head.FirstFileIndex)
+					{
+						if ((fileDes.Flags & FileCompressed) != 0)
+							RemainingArchiveStream = head.FirstFileSizeCompressed;
+						else
+							RemainingArchiveStream = head.FirstFileSizeExpanded;
+
+						fileOffset = head.FirstFileOffset;
+					}
+					else
+						throw new Exception("Cannot Resolve Remaining Stream");
+				}
+				else
+				{
+					if ((fileDes.Flags & FileCompressed) != 0)
+						RemainingArchiveStream = fileDes.CompressedSize;
+					else
+						RemainingArchiveStream = fileDes.ExpandedSize;
+
+					fileOffset = fileDes.DataOffset;
+				}
+
+				cabFile.Seek(fileOffset, SeekOrigin.Begin);
+			}
+		}
+#endregion
+
+		readonly Stream hdrFile;
+		readonly CommonHeader commonHeader;
+		readonly CabDescriptor cabDescriptor;
+		readonly List<uint> directoryTable;
+		readonly Dictionary<uint, string> directoryNames = new Dictionary<uint, string>();
+		readonly Dictionary<uint, FileDescriptor> fileDescriptors = new Dictionary<uint, FileDescriptor>();
+		readonly Dictionary<string, uint> fileLookup = new Dictionary<string, uint>();
+		int priority;
+		string commonName;
+		public int Priority { get { return priority; } }
+
+		public string Name { get { return commonName; } }
+
+		public InstallShieldCABExtractor(string hdrFilename, int priority = -1)
+		{
+			var fileGroups = new List<FileGroup>();
+			var fileGroupOffsets = new List<uint>();
+
+			this.priority = priority;
+			hdrFile = GlobalFileSystem.Open(hdrFilename);
+
+			// Strips archive number AND file extension
+			commonName = Regex.Replace(hdrFilename, @"\d*\.[^\.]*$", "");
+			var signature = hdrFile.ReadUInt32();
+
+			if (signature != 0x28635349)
+				throw new InvalidDataException("Not an Installshield CAB package");
+
+			commonHeader = new CommonHeader(hdrFile);
+			cabDescriptor = new CabDescriptor(hdrFile, commonHeader);
+			/*    unknown   */ hdrFile.ReadBytes(14);
+
+			for (var i = 0U; i < MaxFileGroupCount; ++i)
+				fileGroupOffsets.Add(hdrFile.ReadUInt32());
+
+			hdrFile.Seek(commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset, SeekOrigin.Begin);
+			directoryTable = new List<uint>();
+
+			for (var i = 0U; i < cabDescriptor.DirectoryCount; ++i)
+				directoryTable.Add(hdrFile.ReadUInt32());
+
+			foreach (var offset in fileGroupOffsets)
+			{
+				var nextOffset = offset;
+				while (nextOffset != 0)
+				{
+					hdrFile.Seek((long)nextOffset + 4 + commonHeader.CabDescriptorOffset, SeekOrigin.Begin);
+					var descriptorOffset = hdrFile.ReadUInt32();
+					nextOffset = hdrFile.ReadUInt32();
+					hdrFile.Seek((long)descriptorOffset + commonHeader.CabDescriptorOffset, SeekOrigin.Begin);
+
+					fileGroups.Add(new FileGroup(hdrFile, commonHeader.CabDescriptorOffset));
+				}
+			}
+
+			hdrFile.Seek(commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset + cabDescriptor.FileTableOffset2, SeekOrigin.Begin);
+			foreach (var fileGroup in fileGroups)
+			{
+				for (var index = fileGroup.FirstFile; index <= fileGroup.LastFile; ++index)
+				{
+					AddFileDescriptorToList(index);
+					var fileDescriptor = fileDescriptors[index];
+					var fullFilePath   = "{0}\\{1}\\{2}".F(fileGroup.Name, DirectoryName((uint)fileDescriptor.DirectoryIndex), fileDescriptor.Filename);
+					fileLookup.Add(fullFilePath, index);
+				}
+			}
+		}
+
+		public string DirectoryName(uint index)
+		{
+			if (directoryNames.ContainsKey(index))
+				return directoryNames[index];
+
+			hdrFile.Seek(commonHeader.CabDescriptorOffset +
+					cabDescriptor.FileTableOffset +
+					directoryTable[(int)index],
+					SeekOrigin.Begin);
+
+			var test = hdrFile.ReadASCIIZ();
+			return test;
+		}
+
+		public bool Exists(string filename)
+		{
+			return fileLookup.ContainsKey(filename);
+		}
+
+		public uint DirectoryCount()
+		{
+			return cabDescriptor.DirectoryCount;
+		}
+
+		public string FileName(uint index)
+		{
+			if (!fileDescriptors.ContainsKey(index))
+				AddFileDescriptorToList(index);
+
+			return fileDescriptors[index].Filename;
+		}
+
+		void AddFileDescriptorToList(uint index)
+		{
+			hdrFile.Seek(commonHeader.CabDescriptorOffset +
+					cabDescriptor.FileTableOffset +
+					cabDescriptor.FileTableOffset2 +
+					index * 0x57,
+					SeekOrigin.Begin);
+
+			var fd = new FileDescriptor(hdrFile,
+				commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset);
+
+			fileDescriptors.Add(index, fd);
+		}
+
+		public uint FileCount()
+		{
+			return cabDescriptor.FileCount;
+		}
+
+		public void ExtractFile(uint index, string fileName)
+		{
+			using (var destfile = File.Open(fileName, FileMode.Create))
+				GetContentById(index, destfile);
+		}
+
+		public void Write(Dictionary<string, byte[]> input)
+		{
+			throw new NotImplementedException("Cannot Add Files To Cab");
+		}
+
+		public IEnumerable<uint> ClassicHashes()
+		{
+			return fileLookup.Keys.Select(k => PackageEntry.HashFilename(k, PackageHashType.Classic));
+		}
+
+		public Stream GetContentById(uint index)
+		{
+			var fileDes = fileDescriptors[index];
+			if ((fileDes.Flags & FileInvalid) != 0)
+				throw new Exception("File Invalid");
+
+			if ((fileDes.LinkFlags & LinkPrev) != 0)
+				return GetContentById(fileDes.LinkToPrevious);
+
+			if ((fileDes.Flags & FileObfuscated) != 0)
+				throw new NotImplementedException("Haven't implemented obfustcated files");
+
+			var output = new MemoryStream((int)fileDes.ExpandedSize);
+
+			using (var reader = new CabReader(fileDes, index, commonName))
+				reader.CopyTo(output);
+
+			if (output.Length != fileDes.ExpandedSize)
+				throw new Exception("Did not fully extract Expected = {0}, Got = {1}".F(fileDes.ExpandedSize, output.Length));
+
+			output.Position = 0;
+			return output;
+		}
+
+		public void GetContentById(uint index, Stream output)
+		{
+			var fileDes = fileDescriptors[index];
+			if ((fileDes.Flags & FileInvalid) != 0)
+				throw new Exception("File Invalid");
+
+			if ((fileDes.LinkFlags & LinkPrev) != 0)
+			{
+				GetContentById(fileDes.LinkToPrevious, output);
+				return;
+			}
+
+			if ((fileDes.Flags & FileObfuscated) != 0)
+				throw new NotImplementedException("Haven't implemented obfustcated files");
+
+			using (var reader = new CabReader(fileDes, index, commonName))
+				reader.CopyTo(output);
+
+			if (output.Length != fileDes.ExpandedSize)
+				throw new Exception("Did not fully extract Expected = {0}, Got = {1}".F(fileDes.ExpandedSize, output.Length));
+		}
+
+		public Stream GetContent(string fileName)
+		{
+			return GetContentById(fileLookup[fileName]);
+		}
+
+		public IEnumerable<uint> CrcHashes()
+		{
+			yield break;
+		}
+
+		public IEnumerable<string> AllFileNames()
+		{
+			return fileLookup.Keys;
+		}
+
+		public void Dispose()
+		{
+			hdrFile.Dispose();
+		}
+	}
+}

OpenRA.Game/FileSystem/InstallShieldPackage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -15,7 +15,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.FileSystem
 {
-	public class InstallShieldPackage : IFolder
+	public sealed class InstallShieldPackage : IFolder
 	{
 		readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
 		readonly List<string> filenames;
@@ -28,72 +28,81 @@ namespace OpenRA.FileSystem
 		{
 			this.filename = filename;
 			this.priority = priority;
+
 			filenames = new List<string>();
+
 			s = GlobalFileSystem.Open(filename);
+			try
+			{
+				// Parse package header
+				var reader = new BinaryReader(s);
+				var signature = reader.ReadUInt32();
+				if (signature != 0x8C655D13)
+					throw new InvalidDataException("Not an Installshield package");
 
-			// Parse package header
-			var reader = new BinaryReader(s);
-			var 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();
 
-			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);
+				var tocReader = new BinaryReader(s);
 
-			// Parse the directory list
-			s.Seek(TOCAddress, SeekOrigin.Begin);
-			var TOCreader = new BinaryReader(s);
+				var fileCountInDirs = new List<uint>();
 
-			var fileCountInDirs = new List<uint>();
-			// Parse directories
-			for (var i = 0; i < DirCount; i++)
-				fileCountInDirs.Add(ParseDirectory(TOCreader));
-
-			// Parse files
-			foreach (var fileCount in fileCountInDirs)
-				for (var i = 0; i < fileCount; i++)
-					ParseFile(reader);
+				// Parse directories
+				for (var i = 0; i < dirCount; i++)
+					fileCountInDirs.Add(ParseDirectory(tocReader));
 
+				// Parse files
+				foreach (var fileCount in fileCountInDirs)
+					for (var i = 0; i < fileCount; i++)
+						ParseFile(reader);
+			}
+			catch
+			{
+				Dispose();
+				throw;
+			}
 		}
 
 		static uint 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));
+			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);
-			return FileCount;
+			reader.ReadBytes(chunkSize - nameLength - 6);
+			return fileCount;
 		}
 
-		uint AccumulatedData = 0;
+		uint accumulatedData = 0;
 		void ParseFile(BinaryReader reader)
 		{
 			reader.ReadBytes(7);
-			var CompressedSize = reader.ReadUInt32();
+			var compressedSize = reader.ReadUInt32();
 			reader.ReadBytes(12);
-			var ChunkSize = reader.ReadUInt16();
+			var chunkSize = reader.ReadUInt16();
 			reader.ReadBytes(4);
-			var NameLength = reader.ReadByte();
-			var FileName = new String(reader.ReadChars(NameLength));
+			var nameLength = reader.ReadByte();
+			var fileName = new string(reader.ReadChars(nameLength));
 
-			var hash = PackageEntry.HashFilename(FileName, PackageHashType.Classic);
+			var hash = PackageEntry.HashFilename(fileName, PackageHashType.Classic);
 			if (!index.ContainsKey(hash))
-				index.Add(hash, new PackageEntry(hash,AccumulatedData, CompressedSize));
-			filenames.Add(FileName);
-			AccumulatedData += CompressedSize;
+				index.Add(hash, new PackageEntry(hash, accumulatedData, compressedSize));
+			filenames.Add(fileName);
+			accumulatedData += compressedSize;
 
 			// Skip to the end of the chunk
-			reader.ReadBytes(ChunkSize - NameLength - 30);
+			reader.ReadBytes(chunkSize - nameLength - 30);
 		}
 
 		public Stream GetContent(uint hash)
@@ -133,12 +142,17 @@ namespace OpenRA.FileSystem
 			return index.ContainsKey(PackageEntry.HashFilename(filename, PackageHashType.Classic));
 		}
 
-		public int Priority { get { return 2000 + priority; }}
+		public int Priority { get { return 2000 + priority; } }
 		public string Name { get { return filename; } }
 
 		public void Write(Dictionary<string, byte[]> contents)
 		{
 			throw new NotImplementedException("Cannot save InstallShieldPackages.");
 		}
+
+		public void Dispose()
+		{
+			s.Dispose();
+		}
 	}
 }

OpenRA.Game/FileSystem/MixFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -17,7 +17,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class MixFile : IFolder, IDisposable
+	public sealed class MixFile : IFolder
 	{
 		readonly Dictionary<uint, PackageEntry> index;
 		readonly long dataStart;
@@ -37,9 +37,17 @@ namespace OpenRA.FileSystem
 				File.Delete(filename);
 
 			s = File.Create(filename);
-			index = new Dictionary<uint, PackageEntry>();
-			contents.Add("local mix database.dat", new XccLocalDatabase(contents.Keys.Append("local mix database.dat")).Data());
-			Write(contents);
+			try
+			{
+				index = new Dictionary<uint, PackageEntry>();
+				contents.Add("local mix database.dat", new XccLocalDatabase(contents.Keys.Append("local mix database.dat")).Data());
+				Write(contents);
+			}
+			catch
+			{
+				Dispose();
+				throw;
+			}
 		}
 
 		public MixFile(string filename, PackageHashType type, int priority)
@@ -47,30 +55,36 @@ namespace OpenRA.FileSystem
 			this.filename = filename;
 			this.priority = priority;
 			this.type = type;
+
 			s = GlobalFileSystem.Open(filename);
-
-			// Detect format type
-			s.Seek(0, SeekOrigin.Begin);
-			var isCncMix = s.ReadUInt16() != 0;
-
-			// The C&C mix format doesn't contain any flags or encryption
-			var isEncrypted = false;
-			if (!isCncMix)
-				isEncrypted = (s.ReadUInt16() & 0x2) != 0;
-
-			List<PackageEntry> entries;
-			if (isEncrypted)
+			try
 			{
-				long unused;
-				entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out unused);
-			}
-			else
-				entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
+				// Detect format type
+				var isCncMix = s.ReadUInt16() != 0;
 
-			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
-				"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, (isCncMix ? "C&C" : "RA/TS/RA2"), isEncrypted, dataStart),
-				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
-			);
+				// The C&C mix format doesn't contain any flags or encryption
+				var isEncrypted = false;
+				if (!isCncMix)
+					isEncrypted = (s.ReadUInt16() & 0x2) != 0;
+
+				List<PackageEntry> entries;
+				if (isEncrypted)
+				{
+					long unused;
+					entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out unused);
+				}
+				else
+					entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
+
+				index = entries.ToDictionaryWithConflictLog(x => x.Hash,
+					"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, isCncMix ? "C&C" : "RA/TS/RA2", isEncrypted, dataStart),
+					null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
+			}
+			catch (Exception)
+			{
+				Dispose();
+				throw;
+			}
 		}
 
 		static List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
@@ -83,7 +97,7 @@ namespace OpenRA.FileSystem
 			for (var i = 0; i < numFiles; i++)
 				items.Add(new PackageEntry(s));
 
-			headerEnd = offset + 6 + numFiles*PackageEntry.Size;
+			headerEnd = offset + 6 + numFiles * PackageEntry.Size;
 			return items;
 		}
 
@@ -101,8 +115,8 @@ namespace OpenRA.FileSystem
 			var numFiles = ms.ReadUInt16();
 
 			// Decrypt the full header - round bytes up to a full block
-			var blockCount = (13 + numFiles*PackageEntry.Size)/8;
-			headerEnd = offset + 80 + blockCount*8;
+			var blockCount = (13 + numFiles * PackageEntry.Size) / 8;
+			headerEnd = offset + 80 + blockCount * 8;
 
 			return Decrypt(ReadBlocks(s, offset + 80, blockCount), fish);
 		}
@@ -113,7 +127,7 @@ namespace OpenRA.FileSystem
 
 			var ms = new MemoryStream();
 			var writer = new BinaryWriter(ms);
-			foreach(var t in decrypted)
+			foreach (var t in decrypted)
 				writer.Write(t);
 			writer.Flush();
 
@@ -123,10 +137,19 @@ namespace OpenRA.FileSystem
 
 		static uint[] ReadBlocks(Stream s, long offset, int count)
 		{
+			if (offset < 0)
+				throw new ArgumentOutOfRangeException("offset", "Non-negative number required.");
+
+			if (count < 0)
+				throw new ArgumentOutOfRangeException("count", "Non-negative number required.");
+
+			if (offset + (count * 2) > s.Length)
+				throw new ArgumentException("Bytes to read {0} and offset {1} greater than stream length {2}.".F(count * 2, offset, s.Length));
+
 			s.Seek(offset, SeekOrigin.Begin);
 
 			// A block is a single encryption unit (represented as two 32-bit integers)
-			var ret = new uint[2*count];
+			var ret = new uint[2 * count];
 			for (var i = 0; i < ret.Length; i++)
 				ret[i] = s.ReadUInt32();
 
@@ -167,7 +190,7 @@ namespace OpenRA.FileSystem
 			return hash.HasValue ? GetContent(hash.Value) : null;
 		}
 
-		static readonly uint[] Nothing = {};
+		static readonly uint[] Nothing = { };
 		public IEnumerable<uint> ClassicHashes()
 		{
 			if (type == PackageHashType.Classic)
@@ -219,7 +242,7 @@ namespace OpenRA.FileSystem
 
 		public int Priority { get { return 1000 + priority; } }
 		public string Name { get { return filename; } }
-		
+
 		public void Write(Dictionary<string, byte[]> contents)
 		{
 			// Cannot modify existing mixfile - rename existing file and
@@ -261,8 +284,7 @@ namespace OpenRA.FileSystem
 
 		public void Dispose()
 		{
-			if (s != null)
-				s.Dispose();
+			s.Dispose();
 		}
 	}
 }

OpenRA.Game/FileSystem/PackageEntry.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -20,6 +20,7 @@ namespace OpenRA.FileSystem
 
 	public class PackageEntry
 	{
+		public const int Size = 12;
 		public readonly uint Hash;
 		public readonly uint Offset;
 		public readonly uint Length;
@@ -48,7 +49,7 @@ namespace OpenRA.FileSystem
 		public override string ToString()
 		{
 			string filename;
-			if (Names.TryGetValue(Hash, out filename))
+			if (names.TryGetValue(Hash, out filename))
 				return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(filename, Offset, Length);
 			else
 				return "0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}".F(Hash, Offset, Length);
@@ -56,55 +57,54 @@ namespace OpenRA.FileSystem
 
 		public static uint HashFilename(string name, PackageHashType type)
 		{
-			switch(type)
+			switch (type)
 			{
-			case PackageHashType.Classic:
-				{
-					name = name.ToUpperInvariant();
-					if (name.Length % 4 != 0)
-						name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');
-
-					var ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
-					var reader = new BinaryReader(ms);
-
-					var len = name.Length >> 2;
-					uint result = 0;
-
-					while (len-- != 0)
-						result = ((result << 1) | (result >> 31)) + reader.ReadUInt32();
-
-					return result;
-				}
-
-			case PackageHashType.CRC32:
-				{
-					name = name.ToUpperInvariant();
-					var l = name.Length;
-					var a = l >> 2;
-					if ((l & 3) != 0)
+				case PackageHashType.Classic:
 					{
-						name += (char)(l - (a << 2));
-						var i = 3 - (l & 3);
-						while (i-- != 0)
-							name += name[a << 2];
-					}
-					return CRC32.Calculate(Encoding.ASCII.GetBytes(name));
-				}
+						name = name.ToUpperInvariant();
+						if (name.Length % 4 != 0)
+							name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');
 
-			default: throw new NotImplementedException("Unknown hash type `{0}`".F(type));
+						using (var ms = new MemoryStream(Encoding.ASCII.GetBytes(name)))
+						{
+							var len = name.Length >> 2;
+							uint result = 0;
+
+							while (len-- != 0)
+								result = ((result << 1) | (result >> 31)) + ms.ReadUInt32();
+
+							return result;
+						}
+					}
+
+				case PackageHashType.CRC32:
+					{
+						name = name.ToUpperInvariant();
+						var l = name.Length;
+						var a = l >> 2;
+						if ((l & 3) != 0)
+						{
+							name += (char)(l - (a << 2));
+							var i = 3 - (l & 3);
+							while (i-- != 0)
+								name += name[a << 2];
+						}
+
+						return CRC32.Calculate(Encoding.ASCII.GetBytes(name));
+					}
+
+				default: throw new NotImplementedException("Unknown hash type `{0}`".F(type));
 			}
 		}
 
-		static Dictionary<uint, string> Names = new Dictionary<uint,string>();
+		static Dictionary<uint, string> names = new Dictionary<uint, string>();
 
 		public static void AddStandardName(string s)
 		{
 			var hash = HashFilename(s, PackageHashType.Classic); // RA1 and TD
-			Names.Add(hash, s);
+			names.Add(hash, s);
 			var crcHash = HashFilename(s, PackageHashType.CRC32); // TS
-			Names.Add(crcHash, s);
+			names.Add(crcHash, s);
 		}
-
-		public const int Size = 12;
 	}
 }

OpenRA.Game/FileSystem/Pak.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -21,34 +21,42 @@ namespace OpenRA.FileSystem
 		public string Filename;
 	}
 
-	public class PakFile : IFolder
+	public sealed class PakFile : IFolder
 	{
-		string filename;
-		int priority;
-		Dictionary<string, Entry> index;
-		Stream stream;
+		readonly string filename;
+		readonly int priority;
+		readonly Dictionary<string, Entry> index;
+		readonly Stream stream;
 
 		public PakFile(string filename, int priority)
 		{
 			this.filename = filename;
 			this.priority = priority;
 			index = new Dictionary<string, Entry>();
+
 			stream = GlobalFileSystem.Open(filename);
-
-			index = new Dictionary<string, Entry>();
-			var offset = stream.ReadUInt32();
-			while (offset != 0)
+			try
 			{
-				var file = stream.ReadASCIIZ();
-				var next = stream.ReadUInt32();
-				var length = (next == 0 ? (uint)stream.Length : next) - offset;
+				index = new Dictionary<string, Entry>();
+				var offset = stream.ReadUInt32();
+				while (offset != 0)
+				{
+					var file = stream.ReadASCIIZ();
+					var next = stream.ReadUInt32();
+					var length = (next == 0 ? (uint)stream.Length : next) - offset;
 
-				// Ignore duplicate files
-				if (index.ContainsKey(file))
-					continue;
+					// Ignore duplicate files
+					if (index.ContainsKey(file))
+						continue;
 
-				index.Add(file, new Entry { Offset = offset, Length = length, Filename = file });
-				offset = next;
+					index.Add(file, new Entry { Offset = offset, Length = length, Filename = file });
+					offset = next;
+				}
+			}
+			catch
+			{
+				Dispose();
+				throw;
 			}
 		}
 
@@ -92,5 +100,10 @@ namespace OpenRA.FileSystem
 
 		public int Priority { get { return 1000 + priority; } }
 		public string Name { get { return filename; } }
+
+		public void Dispose()
+		{
+			stream.Dispose();
+		}
 	}
 }

OpenRA.Game/FileSystem/ZipFile.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -17,11 +17,11 @@ using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class ZipFile : IFolder, IDisposable
+	public sealed class ZipFile : IFolder
 	{
-		string filename;
+		readonly string filename;
+		readonly int priority;
 		SZipFile pkg;
-		int priority;
 
 		static ZipFile()
 		{
@@ -58,7 +58,11 @@ namespace OpenRA.FileSystem
 
 		public Stream GetContent(string filename)
 		{
-			using (var z = pkg.GetInputStream(pkg.GetEntry(filename)))
+			var entry = pkg.GetEntry(filename);
+			if (entry == null)
+				return null;
+
+			using (var z = pkg.GetInputStream(entry))
 			{
 				var ms = new MemoryStream();
 				z.CopyTo(ms);

OpenRA.Game/Game.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -11,11 +11,11 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading;
-using MaxMind.GeoIP2;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Network;
@@ -27,13 +27,16 @@ namespace OpenRA
 {
 	public static class Game
 	{
-		public static MouseButtonPreference mouseButtonPreference = new MouseButtonPreference();
+		public const int NetTickScale = 3; // 120 ms net tick for 40 ms local tick
+		public const int Timestep = 40;
+		public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
 
-		public static ModData modData;
+		public static ModData ModData;
 		public static Settings Settings;
+		public static ICursor Cursor;
 		static WorldRenderer worldRenderer;
 
-		internal static OrderManager orderManager;
+		internal static OrderManager OrderManager;
 		static Server.Server server;
 
 		public static MersenneTwister CosmeticRandom = new MersenneTwister(); // not synced
@@ -41,30 +44,28 @@ namespace OpenRA
 		public static Renderer Renderer;
 		public static bool HasInputFocus = false;
 
-		public static DatabaseReader GeoIpDatabase;
-
 		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
 			IConnection connection = new NetworkConnection(host, port);
 			if (recordReplay)
-				connection = new ReplayRecorderConnection(connection, ChooseReplayFilename);
+				connection = new ReplayRecorderConnection(connection, TimestampedFilename);
 
 			var om = new OrderManager(host, port, password, connection);
 			JoinInner(om);
 			return om;
 		}
 
-		static string ChooseReplayFilename()
+		static string TimestampedFilename()
 		{
 			return DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddTHHmmssZ");
 		}
 
 		static void JoinInner(OrderManager om)
 		{
-			if (orderManager != null) orderManager.Dispose();
-			orderManager = om;
+			if (OrderManager != null) OrderManager.Dispose();
+			OrderManager = om;
 			lastConnectionState = ConnectionState.PreConnecting;
-			ConnectionStateChanged(orderManager);
+			ConnectionStateChanged(OrderManager);
 		}
 
 		public static void JoinReplay(string replayFile)
@@ -82,20 +83,23 @@ namespace OpenRA
 		public static int RunTime { get { return (int)Game.stopwatch.ElapsedMilliseconds; } }
 
 		public static int RenderFrame = 0;
-		public static int NetFrameNumber { get { return orderManager.NetFrameNumber; } }
-		public static int LocalTick { get { return orderManager.LocalFrameNumber; } }
-		public const int NetTickScale = 3; // 120 ms net tick for 40 ms local tick
-		public const int Timestep = 40;
-		public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
+		public static int NetFrameNumber { get { return OrderManager.NetFrameNumber; } }
+		public static int LocalTick { get { return OrderManager.LocalFrameNumber; } }
 
+		public static event Action<string, int> OnRemoteDirectConnect = (a, b) => { };
 		public static event Action<OrderManager> ConnectionStateChanged = _ => { };
 		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
-		public static int LocalClientId { get { return orderManager.Connection.LocalClientId; } }
+		public static int LocalClientId { get { return OrderManager.Connection.LocalClientId; } }
+
+		public static void RemoteDirectConnect(string host, int port)
+		{
+			OnRemoteDirectConnect(host, port);
+		}
 
 		// Hacky workaround for orderManager visibility
 		public static Widget OpenWindow(World world, string widget)
 		{
-			return Ui.OpenWindow(widget, new WidgetArgs() { { "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer } });
+			return Ui.OpenWindow(widget, new WidgetArgs() { { "world", world }, { "orderManager", OrderManager }, { "worldRenderer", worldRenderer } });
 		}
 
 		// Who came up with the great idea of making these things
@@ -104,8 +108,8 @@ namespace OpenRA
 		{
 			return Ui.OpenWindow(widget, new WidgetArgs(args)
 			{
-				{ "world", worldRenderer.world },
-				{ "orderManager", orderManager },
+				{ "world", worldRenderer.World },
+				{ "orderManager", OrderManager },
 				{ "worldRenderer", worldRenderer },
 			});
 		}
@@ -113,10 +117,10 @@ namespace OpenRA
 		// Load a widget with world, orderManager, worldRenderer args, without adding it to the widget tree
 		public static Widget LoadWidget(World world, string id, Widget parent, WidgetArgs args)
 		{
-			return modData.WidgetLoader.LoadWidget(new WidgetArgs(args)
+			return ModData.WidgetLoader.LoadWidget(new WidgetArgs(args)
 			{
 				{ "world", world },
-				{ "orderManager", orderManager },
+				{ "orderManager", OrderManager },
 				{ "worldRenderer", worldRenderer },
 			}, parent, id);
 		}
@@ -129,33 +133,38 @@ namespace OpenRA
 		}
 
 		public static event Action BeforeGameStart = () => { };
-		internal static void StartGame(string mapUID, bool isShellmap)
+		internal static void StartGame(string mapUID, WorldType type)
 		{
+			// Dispose of the old world before creating a new one.
+			if (worldRenderer != null)
+				worldRenderer.Dispose();
+
+			Cursor.SetCursor(null);
 			BeforeGameStart();
 
 			Map map;
 
 			using (new PerfTimer("PrepareMap"))
-				map = modData.PrepareMap(mapUID);
+				map = ModData.PrepareMap(mapUID);
 			using (new PerfTimer("NewWorld"))
-			{
-				orderManager.world = new World(map, orderManager, isShellmap);
-				orderManager.world.Timestep = Timestep;
-			}
-			worldRenderer = new WorldRenderer(orderManager.world);
-			using (new PerfTimer("LoadComplete"))
-				orderManager.world.LoadComplete(worldRenderer);
+				OrderManager.World = new World(map, OrderManager, type) { Timestep = Timestep };
 
-			if (orderManager.GameStarted)
+			worldRenderer = new WorldRenderer(OrderManager.World);
+
+			using (new PerfTimer("LoadComplete"))
+				OrderManager.World.LoadComplete(worldRenderer);
+
+			if (OrderManager.GameStarted)
 				return;
 
 			Ui.MouseFocusWidget = null;
 			Ui.KeyboardFocusWidget = null;
 
-			orderManager.LocalFrameNumber = 0;
-			orderManager.LastTickTime = RunTime;
-			orderManager.StartGame();
+			OrderManager.LocalFrameNumber = 0;
+			OrderManager.LastTickTime = RunTime;
+			OrderManager.StartGame();
 			worldRenderer.RefreshPalette();
+			Cursor.SetCursor("default");
 
 			GC.Collect();
 		}
@@ -164,8 +173,8 @@ namespace OpenRA
 		{
 			get
 			{
-				var id = orderManager.Connection.LocalClientId;
-				var client = orderManager.LobbyInfo.ClientWithIndex(id);
+				var id = OrderManager.Connection.LocalClientId;
+				var client = OrderManager.LobbyInfo.ClientWithIndex(id);
 				return client != null && client.IsAdmin;
 			}
 		}
@@ -174,15 +183,19 @@ namespace OpenRA
 		public static Modifiers GetModifierKeys() { return modifiers; }
 		internal static void HandleModifierKeys(Modifiers mods) { modifiers = mods; }
 
+		public static void InitializeSettings(Arguments args)
+		{
+			Settings = new Settings(Platform.ResolvePath("^", "settings.yaml"), args);
+		}
+
 		internal static void Initialize(Arguments args)
 		{
 			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
 
 			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
 
-			Settings = new Settings(Platform.ResolvePath("^", "settings.yaml"), args);
+			InitializeSettings(args);
 
-			Log.LogPath = Platform.ResolvePath("^", "Logs");
 			Log.AddChannel("perf", "perf.log");
 			Log.AddChannel("debug", "debug.log");
 			Log.AddChannel("sync", "syncreport.log");
@@ -199,14 +212,7 @@ namespace OpenRA
 				Settings.Server.AllowPortForward = false;
 			}
 
-			try
-			{
-				GeoIpDatabase = new DatabaseReader("GeoLite2-Country.mmdb");
-			}
-			catch (Exception e)
-			{
-				Log.Write("geoip", "DatabaseReader failed: {0}", e);
-			}
+			GeoIP.Initialize();
 
 			GlobalFileSystem.Mount(Platform.GameDir); // Needed to access shaders
 			var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", null };
@@ -218,7 +224,7 @@ namespace OpenRA
 				Settings.Graphics.Renderer = r;
 				try
 				{
-					Renderer.Initialize(Settings.Graphics.Mode);
+					Renderer = new Renderer(Settings.Graphics, Settings.Server);
 					break;
 				}
 				catch (Exception e)
@@ -228,8 +234,6 @@ namespace OpenRA
 				}
 			}
 
-			Renderer = new Renderer();
-
 			try
 			{
 				Sound.Create(Settings.Sound.Engine);
@@ -258,13 +262,22 @@ namespace OpenRA
 			LobbyInfoChanged = () => { };
 			ConnectionStateChanged = om => { };
 			BeforeGameStart = () => { };
+			OnRemoteDirectConnect = (a, b) => { };
+			delayedActions = new ActionQueue();
+
 			Ui.ResetAll();
 
+			if (worldRenderer != null)
+				worldRenderer.Dispose();
 			worldRenderer = null;
 			if (server != null)
 				server.Shutdown();
-			if (orderManager != null)
-				orderManager.Dispose();
+			if (OrderManager != null)
+				OrderManager.Dispose();
+
+			if (ModData != null)
+				ModData.Dispose();
+			ModData = null;
 
 			// Fall back to default if the mod doesn't exist
 			if (!ModMetadata.AllMods.ContainsKey(mod))
@@ -273,20 +286,45 @@ namespace OpenRA
 			Console.WriteLine("Loading mod: {0}", mod);
 			Settings.Game.Mod = mod;
 
-			Sound.StopMusic();
 			Sound.StopVideo();
 			Sound.Initialize();
 
-			modData = new ModData(mod);
-			Renderer.InitializeFonts(modData.Manifest);
-			modData.InitializeLoaders();
-			using (new PerfTimer("LoadMaps"))
-				modData.MapCache.LoadMaps();
+			ModData = new ModData(mod, !Settings.Server.Dedicated);
+			ModData.InitializeLoaders();
+			if (!Settings.Server.Dedicated)
+				Renderer.InitializeFonts(ModData.Manifest);
 
-			PerfHistory.items["render"].hasNormalTick = false;
-			PerfHistory.items["batches"].hasNormalTick = false;
-			PerfHistory.items["render_widgets"].hasNormalTick = false;
-			PerfHistory.items["render_flip"].hasNormalTick = false;
+			using (new PerfTimer("LoadMaps"))
+				ModData.MapCache.LoadMaps();
+
+			if (Cursor != null)
+				Cursor.Dispose();
+
+			if (Settings.Graphics.HardwareCursors)
+			{
+				try
+				{
+					Cursor = new HardwareCursor(ModData.CursorProvider);
+				}
+				catch (Exception e)
+				{
+					Log.Write("debug", "Failed to initialize hardware cursors. Falling back to software cursors.");
+					Log.Write("debug", "Error was: " + e.Message);
+
+					Console.WriteLine("Failed to initialize hardware cursors. Falling back to software cursors.");
+					Console.WriteLine("Error was: " + e.Message);
+
+					Cursor = new SoftwareCursor(ModData.CursorProvider);
+					Settings.Graphics.HardwareCursors = false;
+				}
+			}
+			else
+				Cursor = new SoftwareCursor(ModData.CursorProvider);
+
+			PerfHistory.Items["render"].HasNormalTick = false;
+			PerfHistory.Items["batches"].HasNormalTick = false;
+			PerfHistory.Items["render_widgets"].HasNormalTick = false;
+			PerfHistory.Items["render_flip"].HasNormalTick = false;
 
 			JoinLocal();
 
@@ -312,7 +350,7 @@ namespace OpenRA
 					if (Settings.Server.DedicatedLoop)
 					{
 						Console.WriteLine("Starting a new server instance...");
-						modData.MapCache.LoadMaps();
+						ModData.MapCache.LoadMaps();
 						continue;
 					}
 
@@ -322,45 +360,12 @@ namespace OpenRA
 				Environment.Exit(0);
 			}
 			else
-			{
-				var window = args != null ? args.GetValue("Launch.Window", null) : null;
-				if (!string.IsNullOrEmpty(window))
-				{
-					var installData = modData.Manifest.ContentInstaller;
-					if (installData.InstallerBackgroundWidget != null)
-						Ui.LoadWidget(installData.InstallerBackgroundWidget, Ui.Root, new WidgetArgs());
-
-					Widgets.Ui.OpenWindow(window, new WidgetArgs());
-				}
-				else
-				{
-					modData.LoadScreen.StartGame();
-					Settings.Save();
-					var replay = args != null ? args.GetValue("Launch.Replay", null) : null;
-					if (!string.IsNullOrEmpty(replay))
-						Game.JoinReplay(replay);
-				}
-			}
+				ModData.LoadScreen.StartGame(args);
 		}
 
-		public static void TestAndContinue()
+		public static void LoadEditor(string mapUid)
 		{
-			Ui.ResetAll();
-			var installData = modData.Manifest.ContentInstaller;
-			if (!installData.TestFiles.All(f => GlobalFileSystem.Exists(f)))
-			{
-				var args = new WidgetArgs()
-				{
-					{ "continueLoading", () => InitializeMod(Game.Settings.Game.Mod, null) },
-				};
-
-				if (installData.InstallerBackgroundWidget != null)
-					Ui.LoadWidget(installData.InstallerBackgroundWidget, Ui.Root, args);
-
-				Ui.OpenWindow(installData.InstallerMenuWidget, args);
-			}
-			else
-				LoadShellMap();
+			StartGame(mapUid, WorldType.Editor);
 		}
 
 		public static void LoadShellMap()
@@ -368,13 +373,13 @@ namespace OpenRA
 			var shellmap = ChooseShellmap();
 
 			using (new PerfTimer("StartGame"))
-				StartGame(shellmap, true);
+				StartGame(shellmap, WorldType.Shellmap);
 		}
 
 		static string ChooseShellmap()
 		{
-			var shellmaps = modData.MapCache
-				.Where(m => m.Status == MapStatus.Available && m.Map.UseAsShellmap)
+			var shellmaps = ModData.MapCache
+				.Where(m => m.Status == MapStatus.Available && m.Map.Visibility.HasFlag(MapVisibility.Shellmap))
 				.Select(m => m.Uid);
 
 			if (!shellmaps.Any())
@@ -392,13 +397,40 @@ namespace OpenRA
 		public static void RunAfterTick(Action a) { delayedActions.Add(a); }
 		public static void RunAfterDelay(int delay, Action a) { delayedActions.Add(a, delay); }
 
-		static float cursorFrame = 0f;
+		static void TakeScreenshotInner()
+		{
+			Log.Write("debug", "Taking screenshot");
+
+			Bitmap bitmap;
+			using (new PerfTimer("Renderer.TakeScreenshot"))
+				bitmap = Renderer.TakeScreenshot();
+
+			ThreadPool.QueueUserWorkItem(_ =>
+			{
+				var mod = ModData.Manifest.Mod;
+				var directory = Platform.ResolvePath("^", "Screenshots", mod.Id, mod.Version);
+				Directory.CreateDirectory(directory);
+
+				var filename = TimestampedFilename();
+				var format = Settings.Graphics.ScreenshotFormat;
+				var extension = ImageCodecInfo.GetImageEncoders().FirstOrDefault(x => x.FormatID == format.Guid)
+					.FilenameExtension.Split(';').First().ToLowerInvariant().Substring(1);
+				var destination = Path.Combine(directory, string.Concat(filename, extension));
+
+				using (new PerfTimer("Save Screenshot ({0})".F(format)))
+					bitmap.Save(destination, format);
+
+				bitmap.Dispose();
+
+				Game.RunAfterTick(() => Debug("Saved screenshot " + filename));
+			});
+		}
 
 		static void InnerLogicTick(OrderManager orderManager)
 		{
 			var tick = RunTime;
 
-			var world = orderManager.world;
+			var world = orderManager.World;
 
 			var uiTickDelta = tick - Ui.LastTickTime;
 			if (uiTickDelta >= Timestep)
@@ -410,11 +442,11 @@ namespace OpenRA
 				Viewport.TicksSinceLastMove += uiTickDelta / Timestep;
 
 				Sync.CheckSyncUnchanged(world, Ui.Tick);
-				cursorFrame += 0.5f;
+				Cursor.Tick();
 			}
 
 			var worldTimestep = world == null ? Timestep : world.Timestep;
-			var worldTickDelta = (tick - orderManager.LastTickTime);
+			var worldTickDelta = tick - orderManager.LastTickTime;
 			if (worldTimestep != 0 && worldTickDelta >= worldTimestep)
 			{
 				using (new PerfSample("tick_time"))
@@ -423,7 +455,6 @@ namespace OpenRA
 					//    If dt < TickJankThreshold then we should try and catch up by repeatedly ticking
 					//    If dt >= TickJankThreshold then we should accept the jank and progress at the normal rate
 					// dt is rounded down to an integer tick count in order to preserve fractional tick components.
-
 					var integralTickTimestep = (worldTickDelta / worldTimestep) * worldTimestep;
 					orderManager.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : worldTimestep;
 
@@ -467,17 +498,19 @@ namespace OpenRA
 		{
 			delayedActions.PerformActions();
 
-			if (orderManager.Connection.ConnectionState != lastConnectionState)
+			if (OrderManager.Connection.ConnectionState != lastConnectionState)
 			{
-				lastConnectionState = orderManager.Connection.ConnectionState;
-				ConnectionStateChanged(orderManager);
+				lastConnectionState = OrderManager.Connection.ConnectionState;
+				ConnectionStateChanged(OrderManager);
 			}
 
-			InnerLogicTick(orderManager);
-			if (worldRenderer != null && orderManager.world != worldRenderer.world)
-				InnerLogicTick(worldRenderer.world.orderManager);
+			InnerLogicTick(OrderManager);
+			if (worldRenderer != null && OrderManager.World != worldRenderer.World)
+				InnerLogicTick(worldRenderer.World.OrderManager);
 		}
 
+		public static bool TakeScreenshot = false;
+
 		static void RenderTick()
 		{
 			using (new PerfSample("render"))
@@ -488,7 +521,7 @@ namespace OpenRA
 				if (worldRenderer != null)
 				{
 					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.Zoom);
-					Sound.SetListenerPosition(worldRenderer.Position(worldRenderer.Viewport.CenterLocation));
+					Sound.SetListenerPosition(worldRenderer.Viewport.CenterPosition);
 					worldRenderer.Draw();
 				}
 				else
@@ -496,23 +529,33 @@ namespace OpenRA
 
 				using (new PerfSample("render_widgets"))
 				{
+					Game.Renderer.WorldVoxelRenderer.BeginFrame();
+					Ui.PrepareRenderables();
+					Game.Renderer.WorldVoxelRenderer.EndFrame();
+
 					Ui.Draw();
 
-					if (modData != null && modData.CursorProvider != null)
+					if (ModData != null && ModData.CursorProvider != null)
 					{
-						var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-						modData.CursorProvider.DrawCursor(Renderer, cursorName, Viewport.LastMousePos, (int)cursorFrame);
+						Cursor.SetCursor(Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default");
+						Cursor.Render(Renderer);
 					}
 				}
 
 				using (new PerfSample("render_flip"))
-					Renderer.EndFrame(new DefaultInputHandler(orderManager.world));
+					Renderer.EndFrame(new DefaultInputHandler(OrderManager.World));
+
+				if (TakeScreenshot)
+				{
+					TakeScreenshot = false;
+					TakeScreenshotInner();
+				}
 			}
 
-			PerfHistory.items["render"].Tick();
-			PerfHistory.items["batches"].Tick();
-			PerfHistory.items["render_widgets"].Tick();
-			PerfHistory.items["render_flip"].Tick();
+			PerfHistory.Items["render"].Tick();
+			PerfHistory.Items["batches"].Tick();
+			PerfHistory.Items["render_widgets"].Tick();
+			PerfHistory.Items["render_flip"].Tick();
 		}
 
 		static void Loop()
@@ -547,15 +590,12 @@ namespace OpenRA
 			// (if ever).
 			// This also means that the 'logicInterval' cannot be longer than this
 			// value.
-			const int maxLogicTicksBehind = 250;
+			const int MaxLogicTicksBehind = 250;
 
-			// Try to maintain at least this many FPS, even if it slows down logic.
-			// This is easily observed when playing back a replay at max speed,
-			// the frame rate will slow down to this value to allow the replay logic
-			// to run faster.
+			// Try to maintain at least this many FPS during replays, even if it slows down logic.
 			// However, if the user has enabled a framerate limit that is even lower
 			// than this, then that limit will be used.
-			const int minRenderFps = 10;
+			const int MinReplayFps = 10;
 
 			// Timestamps for when the next logic and rendering should run
 			var nextLogic = RunTime;
@@ -566,7 +606,7 @@ namespace OpenRA
 			{
 				// Ideal time between logic updates. Timestep = 0 means the game is paused
 				// but we still call LogicTick() because it handles pausing internally.
-				var logicInterval = worldRenderer != null && worldRenderer.world.Timestep != 0 ? worldRenderer.world.Timestep : Game.Timestep;
+				var logicInterval = worldRenderer != null && worldRenderer.World.Timestep != 0 ? worldRenderer.World.Timestep : Game.Timestep;
 
 				// Ideal time between screen updates
 				var maxFramerate = Settings.Graphics.CapFramerate ? Settings.Graphics.MaxFramerate.Clamp(1, 1000) : 1000;
@@ -575,43 +615,46 @@ namespace OpenRA
 				var now = RunTime;
 
 				// If the logic has fallen behind too much, skip it and catch up
-				if (now - nextLogic > maxLogicTicksBehind)
+				if (now - nextLogic > MaxLogicTicksBehind)
 					nextLogic = now;
 
 				// When's the next update (logic or render)
 				var nextUpdate = Math.Min(nextLogic, nextRender);
 				if (now >= nextUpdate)
 				{
+					var forceRender = now >= forcedNextRender;
+
 					if (now >= nextLogic)
 					{
 						nextLogic += logicInterval;
 
 						LogicTick();
+
+						// Force at least one render per tick during regular gameplay
+						if (OrderManager.World != null && !OrderManager.World.IsReplay)
+							forceRender = true;
 					}
 
 					var haveSomeTimeUntilNextLogic = now < nextLogic;
 					var isTimeToRender = now >= nextRender;
-					var forceRender = now >= forcedNextRender;
 
 					if ((isTimeToRender && haveSomeTimeUntilNextLogic) || forceRender)
 					{
 						nextRender = now + renderInterval;
 
-						// Pick the minimum allowed FPS (the lower between 'minRenderFps'
+						// Pick the minimum allowed FPS (the lower between 'minReplayFPS'
 						// and the user's max frame rate) and convert it to maximum time
 						// allowed between screen updates.
 						// We do this before rendering to include the time rendering takes
 						// in this interval.
-						var maxRenderInterval = Math.Max(1000 / minRenderFps, renderInterval);
+						var maxRenderInterval = Math.Max(1000 / MinReplayFps, renderInterval);
 						forcedNextRender = now + maxRenderInterval;
 
 						RenderTick();
 					}
 				}
 				else
-				{
 					Thread.Sleep(nextUpdate - now);
-				}
 			}
 		}
 
@@ -630,11 +673,15 @@ namespace OpenRA
 			finally
 			{
 				// Ensure that the active replay is properly saved
-				if (orderManager != null)
-					orderManager.Dispose();
+				if (OrderManager != null)
+					OrderManager.Dispose();
 			}
-				
-			Renderer.Device.Dispose();
+
+			if (worldRenderer != null)
+				worldRenderer.Dispose();
+			ModData.Dispose();
+			ChromeProvider.Deinitialize();
+			Renderer.Dispose();
 
 			OnQuit();
 
@@ -653,7 +700,7 @@ namespace OpenRA
 
 		public static void AddChatLine(Color color, string name, string text)
 		{
-			orderManager.AddChatLine(color, name, text);
+			OrderManager.AddChatLine(color, name, text);
 		}
 
 		public static void Debug(string s, params object[] args)
@@ -663,10 +710,10 @@ namespace OpenRA
 
 		public static void Disconnect()
 		{
-			if (orderManager.world != null)
-				orderManager.world.traitDict.PrintReport();
+			if (OrderManager.World != null)
+				OrderManager.World.TraitDict.PrintReport();
 
-			orderManager.Dispose();
+			OrderManager.Dispose();
 			CloseServer();
 			JoinLocal();
 		}
@@ -679,12 +726,12 @@ namespace OpenRA
 
 		public static T CreateObject<T>(string name)
 		{
-			return modData.ObjectCreator.CreateObject<T>(name);
+			return ModData.ObjectCreator.CreateObject<T>(name);
 		}
 
 		public static void CreateServer(ServerSettings settings)
 		{
-			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, modData);
+			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, ModData);
 		}
 
 		public static int CreateLocalServer(string map)
@@ -697,14 +744,14 @@ namespace OpenRA
 				AllowPortForward = false
 			};
 
-			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, modData);
+			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, ModData);
 
 			return server.Port;
 		}
 
 		public static bool IsCurrentWorld(World world)
 		{
-			return orderManager != null && orderManager.world == world;
+			return OrderManager != null && OrderManager.World == world;
 		}
 	}
 }

OpenRA.Game/GameInformation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -18,9 +18,14 @@ namespace OpenRA
 {
 	public class GameInformation
 	{
+		public string Mod;
+		public string Version;
+
 		public string MapUid;
 		public string MapTitle;
+
 		public DateTime StartTimeUtc;
+
 		// Game end timestamp (when the recoding stopped).
 		public DateTime EndTimeUtc;
 
@@ -28,7 +33,7 @@ namespace OpenRA
 		// replay recording stopped.
 		public TimeSpan Duration { get { return EndTimeUtc > StartTimeUtc ? EndTimeUtc - StartTimeUtc : TimeSpan.Zero; } }
 		public IList<Player> Players { get; private set; }
-		public MapPreview MapPreview { get { return Game.modData.MapCache[MapUid]; } }
+		public MapPreview MapPreview { get { return Game.ModData.MapCache[MapUid]; } }
 		public IEnumerable<Player> HumanPlayers { get { return Players.Where(p => p.IsHuman); } }
 		public bool IsSinglePlayer { get { return HumanPlayers.Count() == 1; } }
 
@@ -78,7 +83,7 @@ namespace OpenRA
 
 			nodes.Add(new MiniYamlNode("Root", FieldSaver.Save(this)));
 
-			for (var i=0; i<Players.Count; i++)
+			for (var i = 0; i < Players.Count; i++)
 				nodes.Add(new MiniYamlNode("Player@{0}".F(i), FieldSaver.Save(Players[i])));
 
 			return nodes.WriteToString();
@@ -108,12 +113,12 @@ namespace OpenRA
 				Name = runtimePlayer.PlayerName,
 				IsHuman = !runtimePlayer.IsBot,
 				IsBot = runtimePlayer.IsBot,
-				FactionName = runtimePlayer.Country.Name,
-				FactionId = runtimePlayer.Country.Race,
+				FactionName = runtimePlayer.Faction.Name,
+				FactionId = runtimePlayer.Faction.InternalName,
 				Color = runtimePlayer.Color,
 				Team = client.Team,
 				SpawnPoint = runtimePlayer.SpawnPoint,
-				IsRandomFaction = runtimePlayer.Country.Race != client.Country,
+				IsRandomFaction = runtimePlayer.Faction.InternalName != client.Race,
 				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint
 			};
 
@@ -133,34 +138,36 @@ namespace OpenRA
 
 		public class Player
 		{
-			//
-			// Start-up information 
-			//
-
+			// Start-up information
 			public int ClientIndex;
+
 			// The player name, not guaranteed to be unique.
 			public string Name;
 			public bool IsHuman;
 			public bool IsBot;
+
 			// The faction name (aka Country)
 			public string FactionName;
+
 			// The faction id (aka Country, aka Race)
 			public string FactionId;
 			public HSLColor Color;
+
 			// The team id on start-up, or 0 if the player is not part of the team.
 			public int Team;
 			public int SpawnPoint;
+
 			// True if the faction was chosen at random; otherwise, false
 			public bool IsRandomFaction;
+
 			// True if the spawn point was chosen at random; otherwise, false.</summary>
 			public bool IsRandomSpawnPoint;
 
-			//
 			// Information gathered at a later stage
-			//
 
 			// The game outcome for this player
 			public WinState Outcome;
+
 			// The time when this player won or lost the game
 			public DateTime OutcomeTimestampUtc;
 		}

OpenRA.Game/GameRules/ActorInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -16,28 +16,50 @@ using OpenRA.Traits;
 
 namespace OpenRA
 {
-	//TODO: This is not exported into the documentation yet.
-	[Desc("A unit/building inside the game. Every rules starts with one and adds trait to it.",
-		"Special actors like world or player are usually defined in system.yaml and affect everything.")]
+	/// <summary>
+	/// A unit/building inside the game. Every rules starts with one and adds trait to it.
+	/// </summary>
 	public class ActorInfo
 	{
-		[Desc("The actor name can be anything, but the sprites used in the Render*: traits default to this one.",
-			"If you add an ^ in front of the name, the engine will recognize this as a collection of traits",
-			"that can be inherited by others (using Inherits:) and not a real unit.",
-			"You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.")]
+		/// <summary>
+		/// The actor name can be anything, but the sprites used in the Render*: traits default to this one.
+		/// If you add an ^ in front of the name, the engine will recognize this as a collection of traits
+		/// that can be inherited by others (using Inherits:) and not a real unit.
+		/// You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.
+		/// </summary>
 		public readonly string Name;
 		public readonly TypeDictionary Traits = new TypeDictionary();
+		List<ITraitInfo> constructOrderCache = null;
 
-		public ActorInfo( string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits )
+		public ActorInfo(string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
 			try
 			{
-				var mergedNode = MergeWithParent(node, allUnits).ToDictionary();
+				var allParents = new HashSet<string>();
+				var abstractActorType = name.StartsWith("^");
+
+				// Guard against circular inheritance
+				allParents.Add(name);
+				var mergedNode = MergeWithParents(node, allUnits, allParents).ToDictionary();
 
 				Name = name;
+
 				foreach (var t in mergedNode)
-					if (t.Key != "Inherits" && !t.Key.StartsWith("-"))
-						Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+				{
+					if (t.Key[0] == '-')
+						throw new YamlException("Bogus trait removal: " + t.Key);
+
+					if (t.Key != "Inherits" && !t.Key.StartsWith("Inherits@"))
+						try
+						{
+							Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+						}
+						catch (FieldLoader.MissingFieldsException e)
+						{
+							if (!abstractActorType)
+								throw new YamlException(e.Message);
+						}
+				}
 			}
 			catch (YamlException e)
 			{
@@ -45,33 +67,33 @@ namespace OpenRA
 			}
 		}
 
-		static MiniYaml GetParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
+		static Dictionary<string, MiniYaml> GetParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
-			MiniYaml inherits;
-			node.ToDictionary().TryGetValue( "Inherits", out inherits );
-			if( inherits == null || string.IsNullOrEmpty( inherits.Value ) )
-				return null;
+			return node.Nodes.Where(n => n.Key == "Inherits" || n.Key.StartsWith("Inherits@"))
+				.ToDictionary(n => n.Value.Value, n =>
+			{
+				MiniYaml i;
+					if (!allUnits.TryGetValue(n.Value.Value, out i))
+						throw new YamlException(
+							"Bogus inheritance -- parent type {0} does not exist".F(n.Value.Value));
 
-			MiniYaml parent;
-			allUnits.TryGetValue( inherits.Value, out parent );
-			if (parent == null)
-				throw new InvalidOperationException(
-					"Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
-
-			return parent;
+				return i;
+			});
 		}
 
-		static MiniYaml MergeWithParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
+		static MiniYaml MergeWithParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits, HashSet<string> allParents)
 		{
-			var parent = GetParent( node, allUnits );
-			if (parent != null)
-			{
-				var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
+			var parents = GetParents(node, allUnits);
 
-				// strip the '-'
-				result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
-				return result;
+			foreach (var kv in parents)
+			{
+				if (!allParents.Add(kv.Key))
+					throw new YamlException(
+						"Bogus inheritance -- duplicate inheritance of {0}.".F(kv.Key));
+
+				node = MiniYaml.MergeStrict(node, MergeWithParents(kv.Value, allUnits, allParents));
 			}
+
 			return node;
 		}
 
@@ -81,37 +103,62 @@ namespace OpenRA
 				throw new YamlException("Junk value `{0}` on trait node {1}"
 				.F(my.Value, traitName));
 			var info = Game.CreateObject<ITraitInfo>(traitName + "Info");
-			FieldLoader.Load(info, my);
+			try
+			{
+				FieldLoader.Load(info, my);
+			}
+			catch (FieldLoader.MissingFieldsException e)
+			{
+				var header = "Trait name " + traitName + ": " + (e.Missing.Length > 1 ? "Required properties missing" : "Required property missing");
+				throw new FieldLoader.MissingFieldsException(e.Missing, header);
+			}
+
 			return info;
 		}
 
 		public IEnumerable<ITraitInfo> TraitsInConstructOrder()
 		{
-			var ret = new List<ITraitInfo>();
-			var t = Traits.WithInterface<ITraitInfo>().ToList();
-			var index = 0;
-			while (t.Count != 0)
+			if (constructOrderCache != null)
+				return constructOrderCache;
+
+			var source = Traits.WithInterface<ITraitInfo>().Select(i => new
 			{
-				var prereqs = PrerequisitesOf(t[index]);
-				var unsatisfied = prereqs.Where(n => !ret.Any(x =>
+				Trait = i,
+				Type = i.GetType(),
+				Dependencies = PrerequisitesOf(i).ToList()
+			}).ToList();
+
+			var resolved = source.Where(s => !s.Dependencies.Any()).ToList();
+			var unresolved = source.Except(resolved);
+
+			var testResolve = new Func<Type, Type, bool>((a, b) => a == b || a.IsAssignableFrom(b));
+			var more = unresolved.Where(u => u.Dependencies.All(d => resolved.Exists(r => testResolve(d, r.Type))));
+
+			// Re-evaluate the vars above until sorted
+			while (more.Any())
+				resolved.AddRange(more);
+
+			if (unresolved.Any())
+			{
+				var exceptionString = "ActorInfo(\"" + Name + "\") failed to initialize because of the following:\r\n";
+				var missing = unresolved.SelectMany(u => u.Dependencies.Where(d => !source.Any(s => testResolve(d, s.Type)))).Distinct();
+
+				exceptionString += "Missing:\r\n";
+				foreach (var m in missing)
+					exceptionString += m + " \r\n";
+
+				exceptionString += "Unresolved:\r\n";
+				foreach (var u in unresolved)
 				{
-					var type = x.GetType();
-					return type == n || n.IsAssignableFrom(type);
-				}));
-				if (!unsatisfied.Any())
-				{
-					ret.Add(t[index]);
-					t.RemoveAt(index);
-					index = 0;
+					var deps = u.Dependencies.Where(d => !resolved.Exists(r => r.Type == d));
+					exceptionString += u.Type + ": { " + string.Join(", ", deps) + " }\r\n";
 				}
-				else if (++index >= t.Count)
-					throw new InvalidOperationException("Trait prerequisites not satisfied (or prerequisite loop) Actor={0} Unresolved={1} Missing={2}".F(
-						Name,
-						t.Select(x => x.GetType().Name).JoinWith(","),
-						unsatisfied.Select(x => x.Name).JoinWith(",")));
+
+				throw new Exception(exceptionString);
 			}
 
-			return ret;
+			constructOrderCache = resolved.Select(r => r.Trait).ToList();
+			return constructOrderCache;
 		}
 
 		static IEnumerable<Type> PrerequisitesOf(ITraitInfo info)
@@ -130,11 +177,11 @@ namespace OpenRA
 					.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>))
 					.Select(i => i.GetGenericArguments()[0])).ToList();
 
-			inits.Add( typeof(OwnerInit) );		/* not exposed by a trait; this is used by the Actor itself */
+			inits.Add(typeof(OwnerInit));		/* not exposed by a trait; this is used by the Actor itself */
 
 			return inits.Select(
 				i => Pair.New(
-					i.Name.Replace( "Init", "" ), i ));
+					i.Name.Replace("Init", ""), i));
 		}
 	}
 }

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -15,27 +15,35 @@ namespace OpenRA.GameRules
 {
 	public class MusicInfo
 	{
-		public readonly string Filename = null;
-		public readonly string Title = null;
+		public readonly string Filename;
+		public readonly string Title;
+		public readonly bool Hidden;
+
 		public int Length { get; private set; } // seconds
 		public bool Exists { get; private set; }
 
-		public MusicInfo( string key, MiniYaml value )
+		public MusicInfo(string key, MiniYaml value)
 		{
 			Title = value.Value;
 
 			var nd = value.ToDictionary();
+			if (nd.ContainsKey("Hidden"))
+				bool.TryParse(nd["Hidden"].Value, out Hidden);
+
 			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
-			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key)+"."+ext;
+			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
+
 			if (!GlobalFileSystem.Exists(Filename))
 				return;
 
 			Exists = true;
 			using (var s = GlobalFileSystem.Open(Filename))
+			{
 				if (Filename.ToLowerInvariant().EndsWith("wav"))
 					Length = (int)WavLoader.WaveLength(s);
 				else
 					Length = (int)AudLoader.SoundLength(s);
+			}
 		}
 
 		public void Reload()
@@ -45,10 +53,12 @@ namespace OpenRA.GameRules
 
 			Exists = true;
 			using (var s = GlobalFileSystem.Open(Filename))
+			{
 				if (Filename.ToLowerInvariant().EndsWith("wav"))
 					Length = (int)WavLoader.WaveLength(s);
 				else
 					Length = (int)AudLoader.SoundLength(s);
+			}
 		}
 	}
 }

OpenRA.Game/GameRules/Ruleset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -22,7 +22,6 @@ namespace OpenRA
 		public readonly IReadOnlyDictionary<string, SoundInfo> Voices;
 		public readonly IReadOnlyDictionary<string, SoundInfo> Notifications;
 		public readonly IReadOnlyDictionary<string, MusicInfo> Music;
-		public readonly IReadOnlyDictionary<string, string> Movies;
 		public readonly IReadOnlyDictionary<string, TileSet> TileSets;
 		public readonly IReadOnlyDictionary<string, SequenceProvider> Sequences;
 
@@ -32,7 +31,6 @@ namespace OpenRA
 			IDictionary<string, SoundInfo> voices,
 			IDictionary<string, SoundInfo> notifications,
 			IDictionary<string, MusicInfo> music,
-			IDictionary<string, string> movies,
 			IDictionary<string, TileSet> tileSets,
 			IDictionary<string, SequenceProvider> sequences)
 		{
@@ -41,7 +39,6 @@ namespace OpenRA
 			Voices = new ReadOnlyDictionary<string, SoundInfo>(voices);
 			Notifications = new ReadOnlyDictionary<string, SoundInfo>(notifications);
 			Music = new ReadOnlyDictionary<string, MusicInfo>(music);
-			Movies = new ReadOnlyDictionary<string, string>(movies);
 			TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
 			Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
 		}

OpenRA.Game/GameRules/RulesetCache.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -17,8 +17,10 @@ using OpenRA.Support;
 
 namespace OpenRA
 {
-	public class RulesetCache
+	public sealed class RulesetCache : IDisposable
 	{
+		static readonly List<MiniYamlNode> NoMapRules = new List<MiniYamlNode>();
+
 		readonly ModData modData;
 
 		readonly Dictionary<string, ActorInfo> actorCache = new Dictionary<string, ActorInfo>();
@@ -26,7 +28,6 @@ namespace OpenRA
 		readonly Dictionary<string, SoundInfo> voiceCache = new Dictionary<string, SoundInfo>();
 		readonly Dictionary<string, SoundInfo> notificationCache = new Dictionary<string, SoundInfo>();
 		readonly Dictionary<string, MusicInfo> musicCache = new Dictionary<string, MusicInfo>();
-		readonly Dictionary<string, string> movieCache = new Dictionary<string, string>();
 		readonly Dictionary<string, TileSet> tileSetCache = new Dictionary<string, TileSet>();
 		readonly Dictionary<string, SequenceCache> sequenceCaches = new Dictionary<string, SequenceCache>();
 
@@ -42,12 +43,11 @@ namespace OpenRA
 			this.modData = modData;
 		}
 
-		public Ruleset LoadDefaultRules()
-		{
-			return LoadMapRules(new Map());
-		}
-
-		public Ruleset LoadMapRules(Map map)
+		/// <summary>
+		/// Cache and return the Ruleset for a given map.
+		/// If a map isn't specified then return the default mod Ruleset.
+		/// </summary>
+		public Ruleset Load(Map map = null)
 		{
 			var m = modData.Manifest;
 
@@ -56,27 +56,38 @@ namespace OpenRA
 			Dictionary<string, SoundInfo> voices;
 			Dictionary<string, SoundInfo> notifications;
 			Dictionary<string, MusicInfo> music;
-			Dictionary<string, string> movies;
 			Dictionary<string, TileSet> tileSets;
 
 			using (new PerfTimer("Actors"))
-				actors = LoadYamlRules(actorCache, m.Rules, map.RuleDefinitions, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
+				actors = LoadYamlRules(actorCache, m.Rules,
+					map != null ? map.RuleDefinitions : NoMapRules,
+					(k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
+
 			using (new PerfTimer("Weapons"))
-				weapons = LoadYamlRules(weaponCache, m.Weapons, map.WeaponDefinitions, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+				weapons = LoadYamlRules(weaponCache, m.Weapons,
+					map != null ? map.WeaponDefinitions : NoMapRules,
+					(k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+
 			using (new PerfTimer("Voices"))
-				voices = LoadYamlRules(voiceCache, m.Voices, map.VoiceDefinitions, (k, _) => new SoundInfo(k.Value));
+				voices = LoadYamlRules(voiceCache, m.Voices,
+					map != null ? map.VoiceDefinitions : NoMapRules,
+					(k, _) => new SoundInfo(k.Value));
+
 			using (new PerfTimer("Notifications"))
-				notifications = LoadYamlRules(notificationCache, m.Notifications, map.NotificationDefinitions, (k, _) => new SoundInfo(k.Value));
+				notifications = LoadYamlRules(notificationCache, m.Notifications,
+					map != null ? map.NotificationDefinitions : NoMapRules,
+					(k, _) => new SoundInfo(k.Value));
+
 			using (new PerfTimer("Music"))
-				music = LoadYamlRules(musicCache, m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
-			using (new PerfTimer("Movies"))
-				movies = LoadYamlRules(movieCache, m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
+				music = LoadYamlRules(musicCache, m.Music,
+					NoMapRules,
+					(k, _) => new MusicInfo(k.Key, k.Value));
+
 			using (new PerfTimer("TileSets"))
 				tileSets = LoadTileSets(tileSetCache, sequenceCaches, m.TileSets);
 
 			var sequences = sequenceCaches.ToDictionary(kvp => kvp.Key, kvp => new SequenceProvider(kvp.Value, map));
-
-			return new Ruleset(actors, weapons, voices, notifications, music, movies, tileSets, sequences);
+			return new Ruleset(actors, weapons, voices, notifications, music, tileSets, sequences);
 		}
 
 		Dictionary<string, T> LoadYamlRules<T>(
@@ -137,5 +148,12 @@ namespace OpenRA
 
 			return items;
 		}
+
+		public void Dispose()
+		{
+			foreach (var cache in sequenceCaches.Values)
+				cache.Dispose();
+			sequenceCaches.Clear();
+		}
 	}
 }

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -16,12 +16,12 @@ namespace OpenRA.GameRules
 {
 	public class SoundInfo
 	{
-		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Variants;
-		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Prefixes;
-		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Voices;
-		[FieldLoader.Ignore] public readonly Dictionary<string,string[]> Notifications;
-		public readonly string DefaultVariant = ".aud" ;
-		public readonly string DefaultPrefix = "" ;
+		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Variants;
+		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Prefixes;
+		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Voices;
+		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Notifications;
+		public readonly string DefaultVariant = ".aud";
+		public readonly string DefaultPrefix = "";
 		public readonly string[] DisableVariants = { };
 		public readonly string[] DisablePrefixes = { };
 
@@ -36,16 +36,16 @@ namespace OpenRA.GameRules
 		public readonly Lazy<Dictionary<string, SoundPool>> VoicePools;
 		public readonly Lazy<Dictionary<string, SoundPool>> NotificationsPools;
 
-		public SoundInfo( MiniYaml y )
+		public SoundInfo(MiniYaml y)
 		{
-			FieldLoader.Load( this, y );
+			FieldLoader.Load(this, y);
 			Variants = Load(y, "Variants");
 			Prefixes = Load(y, "Prefixes");
 			Voices = Load(y, "Voices");
 			Notifications = Load(y, "Notifications");
 
 			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
-			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary( a => a.Key, a => new SoundPool(a.Value) ));
+			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
 		}
 	}
 

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -19,8 +19,8 @@ namespace OpenRA.GameRules
 	public class ProjectileArgs
 	{
 		public WeaponInfo Weapon;
-		public IEnumerable<int> DamageModifiers;
-		public IEnumerable<int> InaccuracyModifiers;
+		public int[] DamageModifiers;
+		public int[] InaccuracyModifiers;
 		public int Facing;
 		public WPos Source;
 		public Actor SourceActor;
@@ -30,10 +30,10 @@ namespace OpenRA.GameRules
 
 	public interface IProjectileInfo { IEffect Create(ProjectileArgs args); }
 
-	public class WeaponInfo
+	public sealed class WeaponInfo
 	{
 		[Desc("The maximum range the weapon can fire.")]
-		public readonly WRange Range = WRange.Zero;
+		public readonly WDist Range = WDist.Zero;
 
 		[Desc("The sound played when the weapon is fired.")]
 		public readonly string[] Report = null;
@@ -46,8 +46,6 @@ namespace OpenRA.GameRules
 
 		public readonly bool Charges = false;
 
-		public readonly string Palette = "effect";
-
 		[Desc("What types of targets are affected.")]
 		public readonly string[] ValidTargets = { "Ground", "Water" };
 
@@ -58,17 +56,22 @@ namespace OpenRA.GameRules
 		public readonly int BurstDelay = 5;
 
 		[Desc("The minimum range the weapon can fire.")]
-		public readonly WRange MinRange = WRange.Zero;
+		public readonly WDist MinRange = WDist.Zero;
 
 		[FieldLoader.LoadUsing("LoadProjectile")]
 		public readonly IProjectileInfo Projectile;
 
 		[FieldLoader.LoadUsing("LoadWarheads")]
-		public readonly List<Warhead> Warheads = new List<Warhead>();
+		public readonly List<IWarhead> Warheads = new List<IWarhead>();
+
+		readonly HashSet<string> validTargetSet;
+		readonly HashSet<string> invalidTargetSet;
 
 		public WeaponInfo(string name, MiniYaml content)
 		{
 			FieldLoader.Load(this, content);
+			validTargetSet = new HashSet<string>(ValidTargets);
+			invalidTargetSet = new HashSet<string>(InvalidTargets);
 		}
 
 		static object LoadProjectile(MiniYaml yaml)
@@ -83,10 +86,10 @@ namespace OpenRA.GameRules
 
 		static object LoadWarheads(MiniYaml yaml)
 		{
-			var retList = new List<Warhead>();
+			var retList = new List<IWarhead>();
 			foreach (var node in yaml.Nodes.Where(n => n.Key.StartsWith("Warhead")))
 			{
-				var ret = Game.CreateObject<Warhead>(node.Value.Value + "Warhead");
+				var ret = Game.CreateObject<IWarhead>(node.Value.Value + "Warhead");
 				FieldLoader.Load(ret, node.Value);
 				retList.Add(ret);
 			}
@@ -94,6 +97,11 @@ namespace OpenRA.GameRules
 			return retList;
 		}
 
+		public bool IsValidTarget(IEnumerable<string> targetTypes)
+		{
+			return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes);
+		}
+
 		/// <summary>Checks if the weapon is valid against (can target) the target.</summary>
 		public bool IsValidAgainst(Target target, World world, Actor firedBy)
 		{
@@ -110,8 +118,7 @@ namespace OpenRA.GameRules
 					return false;
 
 				var cellInfo = world.Map.GetTerrainInfo(cell);
-				if (!ValidTargets.Intersect(cellInfo.TargetTypes).Any()
-					|| InvalidTargets.Intersect(cellInfo.TargetTypes).Any())
+				if (!IsValidTarget(cellInfo.TargetTypes))
 					return false;
 
 				return true;
@@ -124,8 +131,7 @@ namespace OpenRA.GameRules
 		public bool IsValidAgainst(Actor victim, Actor firedBy)
 		{
 			var targetable = victim.TraitOrDefault<ITargetable>();
-			if (targetable == null || !ValidTargets.Intersect(targetable.TargetTypes).Any()
-				|| InvalidTargets.Intersect(targetable.TargetTypes).Any())
+			if (targetable == null || !IsValidTarget(targetable.TargetTypes))
 				return false;
 
 			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
@@ -138,8 +144,7 @@ namespace OpenRA.GameRules
 		public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
 		{
 			var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>();
-			if (targetable == null || !ValidTargets.Intersect(targetable.GetTargetTypes()).Any()
-				|| InvalidTargets.Intersect(targetable.GetTargetTypes()).Any())
+			if (targetable == null || !IsValidTarget(targetable.GetTargetTypes()))
 				return false;
 
 			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))

OpenRA.Game/Graphics/Animation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -10,12 +10,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Support;
 
 namespace OpenRA.Graphics
 {
 	public class Animation
 	{
-		public Sequence CurrentSequence { get; private set; }
+		readonly int defaultTick = 40; // 25 fps == 40 ms
+		public ISpriteSequence CurrentSequence { get; private set; }
 		public bool IsDecoration = false;
 		public Func<bool> Paused;
 
@@ -26,7 +29,6 @@ namespace OpenRA.Graphics
 
 		string name;
 
-		readonly int defaultTick = 40; // 25 fps == 40 ms
 		bool tickAlways;
 
 		public string Name { get { return name; } }
@@ -43,11 +45,11 @@ namespace OpenRA.Graphics
 		{
 			this.sequenceProvider = sequenceProvider;
 			this.name = name.ToLowerInvariant();
-			this.tickFunc = () => {};
+			this.tickFunc = () => { };
 			this.facingFunc = facingFunc;
 		}
 
-		int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
+		public int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
 		public Sprite Image { get { return CurrentSequence.GetSprite(CurrentFrame, facingFunc()); } }
 
 		public IEnumerable<IRenderable> Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
@@ -79,6 +81,8 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = false;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = 0;
 			tickFunc = () =>
 			{
@@ -94,6 +98,8 @@ namespace OpenRA.Graphics
 				return false;
 
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			var tick = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+			timeUntilNextFrame = Math.Min(tick, timeUntilNextFrame);
 			frame %= CurrentSequence.Length;
 			return true;
 		}
@@ -103,6 +109,8 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = false;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = 0;
 			tickFunc = () =>
 			{
@@ -127,10 +135,30 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = true;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = func();
 			tickFunc = () => frame = func();
 		}
 
+		public void PlayFetchDirection(string sequenceName, Func<int> direction)
+		{
+			tickAlways = false;
+			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
+			frame = 0;
+			tickFunc = () =>
+			{
+				var d = direction();
+				if (d > 0 && ++frame >= CurrentSequence.Length)
+					frame = 0;
+
+				if (d < 0 && --frame < 0)
+					frame = CurrentSequence.Length - 1;
+			};
+		}
+
 		int timeUntilNextFrame;
 		Action tickFunc;
 
@@ -169,9 +197,14 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public Sequence GetSequence(string sequenceName)
+		public ISpriteSequence GetSequence(string sequenceName)
 		{
 			return sequenceProvider.GetSequence(name, sequenceName);
 		}
+
+		public string GetRandomExistingSequence(string[] sequences, MersenneTwister random)
+		{
+			return sequences.Where(s => HasSequence(s)).RandomOrDefault(random);
+		}
 	}
 }

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -50,5 +50,4 @@ namespace OpenRA.Graphics
 			return new AnimationWithOffset(a, null, null, null, null);
 		}
 	}
-}
-
+}

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2015 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,
@@ -17,8 +17,8 @@ namespace OpenRA.Graphics
 	{
 		struct Collection
 		{
-			public string src;
-			public Dictionary<string, MappedImage> regions;
+			public string Src;
+			public Dictionary<string, MappedImage> Regions;
 		}
 
 		static Dictionary<string, Collection> collections;
@@ -27,6 +27,8 @@ namespace OpenRA.Graphics
 
 		public static void Initialize(IEnumerable<string> chromeFiles)
 		{
+			Deinitialize();
+
 			collections = new Dictionary<string, Collection>();
 			cachedSheets = new Dictionary<string, Sheet>();
 			cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();
@@ -37,6 +39,17 @@ namespace OpenRA.Graphics
 				LoadCollection(c.Key, c.Value);
 		}
 
+		public static void Deinitialize()
+		{
+			if (cachedSheets != null)
+				foreach (var sheet in cachedSheets.Values)
+					sheet.Dispose();
+
+			collections = null;
+			cachedSheets = null;
+			cachedSprites = null;
+		}
+
 		public static void Save(string file)
 		{
 			var root = new List<MiniYamlNode>();
@@ -49,19 +62,20 @@ namespace OpenRA.Graphics
 		static MiniYaml SaveCollection(Collection collection)
 		{
 			var root = new List<MiniYamlNode>();
-			foreach (var kv in collection.regions)
-				root.Add(new MiniYamlNode(kv.Key, kv.Value.Save(collection.src)));
+			foreach (var kv in collection.Regions)
+				root.Add(new MiniYamlNode(kv.Key, kv.Value.Save(collection.Src)));
 
-			return new MiniYaml(collection.src, root);
+			return new MiniYaml(collection.Src, root);
 		}
 
 		static void LoadCollection(string name, MiniYaml yaml)
 		{
-			Game.modData.LoadScreen.Display();
+			if (Game.ModData.LoadScreen != null)
+				Game.ModData.LoadScreen.Display();
 			var collection = new Collection()
 			{
-				src = yaml.Value,
-				regions = yaml.Nodes.ToDictionary(n => n.Key, n => new MappedImage(yaml.Value, n.Value))
+				Src = yaml.Value,
+				Regions = yaml.Nodes.ToDictionary(n => n.Key, n => new MappedImage(yaml.Value, n.Value))
 			};
 
 			collections.Add(name, collection);
@@ -83,17 +97,17 @@ namespace OpenRA.Graphics
 			}
 
 			MappedImage mi;
-			if (!collection.regions.TryGetValue(imageName, out mi))
+			if (!collection.Regions.TryGetValue(imageName, out mi))
 				return null;
 
 			// Cached sheet
 			Sheet sheet;
-			if (cachedSheets.ContainsKey(mi.src))
-				sheet = cachedSheets[mi.src];
+			if (cachedSheets.ContainsKey(mi.Src))
+				sheet = cachedSheets[mi.Src];
 			else
 			{
-				sheet = new Sheet(mi.src);
-				cachedSheets.Add(mi.src, sheet);
+				sheet = new Sheet(mi.Src);
+				cachedSheets.Add(mi.Src, sheet);
 			}
 
 			// Cache the sprite
@@ -102,6 +116,7 @@ namespace OpenRA.Graphics
 				cachedCollection = new Dictionary<string, Sprite>();
 				cachedSprites.Add(collectionName, cachedCollection);
 			}
+
 			var image = mi.GetImage(sheet);
 			cachedCollection.Add(imageName, image);