Merge pull request #6576 from pchote/armaments

Allow armaments to be enabled/disabled by upgrades.

.gitignore

@@ -52,7 +52,12 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 
 # auto-generated documentation
 DOCUMENTATION.md
+Lua-API.md
 *.html
 
 # StyleCop
-*.Cache
+*.Cache
+
+# SublimeText
+*.sublime-project
+*.sublime-workspace

.travis.yml

@@ -6,19 +6,27 @@ language: c
 
 # Make sure build dependencies are installed.
 install:
- - sudo apt-get install mono-gmcs cli-common-dev libsdl1.2debian libgl1-mesa-glx libopenal1 libfreetype6 dpkg rpm nsis markdown
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6
+cache: apt
 
 # Run the build script
 # call RALint to check for YAML errors
-# Test run the packaging scripts for all platforms
 script:
+ - make dependencies
  - make all
  - make test
- - cd packaging && mkdir temp &&./package-all.sh travis-build temp
 
-# Only watch the development branch.
+# 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
+
+# Only watch the development branch and tagged release.
 branches:
  only:
+   - /^release-.*$/
+   - /^playtest-.*$/
+   - /^pkgtest-.*$/
    - bleed
 
 # Notify developers when build passed/failed.
@@ -30,3 +38,30 @@ notifications:
       - "irc.freenode.net#openra"
     use_notice: true
     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
+ - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
+ - cd packaging
+ - mkdir build
+ - ./package-all.sh ${TRAVIS_TAG} ${PWD}/build/
+deploy:
+  provider: releases
+  api_key:
+    secure: "cMC68erxuf0jb4Pe0sOH4m1f7I2LWPUatD9BC0WeZ9PwTnWOzrm0hnjZIES4TTKVo8WIfZIiCfxpdAFeoh6bomG2MsKwSKMc8qHGhfNGqPnyzYh6zdPZaA+4Q3TDQI3DrziyDnQUFeH1h/7UZLDLxtDrOtcYcGdNg5VjvV9fJ7g="
+  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
+    tags: true
+    repo: OpenRA/OpenRA

AUTHORS

@@ -5,6 +5,7 @@ The OpenRA developers are:
     * Chris Forbes (chrisf)
     * Curtis Shmyr (hamb)
     * Matthias Mailänder (Mailaender)
+    * Oliver Brakmann (obrakmann)
     * Paul Chote (pchote)
     * ScottNZ
 
@@ -17,7 +18,10 @@ Previous developers included:
     * Robert Pepperell (ytinasni)
 
 Also thanks to:
+    * Adam Valy (Tschokky)
     * Akseli Virtanen (RAGEQUIT)
+    * Alexander Fast (mizipzor)
+    * Allen262
     * Andrew Aldridge (i80and)
     * Andrew Perkins
     * Andrew Riedi
@@ -31,13 +35,21 @@ Also thanks to:
     * D2k Sardaukar
     * Daniel Derejvanik (Harisson)
     * Danny Keary (Dan9550)
+    * DeadlySurprise
     * Erasmus Schroder (rasco)
     * Fahrradkette
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
+    * Gordon Martin (Happy0)
+    * Guido Lipke (LipkeGu)
+    * Huw Pascoe
+    * Ian T. Jacobsen (Smilex)
     * Igor Popov (ihptru)
+    * Imago
     * Iran
+    * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
+    * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
     * Jes
     * Joakim Lindberg (booom3)
@@ -49,31 +61,39 @@ Also thanks to:
     * Lesueur Benjamin (Valkirie)
     * Maarten Meuris (Nyerguds)
     * Mark Olson (markolson)
+    * Matija Hustic (matija-hustic)
     * Matthew Gatland (mgatland)
     * Matthew Uzzell (MUzzell)
     * Max621
     * Max Ugrumov (katzsmile)
+    * Mustafa Alperen Seki (MustaphaTR)
+    * Neil Shivkar (havok13888)
     * Nukem
     * Okunev Yu Dmitry (xaionaro)
     * Olaf van der Spek
     * Paolo Chiodi (paolochiodi)
     * Paul Dovydaitis (pdovy)
+    * Pavlos Touboulidis (pav)
     * Pizzaoverhead
     * Psydev
+    * Raymond Bedrossian (Squiggles211)
     * Raymond Martineau (mart0258)
     * Reaperrr
     * Riderr3
+    * Rikhardur Bjarni Einarsson (WolfGaming)
     * Sascha Biedermann (bidifx)
     * Sebastien Kerguen (xanax)
+    * Shawn Collins (UberWaffe)
+    * Simon Verbeke (Saticmotion)
     * Taryn Hill (Phrohdoh)
     * Teemu Nieminen (Temeez)
     * Tim Mylemans (gecko)
     * Tirili
+    * Tom Roostan (RoosterDragon)
     * Tristan Keating (Kilkakon)
     * Tristan Mühlbacher (MicroBit)
     * Vladimir Komarov (VrKomarov)
     * Wuschel
-    * Ian T. Jacobsen (Smilex)
 
 Using Simple DirectMedia Layer distributed under
 the terms of the zlib license.
@@ -83,7 +103,10 @@ FreeType License.
 
 Using OpenAL Soft distributed under the GNU LGPL.
 
-Using GeoLite data created by MaxMind and
+Using MaxMind GeoIP2 .NET API distributed under
+the Apache 2.0 license.
+
+Using GeoLite2 data created by MaxMind and
 distributed under the CC BY-SA 3.0 license.
 
 Using KopiLua created by Mark Feldman and
@@ -96,8 +119,8 @@ distributed under the MIT license.
 Using SharpFont created by Robert Rouhani and
 distributed under the MIT license.
 
-Using the Tao framework and distributed under
-the MIT license.
+Using the Open Toolkit distributed under the
+MIT license.
 
 Using SDL2# created by Ethan Lee and released
 under the zlib license.
@@ -108,7 +131,7 @@ Kaluzhny and released under the GNU GPL terms.
 Using Mono.Nat by Alan McGovern and Ben
 Motmans and distributed under the MIT license.
 
-Using ICSharpCode.SharpZipLib intially by Mike
+Using ICSharpCode.SharpZipLib initially by Mike
 Krueger and distributed under the GNU GPL terms.
 
 

CONTRIBUTING.md

@@ -16,4 +16,8 @@ Please `git rebase` to the latest revision of the bleed branch.
 
 Don't forget to add youself to [AUTHORS](https://github.com/OpenRA/OpenRA/blob/bleed/AUTHORS).
 
-While your pull-request is in review it will be helpful if you join [IRC](irc://chat.freenode.net/openra) to discuss the changes.
+Please propose a [CHANGELOG](https://github.com/OpenRA/OpenRA/wiki/CHANGELOG) entry in the pull-request comments.
+
+While your pull-request is in review it will be helpful if you join [IRC](irc://chat.freenode.net/openra) to discuss the changes.
+
+See also the in-depth guide on [contributing](https://github.com/OpenRA/OpenRA/wiki/Contributing) to the OpenRA project.

GeoIP/COPYING

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

GeoIP/Country.cs

@@ -1,62 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright (C) 2008 MaxMind Inc.  All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#endregion
-
-using System;
-
-namespace GeoIP
-{
-	public class Country
-	{
-		String code;
-		String name;
-
-		/*
-	 * Creates a new Country.
-	 *
-	 * @param code the country code.
-	 * @param name the country name.
-	 */
-		public Country(String code, String name)
-		{
-			this.code = code;
-			this.name = name;
-		}
-
-		/*
-	 * Returns the ISO two-letter country code of this country.
-	 *
-	 * @return the country code.
-	 */
-		public String getCode()
-		{
-			return code;
-		}
-
-		/*
-     * Returns the name of this country.
-     *
-     * @return the country name.
-     */
-		public String getName()
-		{
-			return name;
-		}
-	}
-}

GeoIP/DatabaseInfo.cs

@@ -1,105 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright (C) 2008 MaxMind Inc.  All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#endregion
-
-using System;
-
-namespace GeoIP
-{
-	public class DatabaseInfo
-	{
-		public static int COUNTRY_EDITION = 1;
-		public static int REGION_EDITION_REV0 = 7;
-		public static int REGION_EDITION_REV1 = 3;
-		public static int CITY_EDITION_REV0 = 6;
-		public static int CITY_EDITION_REV1 = 2;
-		public static int ORG_EDITION = 5;
-		public static int ISP_EDITION = 4;
-		public static int PROXY_EDITION = 8;
-		public static int ASNUM_EDITION = 9;
-		public static int NETSPEED_EDITION = 10;
-		public static int  DOMAIN_EDITION = 11;
-		public static int COUNTRY_EDITION_V6 = 12;
-		public static int ASNUM_EDITION_V6 = 21;
-		public static int ISP_EDITION_V6 = 22;
-		public static int ORG_EDITION_V6 = 23;
-		public static int DOMAIN_EDITION_V6 = 24;
-		public static int CITY_EDITION_REV1_V6 = 30;
-		public static int CITY_EDITION_REV0_V6 = 31;
-		public static int NETSPEED_EDITION_REV1 = 32;
-		public static int NETSPEED_EDITION_REV1_V6 = 33;
-
-		private String info;
-	   /**
-		 * Creates a new DatabaseInfo object given the database info String.
-		 * @param info
-		 */
-
-		public DatabaseInfo(String info)
-		{
-			this.info = info;
-		}
-
-		public int getType()
-		{
-			if ((info == null) | (info == ""))
-			{
-				return COUNTRY_EDITION;
-			}
-			else
-			{
-				// Get the type code from the database info string and then
-				// subtract 105 from the value to preserve compatability with
-				// databases from April 2003 and earlier.
-				return Convert.ToInt32(info.Substring(4, 3)) - 105;
-			}
-		}
-
-		/**
-		 * Returns the date of the database.
-		 *
-		 * @return the date of the database.
-		 */
-		public DateTime getDate()
-		{
-			for (int i=0; i<info.Length-9; i++)
-			{
-				if (Char.IsWhiteSpace(info[i]) == true)
-				{
-					var dateString = info.Substring(i+1, 8);
-					try
-					{
-						return DateTime.ParseExact(dateString,"yyyyMMdd",null);
-					}
-					catch (Exception e)
-					{
-						Console.Write(e.Message);
-					}
-					break;
-				}
-			}
-			return DateTime.Now;
-		}
-
-		public String toString()
-		{
-			return info;
-		}
-	}
-}

GeoIP/GeoIP.csproj

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{021DDD6A-A608-424C-9A9A-252D8A9989E0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>GeoIP</RootNamespace>
-    <AssemblyName>GeoIP</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Country.cs" />
-    <Compile Include="DatabaseInfo.cs" />
-    <Compile Include="Location.cs" />
-    <Compile Include="LookupService.cs" />
-    <Compile Include="Region.cs" />
-    <Compile Include="RegionName.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>

GeoIP/Location.cs

@@ -1,66 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright (C) 2008 MaxMind Inc.  All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#endregion
-
-using System;
-
-namespace GeoIP
-{
-	public class Location
-	{
-		public String countryCode;
-		public String countryName;
-		public String region;
-		public String city;
-		public String postalCode;
-		public double latitude;
-		public double longitude;
-		public int dma_code;
-		public int area_code;
-		public String regionName;
-		public int metro_code;
-
-		private static double EARTH_DIAMETER = 2 * 6378.2;
-		private static double PI = 3.14159265;
-		private static double RAD_CONVERT = PI / 180;
-
-		public double distance (Location loc)
-		{
-			double delta_lat, delta_lon;
-			double temp;
-
-			double lat1 = latitude;
-			double lon1 = longitude;
-			double lat2 = loc.latitude;
-			double lon2 = loc.longitude;
-
-			// convert degrees to radians
-			lat1 *= RAD_CONVERT;
-			lat2 *= RAD_CONVERT;
-
-			// find the deltas
-			delta_lat = lat2 - lat1;
-			delta_lon = (lon2 - lon1) * RAD_CONVERT;
-
-			// Find the great circle distance
-			temp = Math.Pow(Math.Sin(delta_lat/2), 2) + Math.Cos(lat1) * Math.Cos(lat2) * Math.Pow(Math.Sin(delta_lon/2), 2);
-			return EARTH_DIAMETER * Math.Atan2(Math.Sqrt(temp), Math.Sqrt(1-temp));
-		}
-	}
-}

GeoIP/LookupService.cs

@@ -1,999 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright (C) 2008 MaxMind Inc.  All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#endregion
-
-using System;
-using System.IO;
-using System.Net;
-using System.Runtime.CompilerServices;
-
-namespace GeoIP
-{
-	public class LookupService
-	{
-		private FileStream file = null;
-		private DatabaseInfo databaseInfo = null;
-		private Object ioLock = new Object();
-		byte databaseType = Convert.ToByte(DatabaseInfo.COUNTRY_EDITION);
-		int[] databaseSegments;
-		int recordLength;
-		int dboptions;
-		byte[] dbbuffer;
-
-		private static Country UNKNOWN_COUNTRY = new Country("--", "Unknown Location");
-		private static int COUNTRY_BEGIN = 16776960;
-		private static int STRUCTURE_INFO_MAX_SIZE = 20;
-		private static int DATABASE_INFO_MAX_SIZE = 100;
-		private static int FULL_RECORD_LENGTH = 100;//???
-		private static int SEGMENT_RECORD_LENGTH = 3;
-		private static int STANDARD_RECORD_LENGTH = 3;
-		private static int ORG_RECORD_LENGTH = 4;
-		private static int MAX_RECORD_LENGTH = 4;
-		private static int MAX_ORG_RECORD_LENGTH = 1000;//???
-		private static int FIPS_RANGE = 360;
-		private static int STATE_BEGIN_REV0 = 16700000;
-		private static int STATE_BEGIN_REV1 = 16000000;
-		private static int US_OFFSET = 1;
-		private static int CANADA_OFFSET = 677;
-		private static int WORLD_OFFSET = 1353;
-		public static int GEOIP_STANDARD = 0;
-		public static int GEOIP_MEMORY_CACHE = 1;
-		public static int GEOIP_UNKNOWN_SPEED = 0;
-		public static int GEOIP_DIALUP_SPEED = 1;
-		public static int GEOIP_CABLEDSL_SPEED = 2;
-		public static int GEOIP_CORPORATE_SPEED = 3;
-
-		private static String[] countryCode = {
-		"--",
-		"AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "CW",
-		"AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AZ", "BA", "BB",
-		"BD", "BE", "BF", "BG", "BH", "BI", "BJ", "BM", "BN", "BO",
-		"BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD",
-		"CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR",
-		"CU", "CV", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO",
-		"DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ",
-		"FK", "FM", "FO", "FR", "SX", "GA", "GB", "GD", "GE", "GF",
-		"GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT",
-		"GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID",
-		"IE", "IL", "IN", "IO", "IQ", "IR", "IS", "IT", "JM", "JO",
-		"JP", "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW",
-		"KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT",
-		"LU", "LV", "LY", "MA", "MC", "MD", "MG", "MH", "MK", "ML",
-		"MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV",
-		"MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI",
-		"NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE", "PF",
-		"PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW",
-		"PY", "QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD",
-		"SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO",
-		"SR", "ST", "SV", "SY", "SZ", "TC", "TD", "TF", "TG", "TH",
-		"TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW",
-		"TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE",
-		"VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "RS", "ZA",
-		"ZM", "ME", "ZW", "A1", "A2", "O1", "AX", "GG", "IM", "JE",
-		"BL", "MF", "BQ", "SS", "O1" };
-
-		private static String[] countryName = {
-		"Unknown Location",
-		"Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates", "Afghanistan", "Antigua and Barbuda", "Anguilla", "Albania", "Armenia", "Curacao",
-		"Angola", "Antarctica", "Argentina", "American Samoa", "Austria", "Australia", "Aruba", "Azerbaijan", "Bosnia and Herzegovina", "Barbados",
-		"Bangladesh", "Belgium", "Burkina Faso", "Bulgaria", "Bahrain", "Burundi", "Benin", "Bermuda", "Brunei Darussalam", "Bolivia",
-		"Brazil", "Bahamas", "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize", "Canada", "Cocos (Keeling) Islands", "Congo, The Democratic Republic of the",
-		"Central African Republic", "Congo", "Switzerland", "Cote D'Ivoire", "Cook Islands", "Chile", "Cameroon", "China", "Colombia", "Costa Rica",
-		"Cuba", "Cape Verde", "Christmas Island", "Cyprus", "Czech Republic", "Germany", "Djibouti", "Denmark", "Dominica", "Dominican Republic",
-		"Algeria", "Ecuador", "Estonia", "Egypt", "Western Sahara", "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji",
-		"Falkland Islands (Malvinas)", "Micronesia, Federated States of", "Faroe Islands", "France", "Sint Maarten (Dutch part)", "Gabon", "United Kingdom", "Grenada", "Georgia", "French Guiana",
-		"Ghana", "Gibraltar", "Greenland", "Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", "South Georgia and the South Sandwich Islands", "Guatemala",
-		"Guam", "Guinea-Bissau", "Guyana", "Hong Kong", "Heard Island and McDonald Islands", "Honduras", "Croatia", "Haiti", "Hungary", "Indonesia",
-		"Ireland", "Israel", "India", "British Indian Ocean Territory", "Iraq", "Iran, Islamic Republic of", "Iceland", "Italy", "Jamaica", "Jordan",
-		"Japan", "Kenya", "Kyrgyzstan", "Cambodia", "Kiribati", "Comoros", "Saint Kitts and Nevis", "Korea, Democratic People's Republic of", "Korea, Republic of", "Kuwait",
-		"Cayman Islands", "Kazakhstan", "Lao People's Democratic Republic", "Lebanon", "Saint Lucia", "Liechtenstein", "Sri Lanka", "Liberia", "Lesotho", "Lithuania",
-		"Luxembourg", "Latvia", "Libya", "Morocco", "Monaco", "Moldova, Republic of", "Madagascar", "Marshall Islands", "Macedonia", "Mali",
-		"Myanmar", "Mongolia", "Macau", "Northern Mariana Islands", "Martinique", "Mauritania", "Montserrat", "Malta", "Mauritius", "Maldives",
-		"Malawi", "Mexico", "Malaysia", "Mozambique", "Namibia", "New Caledonia", "Niger", "Norfolk Island", "Nigeria", "Nicaragua",
-		"Netherlands", "Norway", "Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", "Peru", "French Polynesia",
-		"Papua New Guinea", "Philippines", "Pakistan", "Poland", "Saint Pierre and Miquelon", "Pitcairn Islands", "Puerto Rico", "Palestinian Territory", "Portugal", "Palau",
-		"Paraguay", "Qatar", "Reunion", "Romania", "Russian Federation", "Rwanda", "Saudi Arabia", "Solomon Islands", "Seychelles", "Sudan",
-		"Sweden", "Singapore", "Saint Helena", "Slovenia", "Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", "Senegal", "Somalia", "Suriname",
-		"Sao Tome and Principe", "El Salvador", "Syrian Arab Republic", "Swaziland", "Turks and Caicos Islands", "Chad", "French Southern Territories", "Togo", "Thailand",
-		"Tajikistan", "Tokelau", "Turkmenistan", "Tunisia", "Tonga", "Timor-Leste", "Turkey", "Trinidad and Tobago", "Tuvalu", "Taiwan",
-		"Tanzania, United Republic of", "Ukraine", "Uganda", "United States Minor Outlying Islands", "United States", "Uruguay", "Uzbekistan", "Holy See (Vatican City State)", "Saint Vincent and the Grenadines", "Venezuela",
-		"Virgin Islands, British", "Virgin Islands, U.S.", "Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte", "Serbia", "South Africa",
-		"Zambia", "Montenegro", "Zimbabwe", "Anonymous Proxy", "Satellite Provider", "Other", "Aland Islands", "Guernsey", "Isle of Man", "Jersey",
-		"Saint Barthelemy", "Saint Martin", "Bonaire, Saint Eustatius and Saba", "South Sudan", "Other" };
-
-		public LookupService(String databaseFile, int options)
-		{
-			try
-			{
-				lock (ioLock)
-					this.file = new FileStream(databaseFile, FileMode.Open, FileAccess.Read);
-				dboptions = options;
-				init();
-			}
-			catch(System.SystemException)
-			{
-				Console.WriteLine("cannot open file " + databaseFile);
-			}
-		}
-
-		public LookupService(String databaseFile):this(databaseFile, GEOIP_STANDARD) { }
-
-		private void init()
-		{
-			int i, j;
-			byte[] delim = new byte[3];
-			byte[] buf = new byte[SEGMENT_RECORD_LENGTH];
-			databaseType = (byte)DatabaseInfo.COUNTRY_EDITION;
-			recordLength = STANDARD_RECORD_LENGTH;
-
-			lock (ioLock)
-			{
-				file.Seek(-3,SeekOrigin.End);
-				for (i = 0; i < STRUCTURE_INFO_MAX_SIZE; i++)
-				{
-					file.Read(delim,0,3);
-					if (delim[0] == 255 && delim[1] == 255 && delim[2] == 255)
-					{
-						databaseType = Convert.ToByte(file.ReadByte());
-						if (databaseType >= 106)
-						{
-							// Backward compatibility with databases from April 2003 and earlier
-							databaseType -= 105;
-						}
-						// Determine the database type.
-						if (databaseType == DatabaseInfo.REGION_EDITION_REV0)
-						{
-							databaseSegments = new int[1];
-							databaseSegments[0] = STATE_BEGIN_REV0;
-							recordLength = STANDARD_RECORD_LENGTH;
-						}
-						else if (databaseType == DatabaseInfo.REGION_EDITION_REV1)
-						{
-							databaseSegments = new int[1];
-							databaseSegments[0] = STATE_BEGIN_REV1;
-							recordLength = STANDARD_RECORD_LENGTH;
-						}
-						else if (databaseType == DatabaseInfo.CITY_EDITION_REV0 ||
-							databaseType == DatabaseInfo.CITY_EDITION_REV1 ||
-							databaseType == DatabaseInfo.ORG_EDITION ||
-							databaseType == DatabaseInfo.ORG_EDITION_V6 ||
-							databaseType == DatabaseInfo.ISP_EDITION ||
-							databaseType == DatabaseInfo.ISP_EDITION_V6 ||
-							databaseType == DatabaseInfo.ASNUM_EDITION ||
-							databaseType == DatabaseInfo.ASNUM_EDITION_V6 ||
-							databaseType == DatabaseInfo.NETSPEED_EDITION_REV1 ||
-							databaseType == DatabaseInfo.NETSPEED_EDITION_REV1_V6 ||
-							databaseType == DatabaseInfo.CITY_EDITION_REV0_V6 ||
-							databaseType == DatabaseInfo.CITY_EDITION_REV1_V6)
-						{
-							databaseSegments = new int[1];
-							databaseSegments[0] = 0;
-							if (databaseType == DatabaseInfo.CITY_EDITION_REV0 ||
-								databaseType == DatabaseInfo.CITY_EDITION_REV1 ||
-								databaseType == DatabaseInfo.ASNUM_EDITION_V6 ||
-								databaseType == DatabaseInfo.NETSPEED_EDITION_REV1 ||
-								databaseType == DatabaseInfo.NETSPEED_EDITION_REV1_V6 ||
-								databaseType == DatabaseInfo.CITY_EDITION_REV0_V6 ||
-								databaseType == DatabaseInfo.CITY_EDITION_REV1_V6 ||
-								databaseType == DatabaseInfo.ASNUM_EDITION)
-							{
-								recordLength = STANDARD_RECORD_LENGTH;
-							}
-							else
-							{
-								recordLength = ORG_RECORD_LENGTH;
-							}
-							file.Read(buf,0,SEGMENT_RECORD_LENGTH);
-							for (j = 0; j < SEGMENT_RECORD_LENGTH; j++)
-								databaseSegments[0] += (unsignedByteToInt(buf[j]) << (j * 8));
-						}
-					break;
-				}
-				else
-				{
-					file.Seek(-4,SeekOrigin.Current);
-				}
-			}
-			if ((databaseType == DatabaseInfo.COUNTRY_EDITION) ||
-				(databaseType == DatabaseInfo.COUNTRY_EDITION_V6) ||
-				(databaseType == DatabaseInfo.PROXY_EDITION) ||
-				(databaseType == DatabaseInfo.NETSPEED_EDITION))
-			{
-				databaseSegments = new int[1];
-				databaseSegments[0] = COUNTRY_BEGIN;
-				recordLength = STANDARD_RECORD_LENGTH;
-			}
-			if ((dboptions & GEOIP_MEMORY_CACHE) == 1)
-				{
-					int l = (int) file.Length;
-					dbbuffer = new byte[l];
-					file.Seek(0,SeekOrigin.Begin);
-					file.Read(dbbuffer,0,l);
-				}
-			}
-		}
-		
-		public void close()
-		{
-			try 
-			{
-				lock (ioLock) { file.Close(); }
-				file = null;
-			}
-			catch (Exception) { }
-		}
-
-		public Country getCountry(IPAddress ipAddress)
-		{
-			return getCountry(bytestoLong(ipAddress.GetAddressBytes()));
-		}
-
-		public Country getCountryV6(String ipAddress)
-		{
-			IPAddress addr;
-			try
-			{
-				addr = IPAddress.Parse(ipAddress);
-			}
-
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-				return UNKNOWN_COUNTRY;
-			}
-			return getCountryV6(addr);
-		}
-
-		public Country getCountry(String ipAddress)
-		{
-			IPAddress addr;
-			try
-			{
-				addr = IPAddress.Parse(ipAddress);
-			}
-
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-				return UNKNOWN_COUNTRY;
-			}
-			return getCountry(bytestoLong(addr.GetAddressBytes()));
-		}
-
-		public Country getCountryV6(IPAddress ipAddress)
-		{
-			if (file == null)
-			{
-				throw new Exception("Database has been closed.");
-			}
-			if ((databaseType == DatabaseInfo.CITY_EDITION_REV1) | 
-				(databaseType == DatabaseInfo.CITY_EDITION_REV0))
-			{
-				var l = getLocation(ipAddress);
-				if (l == null)
-					return UNKNOWN_COUNTRY;
-				else
-					return new Country(l.countryCode, l.countryName);
-			} 
-			else
-			{
-				int ret = SeekCountryV6(ipAddress) - COUNTRY_BEGIN;
-				if (ret == 0)
-					return UNKNOWN_COUNTRY;
-				else
-					return new Country(countryCode[ret], countryName[ret]);
-			}
-		}
-
-		public Country getCountry(long ipAddress)
-		{
-			if (file == null)
-				throw new Exception("Database has been closed.");
-			if ((databaseType == DatabaseInfo.CITY_EDITION_REV1) | 
-				(databaseType == DatabaseInfo.CITY_EDITION_REV0))
-			{
-				var l = getLocation(ipAddress);
-				if (l == null)
-					return UNKNOWN_COUNTRY;
-				else
-					return new Country(l.countryCode, l.countryName);
-			} 
-			else
-			{
-				var ret = SeekCountry(ipAddress) - COUNTRY_BEGIN;
-				if (ret == 0)
-					return UNKNOWN_COUNTRY;
-				else
-					return new Country(countryCode[ret], countryName[ret]);
-			}
-		}
-
-		public int getID(String ipAddress)
-		{
-			IPAddress addr;
-			try
-			{
-				addr = IPAddress.Parse(ipAddress);
-			}
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-				return 0;
-			}
-			return getID(bytestoLong(addr.GetAddressBytes()));
-		}
-
-		public int getID(IPAddress ipAddress)
-		{
-			
-			return getID(bytestoLong(ipAddress.GetAddressBytes()));
-		}
-
-		public int getID(long ipAddress)
-		{
-			if (file == null)
-			   throw new Exception("Database has been closed.");
-			int ret = SeekCountry(ipAddress) - databaseSegments[0];
-			return ret;
-		}
-
-		public DatabaseInfo getDatabaseInfo()
-		{
-			if (databaseInfo != null)
-				return databaseInfo;
-			try
-			{
-				// Synchronize since we're accessing the database file.
-				lock (ioLock)
-				{
-					bool hasStructureInfo = false;
-					byte [] delim = new byte[3];
-					// Advance to part of file where database info is stored.
-					file.Seek(-3,SeekOrigin.End);
-					for (int i=0; i<STRUCTURE_INFO_MAX_SIZE; i++)
-					{
-						file.Read(delim,0,3);
-						if (delim[0] == 255 && delim[1] == 255 && delim[2] == 255)
-						{
-							hasStructureInfo = true;
-							break;
-						}
-						file.Seek(-4,SeekOrigin.Current);
-					}
-					if (hasStructureInfo)
-						file.Seek(-6,SeekOrigin.Current);
-					else
-					{
-						// No structure info, must be pre Sep 2002 database, go back to end.
-						file.Seek(-3,SeekOrigin.End);
-					}
-					// Find the database info string.
-					for (int i=0; i<DATABASE_INFO_MAX_SIZE; i++)
-					{
-						file.Read(delim,0,3);
-						if (delim[0]==0 && delim[1]==0 && delim[2]==0)
-						{
-							byte[] dbInfo = new byte[i];
-							char[] dbInfo2 = new char[i];
-							file.Read(dbInfo,0,i);
-							for (int a0 = 0;a0 < i;a0++)
-								dbInfo2[a0] = Convert.ToChar(dbInfo[a0]);
-							// Create the database info object using the string.
-							this.databaseInfo = new DatabaseInfo(new String(dbInfo2));
-							return databaseInfo;
-						}
-						file.Seek(-4,SeekOrigin.Current);
-					}
-				}
-			}
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-			}
-			return new DatabaseInfo("");
-		}
-
-		public Region getRegion(IPAddress ipAddress)
-		{
-			return getRegion(bytestoLong(ipAddress.GetAddressBytes()));
-		}
-
-		public Region getRegion(String str)
-		{
-			IPAddress addr;
-			try
-			{
-				addr = IPAddress.Parse(str);
-			}
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-				return null;
-			}
-			return getRegion(bytestoLong(addr.GetAddressBytes()));
-		}
-
-		[MethodImpl(MethodImplOptions.Synchronized)]
-		public Region getRegion(long ipnum)
-		{
-			Region record = new Region();
-			int seek_region = 0;
-			if (databaseType == DatabaseInfo.REGION_EDITION_REV0)
-			{
-				seek_region = SeekCountry(ipnum) - STATE_BEGIN_REV0;
-				char [] ch = new char[2];
-				if (seek_region >= 1000)
-				{
-					record.countryCode = "US";
-					record.countryName = "United States";
-					ch[0] = (char)(((seek_region - 1000)/26) + 65);
-					ch[1] = (char)(((seek_region - 1000)%26) + 65);
-					record.region = new String(ch);
-				}
-				else
-				{
-					record.countryCode = countryCode[seek_region];
-					record.countryName = countryName[seek_region];
-					record.region = "";
-				}
-			}
-			else if (databaseType == DatabaseInfo.REGION_EDITION_REV1)
-			{
-				seek_region = SeekCountry(ipnum) - STATE_BEGIN_REV1;
-				char [] ch = new char[2];
-				if (seek_region < US_OFFSET)
-				{
-					record.countryCode = "";
-					record.countryName = "";
-					record.region = "";
-				} else if (seek_region < CANADA_OFFSET)
-				{
-					record.countryCode = "US";
-					record.countryName = "United States";
-					ch[0] = (char)(((seek_region - US_OFFSET)/26) + 65);
-					ch[1] = (char)(((seek_region - US_OFFSET)%26) + 65);
-					record.region = new String(ch);
-				} else if (seek_region < WORLD_OFFSET)
-				{
-					record.countryCode = "CA";
-					record.countryName = "Canada";
-					ch[0] = (char)(((seek_region - CANADA_OFFSET)/26) + 65);
-					ch[1] = (char)(((seek_region - CANADA_OFFSET)%26) + 65);
-					record.region = new String(ch);
-				}
-				else
-				{
-					record.countryCode = countryCode[(seek_region - WORLD_OFFSET) / FIPS_RANGE];
-					record.countryName = countryName[(seek_region - WORLD_OFFSET) / FIPS_RANGE];
-					record.region = "";
-				}
-			}
-			return record;
-		}
-
-		public Location getLocation(IPAddress addr)
-		{
-			return getLocation(bytestoLong(addr.GetAddressBytes()));
-		}
-
-		public Location getLocationV6(String str)
-		{
-			IPAddress addr;
-			try
-			{
-				addr = IPAddress.Parse(str);
-			}
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-			return null;
-			}
-
-			return getLocationV6(addr);
-		}
-
-		public Location getLocation(String str)
-		{
-			IPAddress addr;
-			try
-			{
-				addr = IPAddress.Parse(str);
-			}
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-				return null;
-			}
-
-			return getLocation(bytestoLong(addr.GetAddressBytes()));
-		}
-
-		[MethodImpl(MethodImplOptions.Synchronized)]
-		public Location getLocationV6(IPAddress addr)
-		{
-			int record_pointer;
-			byte[] record_buf = new byte[FULL_RECORD_LENGTH];
-			char[] record_buf2 = new char[FULL_RECORD_LENGTH];
-			int record_buf_offset = 0;
-			Location record = new Location();
-			int str_length = 0;
-			int j, Seek_country;
-			double latitude = 0, longitude = 0;
-
-			try
-			{
-				Seek_country = SeekCountryV6(addr);
-				if (Seek_country == databaseSegments[0])
-					return null;
-
-				record_pointer = Seek_country + ((2 * recordLength - 1) * databaseSegments[0]);
-				if ((dboptions & GEOIP_MEMORY_CACHE) == 1)
-					Array.Copy(dbbuffer, record_pointer, record_buf, 0, Math.Min(dbbuffer.Length - record_pointer, FULL_RECORD_LENGTH));
-				else
-				{
-					lock (ioLock)
-					{
-						file.Seek(record_pointer,SeekOrigin.Begin);
-						file.Read(record_buf,0,FULL_RECORD_LENGTH);
-					}
-				}
-				for (int a0 = 0;a0 < FULL_RECORD_LENGTH;a0++)
-					record_buf2[a0] = Convert.ToChar(record_buf[a0]);
-
-				// get country
-				record.countryCode = countryCode[unsignedByteToInt(record_buf[0])];
-				record.countryName = countryName[unsignedByteToInt(record_buf[0])];
-				record_buf_offset++;
-
-				// get region
-				while (record_buf[record_buf_offset + str_length] != '\0')
-					str_length++;
-				if (str_length > 0)
-					record.region = new String(record_buf2, record_buf_offset, str_length);
-				record_buf_offset += str_length + 1;
-				str_length = 0;
-
-				// get region_name
-				record.regionName = RegionName.getRegionName( record.countryCode, record.region );
-
-				// get city
-				while (record_buf[record_buf_offset + str_length] != '\0')
-					str_length++;
-				if (str_length > 0)
-					record.city = new String(record_buf2, record_buf_offset, str_length);
-				record_buf_offset += (str_length + 1);
-				str_length = 0;
-
-				// get postal code
-				while (record_buf[record_buf_offset + str_length] != '\0')
-					str_length++;
-				if (str_length > 0)
-					record.postalCode = new String(record_buf2, record_buf_offset, str_length);
-				record_buf_offset += (str_length + 1);
-
-				// get latitude
-				for (j = 0; j < 3; j++)
-					latitude += (unsignedByteToInt(record_buf[record_buf_offset + j]) << (j * 8));
-				record.latitude = (float)latitude/10000 - 180;
-				record_buf_offset += 3;
-
-				// get longitude
-				for (j = 0; j < 3; j++)
-					longitude += (unsignedByteToInt(record_buf[record_buf_offset + j]) << (j * 8));
-					record.longitude = (float)longitude/10000 - 180;
-
-				record.metro_code = record.dma_code = 0;
-				record.area_code = 0;
-				if (databaseType == DatabaseInfo.CITY_EDITION_REV1
-				  ||databaseType == DatabaseInfo.CITY_EDITION_REV1_V6)
-				{
-					// get metro_code
-					int metroarea_combo = 0;
-					if (record.countryCode == "US")
-					{
-					   record_buf_offset += 3;
-						for (j = 0; j < 3; j++)
-							metroarea_combo += (unsignedByteToInt(record_buf[record_buf_offset + j]) << (j * 8));
-						record.metro_code = record.dma_code = metroarea_combo/1000;
-						record.area_code = metroarea_combo % 1000;
-					}
-				}
-			}
-			catch (IOException)
-			{
-				Console.WriteLine("IO Exception while seting up segments");
-			}
-			return record;
-		}
-
-		[MethodImpl(MethodImplOptions.Synchronized)]
-		public Location getLocation(long ipnum)
-		{
-			int record_pointer;
-			byte[] record_buf = new byte[FULL_RECORD_LENGTH];
-			char[] record_buf2 = new char[FULL_RECORD_LENGTH];
-			int record_buf_offset = 0;
-			Location record = new Location();
-			int str_length = 0;
-			int j, Seek_country;
-			double latitude = 0, longitude = 0;
-
-			try
-			{
-				Seek_country = SeekCountry(ipnum);
-				if (Seek_country == databaseSegments[0])
-					return null;
-
-				record_pointer = Seek_country + ((2 * recordLength - 1) * databaseSegments[0]);
-				if ((dboptions & GEOIP_MEMORY_CACHE) == 1)
-					Array.Copy(dbbuffer, record_pointer, record_buf, 0, Math.Min(dbbuffer.Length - record_pointer, FULL_RECORD_LENGTH));
-				else
-				{
-					lock (ioLock)
-					{
-						file.Seek(record_pointer,SeekOrigin.Begin);
-						file.Read(record_buf,0,FULL_RECORD_LENGTH);
-					}
-				}
-
-				for (int a0 = 0;a0 < FULL_RECORD_LENGTH;a0++)
-					record_buf2[a0] = Convert.ToChar(record_buf[a0]);
-
-				// get country
-				record.countryCode = countryCode[unsignedByteToInt(record_buf[0])];
-				record.countryName = countryName[unsignedByteToInt(record_buf[0])];
-				record_buf_offset++;
-
-				// get region
-				while (record_buf[record_buf_offset + str_length] != '\0')
-					str_length++;
-				if (str_length > 0)
-					record.region = new String(record_buf2, record_buf_offset, str_length);
-				record_buf_offset += str_length + 1;
-				str_length = 0;
-
-				// get region_name
-				record.regionName = RegionName.getRegionName(record.countryCode, record.region);
-
-				// get city
-				while (record_buf[record_buf_offset + str_length] != '\0')
-					str_length++;
-				if (str_length > 0)
-					record.city = new String(record_buf2, record_buf_offset, str_length);
-
-				record_buf_offset += (str_length + 1);
-				str_length = 0;
-
-				// get postal code
-				while (record_buf[record_buf_offset + str_length] != '\0')
-					str_length++;
-				if (str_length > 0)
-					record.postalCode = new String(record_buf2, record_buf_offset, str_length);
-				record_buf_offset += (str_length + 1);
-
-				// get latitude
-				for (j = 0; j < 3; j++)
-					latitude += (unsignedByteToInt(record_buf[record_buf_offset + j]) << (j * 8));
-				record.latitude = (float) latitude/10000 - 180;
-				record_buf_offset += 3;
-
-				// get longitude
-				for (j = 0; j < 3; j++)
-					longitude += (unsignedByteToInt(record_buf[record_buf_offset + j]) << (j * 8));
-					record.longitude = (float) longitude/10000 - 180;
-
-				record.metro_code = record.dma_code = 0;
-				record.area_code = 0;
-				if (databaseType == DatabaseInfo.CITY_EDITION_REV1)
-				{
-					// get metro_code
-					int metroarea_combo = 0;
-					if (record.countryCode == "US"){
-					   record_buf_offset += 3;
-						for (j = 0; j < 3; j++)
-							metroarea_combo += (unsignedByteToInt(record_buf[record_buf_offset + j]) << (j * 8));
-						record.metro_code = record.dma_code = metroarea_combo/1000;
-						record.area_code = metroarea_combo % 1000;
-					}
-				}
-			}
-			catch (IOException)
-			{
-				Console.WriteLine("IO Exception while seting up segments");
-			}
-			return record;
-		}
-
-		public String getOrg(IPAddress addr)
-		{
-			return getOrg(bytestoLong(addr.GetAddressBytes()));
-		}
-
-		public String getOrgV6(String str)
-		{
-			IPAddress addr;
-			try
-			{
-				addr = IPAddress.Parse(str);
-			}
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-				return null;
-			}
-			return getOrgV6(addr);
-		}
-
-		public String getOrg(String str)
-		{
-			IPAddress addr;
-			try
-			{
-				addr = IPAddress.Parse(str);
-			}
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-				return null;
-			}
-			return getOrg(bytestoLong(addr.GetAddressBytes()));
-		}
-
-		[MethodImpl(MethodImplOptions.Synchronized)]
-		public String getOrgV6( IPAddress addr)
-		{
-			int Seek_org;
-			int record_pointer;
-			int str_length = 0;
-			byte[] buf = new byte[MAX_ORG_RECORD_LENGTH];
-			char[] buf2 = new char[MAX_ORG_RECORD_LENGTH];
-			String org_buf;
-
-			try
-			 {
-				Seek_org = SeekCountryV6(addr);
-				if (Seek_org == databaseSegments[0])
-					return null;
-
-				record_pointer = Seek_org + (2 * recordLength - 1) * databaseSegments[0];
-				if ((dboptions & GEOIP_MEMORY_CACHE) == 1)
-					Array.Copy(dbbuffer, record_pointer, buf, 0, Math.Min(dbbuffer.Length - record_pointer, MAX_ORG_RECORD_LENGTH));
-				else
-				{
-					lock (ioLock)
-					{
-						file.Seek(record_pointer,SeekOrigin.Begin);
-						file.Read(buf,0,MAX_ORG_RECORD_LENGTH);
-					}
-				}
-				while (buf[str_length] != 0)
-				{
-					buf2[str_length] = Convert.ToChar(buf[str_length]);
-					str_length++;
-				}
-				buf2[str_length] = '\0';
-				org_buf = new String(buf2,0,str_length);
-				return org_buf;
-			}
-			catch (IOException)
-			{
-				Console.WriteLine("IO Exception");
-				return null;
-			}
-		}
-
-		[MethodImpl(MethodImplOptions.Synchronized)]
-		public String getOrg(long ipnum)
-		{
-			int Seek_org;
-			int record_pointer;
-			int str_length = 0;
-			byte [] buf = new byte[MAX_ORG_RECORD_LENGTH];
-			char [] buf2 = new char[MAX_ORG_RECORD_LENGTH];
-			String org_buf;
-
-			try
-			{
-				Seek_org = SeekCountry(ipnum);
-				if (Seek_org == databaseSegments[0])
-				return null;
-
-				record_pointer = Seek_org + (2 * recordLength - 1) * databaseSegments[0];
-				if ((dboptions & GEOIP_MEMORY_CACHE) == 1)
-				  Array.Copy(dbbuffer, record_pointer, buf, 0, Math.Min(dbbuffer.Length - record_pointer, MAX_ORG_RECORD_LENGTH));
-				else
-				{
-					lock (ioLock)
-					{
-						file.Seek(record_pointer,SeekOrigin.Begin);
-						file.Read(buf,0,MAX_ORG_RECORD_LENGTH);
-					}
-				}
-				while (buf[str_length] != 0)
-				{
-					buf2[str_length] = Convert.ToChar(buf[str_length]);
-					str_length++;
-				}
-					buf2[str_length] = '\0';
-					org_buf = new String(buf2, 0, str_length);
-					return org_buf;
-				}
-				catch (IOException)
-				{
-					Console.WriteLine("IO Exception");
-				return null;
-			}
-		}
-
-		[MethodImpl(MethodImplOptions.Synchronized)]
-		int SeekCountryV6(IPAddress ipAddress)
-		{
-			byte [] v6vec = ipAddress.GetAddressBytes();
-			byte [] buf = new byte[2 * MAX_RECORD_LENGTH];
-			int [] x = new int[2];
-			int offset = 0;
-
-			for (int depth = 127; depth >= 0; depth--)
-			{
-				try
-				{
-					if ((dboptions & GEOIP_MEMORY_CACHE) == 1)
-					{
-					for (int i = 0;i < (2 * MAX_RECORD_LENGTH);i++)
-						buf[i] = dbbuffer[i+(2 * recordLength * offset)];
-					}
-					else
-					{
-						lock (ioLock)
-						{
-							file.Seek(2 * recordLength * offset,SeekOrigin.Begin);
-							file.Read(buf,0,2 * MAX_RECORD_LENGTH);
-						}
-					}
-				}
-				catch (IOException)
-				{
-					Console.WriteLine("IO Exception");
-				}
-				for (int i = 0; i<2; i++)
-				{
-					x[i] = 0;
-					for (int j = 0; j<recordLength; j++)
-					{
-						int y = buf[(i*recordLength)+j];
-						if (y < 0)
-						{
-							y+= 256;
-						}
-						x[i] += (y << (j * 8));
-					}
-				}
-
-				int bnum = 127 - depth;
-				int idx = bnum >> 3;
-				int b_mask = 1 << ( bnum & 7 ^ 7 );
-				if ((v6vec[idx] & b_mask) > 0)
-				{
-					if (x[1] >= databaseSegments[0])
-					{
-						return x[1];
-					}
-					offset = x[1];
-				}
-				else
-				{
-					if (x[0] >= databaseSegments[0])
-					{
-						return x[0];
-					}
-					offset = x[0];
-				}
-			}
-
-			// shouldn't reach here
-			Console.WriteLine("Error Seeking country while Seeking " + ipAddress);
-		return 0;
-		}
-
-		[MethodImpl(MethodImplOptions.Synchronized)]
-		int SeekCountry(long ipAddress)
-		{
-			byte [] buf = new byte[2 * MAX_RECORD_LENGTH];
-			int [] x = new int[2];
-			int offset = 0;
-			for (int depth = 31; depth >= 0; depth--)
-			{
-				try
-				{
-					if ((dboptions & GEOIP_MEMORY_CACHE) == 1)
-					{
-						for (int i = 0;i < (2 * MAX_RECORD_LENGTH);i++)
-						{
-							buf[i] = dbbuffer[i+(2 * recordLength * offset)];
-						}
-					}
-					else
-					{
-						lock (ioLock)
-						{
-							file.Seek(2 * recordLength * offset,SeekOrigin.Begin);
-							file.Read(buf, 0, 2 * MAX_RECORD_LENGTH);
-						}
-					}
-				}
-				catch (IOException)
-				{
-					Console.WriteLine("IO Exception");
-				}
-				for (int i = 0; i<2; i++)
-				{
-					x[i] = 0;
-					for (int j = 0; j<recordLength; j++)
-					{
-						int y = buf[(i*recordLength)+j];
-						if (y < 0)
-							y+= 256;
-						x[i] += (y << (j * 8));
-					}
-				}
-
-				if ((ipAddress & (1 << depth)) > 0)
-				{
-					if (x[1] >= databaseSegments[0])
-						return x[1];
-					offset = x[1];
-				}
-				else
-				{
-					if (x[0] >= databaseSegments[0])
-						return x[0];
-					offset = x[0];
-				}
-			}
-
-			// shouldn't reach here
-			Console.WriteLine("Error Seeking country while Seeking " + ipAddress);
-		return 0;
-		}
-
-		static long swapbytes(long ipAddress)
-		{
-			return (((ipAddress>>0) & 255) << 24) | (((ipAddress>>8) & 255) << 16)
-			| (((ipAddress>>16) & 255) << 8) | (((ipAddress>>24) & 255) << 0);
-		}
-
-		static long bytestoLong(byte [] address)
-		{
-			long ipnum = 0;
-			for (int i = 0; i < 4; ++i)
-			{
-				long y = address[i];
-				if (y < 0)
-					y += 256;
-				ipnum += y << ((3-i)*8);
-			}
-			return ipnum;
-		}
-
-		static int unsignedByteToInt(byte b)
-		{
-			return (int) b & 0xFF;
-		}
-	}
-}

GeoIP/Region.cs

@@ -1,52 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright (C) 2008 MaxMind Inc.  All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#endregion
-
-using System;
-
-public class Region
-{
-	public String countryCode;
-	public String countryName;
-	public String region;
-
-	public Region() { }
-
-	public Region(String countryCode,String countryName,String region)
-	{
-		this.countryCode = countryCode;
-		this.countryName = countryName;
-		this.region = region;
-	}
-
-	public String getcountryCode()
-	{
-		return countryCode;
-	}
-
-	public String getcountryName()
-	{
-		return countryName;
-	}
-
-	public String getregion()
-	{
-		return region;
-	}
-}

INSTALL

@@ -1,77 +0,0 @@
-Copyright 2007-2013 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.
-
-To run OpenRA, several files are needed from the original game disks.
-A minimal asset pack can also be downloaded and installed by the game.
-
-Windows
--------
-
-* .NET Framework >= 3.5-SP1
-	(http://www.microsoft.com/downloads/details.aspx?FamilyID=AB99342F-5D1A-413D-8319-81DA479AB0D7&displaylang=en)
-* Cg Toolkit >= 2.2 (optional, for Cg renderer)
-	(https://developer.nvidia.com/cg-toolkit-download)
-* SDL 1.2 (included)
-	(http://libsdl.org/download-1.2.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)
-
-To compile OpenRA, open the OpenRA.sln solution in the main folder,
-or build it from the command-line with MSBuild.
-
-Copy both the native DLLs from .\packaging\windows
-and the CLI images from .\thirdparty to the main folder.
-
-Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert
-or `OpenRA.Game.exe Game.Mod=cnc` for Command & Conquer
-
-Debian/Ubuntu
--------------
-
-* mono-gmcs
-* libmono-winforms2.0-cil
-* cli-common-dev (>= 2.10)
-* freetype
-* openal
-* sdl
-* nvidia-cg-toolkit (optional, for Cg renderer)
-
-To compile OpenRA, run `make all' from the command line.
-To grab the bundled CLI DLLs type `make dependencies'
-Run with either `launch-game.sh' or `mono --debug OpenRA.Game.exe'.
-
-Type 'sudo make install-all' for system wide installation. You
-can then run from the `openra` shortcut.
-
-Slackware
----------
-
-The following packages from slackbuilds.org are required, on 13.37 32-bit:
-* libgdiplus
-* mono
-* openAL
-* nvidia-cg-toolkit (optional, for Cg renderer)
-
-openSUSE
---------
-
-* mono-devel
-* openal
-* freetype2
-* SDL
-* cg (optional, for Cg renderer)
-
-Gentoo
-------
-
-* dev-lang/mono
-* dev-dotnet/libgdiplus
-* media-libs/openal
-* media-gfx/nvidia-cg-toolkit (optional, for Cg renderer)

INSTALL.md

@@ -0,0 +1,72 @@
+To run OpenRA, several files are needed from the original game disks.
+A minimal asset pack can also be downloaded and installed by the game.
+
+The following lists per-platform dependencies required to build from source.
+
+Windows
+=======
+
+* [.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)
+
+To compile OpenRA, open the `OpenRA.sln` solution in the main folder,
+or build it from the command-line with MSBuild.
+
+Copy both the native DLLs from `.\thirdparty\windows`
+and the CLI images from `.\thirdparty` to the main folder.
+
+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.
+
+To compile OpenRA, run `make all` from the command line.
+
+Run with either `launch-game.sh` or `mono --debug OpenRA.Game.exe`.
+
+Type `sudo make install-all` for system wide installation. Run `make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run from the `openra` shortcut.
+
+Debian/Ubuntu
+-------------
+
+* mono-dmcs
+* libmono-system-windows-forms4.0-cil
+* cli-common-dev (>= 2.10)
+* libfreetype6
+* libopenal1
+* liblua5.1-0
+* libsdl2-2.0-0
+* xdg-utils
+* zenity
+
+openSUSE
+--------
+
+* mono-devel
+* openal
+* freetype2
+* SDL2
+* lua51
+* xdg-utils
+* zenity
+
+Gentoo
+------
+
+* dev-lang/mono
+* dev-dotnet/libgdiplus
+* media-libs/freetype:2
+* media-libs/libsdl2
+* media-libs/openal
+* virtual/jpeg
+* virtual/opengl
+* dev-lang/lua-5.1.5
+* x11-misc/xdg-utils
+* gnome-extra/zenity

Makefile

@@ -18,8 +18,8 @@
 # to install with development tools, run:
 #   make [prefix=/foo] [bindir=/bar/bin] install-all
 #
-# to install Linux desktop files and icons:
-#   make install-shortcuts
+# to install Linux startup scripts, desktop files and icons:
+#   make install-linux-shortcuts
 #
 # to uninstall, run:
 #   make uninstall
@@ -34,10 +34,10 @@
 
 ############################## TOOLCHAIN ###############################
 #
-CSC         = gmcs
+CSC         = dmcs
 CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
 DEFINE      = DEBUG;TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll
+COMMON_LIBS = System.dll System.Core.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
 
 
 
@@ -48,15 +48,17 @@ prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
 datadir ?= $(datarootdir)
 bindir ?= $(prefix)/bin
-libexecdir ?= $(prefix)/lib
+libdir ?= $(prefix)/lib
+gameinstalldir ?= $(libdir)/openra
+
 BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
-# TODO: separate data and binaries properly
-DATA_INSTALL_DIR = $(DESTDIR)$(libexecdir)/openra
+DATA_INSTALL_DIR = $(DESTDIR)$(gameinstalldir)
 
 # install tools
 RM = rm
 RM_R = $(RM) -r
 RM_F = $(RM) -f
+RM_RF = $(RM) -rf
 CP = cp
 CP_R = $(CP) -r
 INSTALL = install
@@ -65,8 +67,8 @@ INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
-CORE = fileformats rcg rgl rsdl rsdl2 rnull game utility geoip irc
-TOOLS = editor tsbuild ralint
+CORE = rsdl2 rnull game utility irc ralint
+TOOLS = editor tsbuild crashdialog
 
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
@@ -75,25 +77,11 @@ VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev
 ######################## PROGRAM TARGET RULES ##########################
 #
 # Core binaries
-fileformats_SRCS := $(shell find OpenRA.FileFormats/ -iname '*.cs')
-fileformats_TARGET = OpenRA.FileFormats.dll
-fileformats_KIND = library
-fileformats_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll System.Windows.Forms.dll
-PROGRAMS = fileformats
-fileformats: $(fileformats_TARGET)
-
-geoip_SRCS := $(shell find GeoIP/ -iname '*.cs')
-geoip_TARGET = GeoIP.dll
-geoip_KIND = library
-geoip_LIBS = $(COMMON_LIBS)
-PROGRAMS += geoip
-geoip: $(geoip_TARGET)
 
 game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET = OpenRA.Game.exe
 game_KIND = winexe
-game_DEPS = $(fileformats_TARGET)
-game_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) thirdparty/Tao/Tao.OpenAl.dll thirdparty/SharpFont.dll
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/SDL2-CS.dll thirdparty/SharpFont.dll
 game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS += game
 game: $(game_TARGET)
@@ -101,56 +89,47 @@ game: $(game_TARGET)
 irc_SRCS := $(shell find OpenRA.Irc/ -iname '*.cs')
 irc_TARGET = OpenRA.Irc.dll
 irc_KIND = library
-irc_DEPS = $(fileformats_TARGET) $(game_TARGET)
+irc_DEPS = $(game_TARGET)
 irc_LIBS = $(COMMON_LIBS) $(irc_DEPS)
 PROGRAMS += irc
 irc: $(irc_TARGET)
 
 # Renderer dlls
-rsdl_SRCS := $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs')
-rsdl_TARGET = OpenRA.Renderer.SdlCommon.dll
-rsdl_KIND = library
-rsdl_DEPS = $(fileformats_TARGET) $(game_TARGET)
-rsdl_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll $(rsdl_DEPS)
-
-rcg_SRCS := $(shell find OpenRA.Renderer.Cg/ -iname '*.cs')
-rcg_TARGET = OpenRA.Renderer.Cg.dll
-rcg_KIND = library
-rcg_DEPS = $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET)
-rcg_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll $(rcg_DEPS)
-
-rgl_SRCS := $(shell find OpenRA.Renderer.Gl/ -iname '*.cs')
-rgl_TARGET = OpenRA.Renderer.Gl.dll
-rgl_KIND = library
-rgl_DEPS = $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET)
-rgl_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.OpenGl.dll $(rgl_DEPS)
-
 rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
 rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
 rsdl2_KIND = library
-rsdl2_DEPS = $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET) $(rgl_TARGET)
-rsdl2_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.OpenGl.dll thirdparty/SDL2\#.dll $(rsdl2_DEPS)
+rsdl2_DEPS = $(game_TARGET)
+rsdl2_LIBS = $(COMMON_LIBS) thirdparty/SDL2-CS.dll $(rsdl2_DEPS)
 
 rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
 rnull_TARGET = OpenRA.Renderer.Null.dll
 rnull_KIND = library
-rnull_DEPS = $(fileformats_TARGET) $(game_TARGET)
+rnull_DEPS = $(game_TARGET)
 rnull_LIBS = $(COMMON_LIBS) $(rnull_DEPS)
-PROGRAMS += rcg rgl rsdl2 rnull rsdl
-renderers: $(rcg_TARGET) $(rgl_TARGET) $(rsdl2_TARGET) $(rnull_TARGET) $(rsdl_TARGET)
+PROGRAMS += rsdl2 rnull
+renderers: $(rsdl2_TARGET) $(rnull_TARGET)
 
+# Mods Common
+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)
+PROGRAMS += mod_common
+mod_common: $(mod_common_TARGET)
 
 ##### Official Mods #####
 
-STD_MOD_LIBS	= $(fileformats_TARGET) $(game_TARGET) thirdparty/KopiLua.dll thirdparty/NLua.dll
+STD_MOD_LIBS	= $(game_TARGET) thirdparty/KopiLua.dll thirdparty/NLua.dll
 STD_MOD_DEPS	= $(STD_MOD_LIBS) $(ralint_TARGET)
 
+
 # Red Alert
 mod_ra_SRCS := $(shell find OpenRA.Mods.RA/ -iname '*.cs')
 mod_ra_TARGET = mods/ra/OpenRA.Mods.RA.dll
 mod_ra_KIND = library
-mod_ra_DEPS = $(STD_MOD_DEPS) $(geoip_TARGET) $(irc_TARGET)
-mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(geoip_TARGET) $(irc_TARGET)
+mod_ra_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(irc_TARGET)
+mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(irc_TARGET)
 PROGRAMS += mod_ra
 mod_ra: $(mod_ra_TARGET)
 
@@ -158,8 +137,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_ra_TARGET)
-mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
+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)
 PROGRAMS += mod_cnc
 mod_cnc: $(mod_cnc_TARGET)
 
@@ -176,8 +155,8 @@ 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_ra_TARGET)
-mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
+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)
 PROGRAMS += mod_ts
 mod_ts: $(mod_ts_TARGET)
 
@@ -187,8 +166,8 @@ mod_ts: $(mod_ts_TARGET)
 editor_SRCS := $(shell find OpenRA.Editor/ -iname '*.cs')
 editor_TARGET = OpenRA.Editor.exe
 editor_KIND = winexe
-editor_DEPS = $(fileformats_TARGET) $(game_TARGET)
-editor_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
+editor_DEPS = $(game_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
 
@@ -203,7 +182,7 @@ editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor
 ralint_SRCS := $(shell find OpenRA.Lint/ -iname '*.cs')
 ralint_TARGET = OpenRA.Lint.exe
 ralint_KIND = exe
-ralint_DEPS = $(fileformats_TARGET) $(game_TARGET)
+ralint_DEPS = $(game_TARGET)
 ralint_LIBS = $(COMMON_LIBS) $(ralint_DEPS)
 PROGRAMS += ralint
 ralint: $(ralint_TARGET)
@@ -222,7 +201,7 @@ test:
 tsbuild_SRCS := $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
 tsbuild_TARGET = OpenRA.TilesetBuilder.exe
 tsbuild_KIND = winexe
-tsbuild_DEPS = $(fileformats_TARGET) $(game_TARGET)
+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
@@ -237,12 +216,21 @@ tsbuild: OpenRA.TilesetBuilder.FormBuilder.resources OpenRA.TilesetBuilder.FormN
 
 ##### Launchers / Utilities #####
 
+crashdialog_SRCS := $(shell find OpenRA.CrashDialog/ -iname '*.cs')
+crashdialog_TARGET = OpenRA.CrashDialog.exe
+crashdialog_KIND = exe
+crashdialog_DEPS = $(game_TARGET)
+crashdialog_LIBS = $(COMMON_LIBS) $(crashdialog_DEPS) System.Windows.Forms.dll
+crashdialog_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
+PROGRAMS += crashdialog
+crashdialog: $(crashdialog_TARGET)
+
 # Backend for the launcher apps - queries game/mod info and applies actions to an install
 utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
 utility_TARGET = OpenRA.Utility.exe
 utility_KIND = exe
-utility_DEPS = $(fileformats_TARGET) $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll System.Windows.Forms.dll
+utility_DEPS = $(game_TARGET)
+utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll
 PROGRAMS += utility
 utility: $(utility_TARGET)
 
@@ -274,28 +262,39 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 
 ########################## MAKE/INSTALL RULES ##########################
 #
-default: dependencies core
+default: cli-dependencies core
 
-core: game renderers mods utility
+core: game renderers mods utility ralint
 
-tools: editor tsbuild ralint
+tools: editor tsbuild crashdialog
 
-package: dependencies core editor docs version
+package: dependencies core editor crashdialog docs version
 
-mods: mod_ra mod_cnc mod_d2k mod_ts
+mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
 
-all: dependencies core tools
+all: cli-dependencies core tools
 
 clean:
-	@-$(RM_F) *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-$(RM_F) *.exe *.dll ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-$(RM_RF) ./*/bin ./*/obj
 
 distclean: clean
 
-dependencies:
-	@ $(CP_R) thirdparty/*.dl* .
-	@ $(CP_R) thirdparty/Tao/* .
+platformdeps = "linux"
+ifeq ($(shell uname),Darwin)
+	platformdeps = "osx"
+endif
 
-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml
+dependencies: cli-dependencies native-dependencies
+
+cli-dependencies:
+	@ $(CP_R) thirdparty/*.dll .
+	@ $(CP_R) thirdparty/*.dll.config .
+
+native-dependencies:
+	@ $(CP_R) thirdparty/${platformdeps}/* .
+
+version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
 		mv -f $${i}.tmp $${i} ; \
@@ -303,18 +302,22 @@ version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml
 
 # Documentation (d2k depends on all mod libraries)
 docs: utility
-	@mono --debug OpenRA.Utility.exe --docs d2k > DOCUMENTATION.md
+	@mono --debug OpenRA.Utility.exe d2k --docs > DOCUMENTATION.md
+	@mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md
 
 install: install-core
 
 install-all: install-core install-tools
 
+install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
+
 install-core: default
 	@-echo "Installing OpenRA to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
 	@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
+	@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
 	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
 	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/cnc"
 	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
@@ -324,59 +327,60 @@ 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) "GeoIP.dat" "$(DATA_INSTALL_DIR)/GeoIP.dat"
+	@$(INSTALL_DATA) "GeoLite2-Country.mmdb" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb"
 	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
-	@$(INSTALL_DATA) CHANGELOG "$(DATA_INSTALL_DIR)/CHANGELOG"
 	@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
 
 	@$(CP_R) glsl "$(DATA_INSTALL_DIR)"
-	@$(CP_R) cg "$(DATA_INSTALL_DIR)"
+	@$(CP_R) lua "$(DATA_INSTALL_DIR)"
 	@$(CP) *.ttf "$(DATA_INSTALL_DIR)"
-	@$(CP) thirdparty/Tao/* "$(DATA_INSTALL_DIR)"
-	@$(CP) thirdparty/SDL2\#* "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll "$(DATA_INSTALL_DIR)"
-	@$(CP) thirdparty/SharpFont.dll.config "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/KopiLua.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/NLua.dll "$(DATA_INSTALL_DIR)"
+	@$(CP) SDL2-CS* "$(DATA_INSTALL_DIR)"
+	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) SharpFont.dll "$(DATA_INSTALL_DIR)"
+	@$(CP) SharpFont.dll.config "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) Mono.Nat.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) KopiLua.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) NLua.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) MaxMind.GeoIP2.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) RestSharp.dll "$(DATA_INSTALL_DIR)"
 
-	@echo "#!/bin/sh" > openra
-	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra
-	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' >> openra
-	@echo 'EXECDIR="$${ROOTDIR}'"$(libexecdir)"'"' >> openra
-	@echo 'cd "$${EXECDIR}/openra"' >> openra
-	@echo 'exec mono OpenRA.Game.exe "$$@"' >> openra
-	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
-	@-$(RM) openra
+ifeq ($(shell uname),Linux)
+	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
+endif
 
 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)"
 
+install-linux-icons:
+	@$(INSTALL_DIR) "$(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-scripts:
+	@echo "#!/bin/sh" > openra
+	@echo 'cd "$(gameinstalldir)"' >> openra
+	@echo 'exec mono OpenRA.Game.exe "$$@"' >> openra
+	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
+	@-$(RM) openra
+
 	@echo "#!/bin/sh" >  openra-editor
-	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra-editor
-	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' >> openra-editor
-	@echo 'EXECDIR="$${ROOTDIR}'"$(libexecdir)"'"' >> openra-editor
-	@echo 'cd "$${EXECDIR}/openra"' >> 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
 
-install-shortcuts:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
-
 uninstall:
 	@-$(RM_R) "$(DATA_INSTALL_DIR)"
 	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
@@ -410,8 +414,8 @@ help:
 	@echo to install with development tools, run:
 	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all
 	@echo
-	@echo to install Linux desktop files and icons
-	@echo \ \ make install-shortcuts
+	@echo to install Linux startup scripts, desktop files and icons
+	@echo \ \ make install-linux-shortcuts
 	@echo
 	@echo to uninstall, run:
 	@echo \ \ make uninstall

OpenRA.CrashDialog/OpenRA.CrashDialog.csproj

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{47F1B0EE-EB35-47F2-93E4-273C70909157}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>OpenRA</RootNamespace>
+    <AssemblyName>OpenRA.CrashDialog</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>..\OpenRA.Game\OpenRA.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Drawing" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+      <Name>OpenRA.Game</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>

OpenRA.CrashDialog/Program.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -11,15 +11,21 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Media;
+using System.Reflection;
 using System.Windows.Forms;
 
-namespace OpenRA
+namespace OpenRA.CrashDialog
 {
-	public static class FatalErrorDialog
+	class FatalErrorDialog
 	{
-		public static void Show()
+		static Settings settings;
+		[STAThread]
+		public static void Main(string[] args)
 		{
+			settings = new Settings(Platform.SupportDir + "settings.yaml", new Arguments());
+
 			var form = new Form
 			{
 				Size = new Size(315, 140),
@@ -27,7 +33,8 @@ namespace OpenRA
 				MinimizeBox = false,
 				MaximizeBox = false,
 				FormBorderStyle = FormBorderStyle.FixedDialog,
-				StartPosition = FormStartPosition.CenterScreen
+				StartPosition = FormStartPosition.CenterScreen,
+				Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location)
 			};
 
 			var notice = new Label
@@ -76,8 +83,8 @@ namespace OpenRA
 
 			form.FormClosed += (sender, e) =>
 			{
-				Game.Settings.Debug.ShowFatalErrorDialog = !dontShowAgain.Checked;
-				Game.Settings.Save();
+				settings.Debug.ShowFatalErrorDialog = !dontShowAgain.Checked;
+				settings.Save();
 			};
 
 			SystemSounds.Exclamation.Play();
@@ -88,7 +95,7 @@ namespace OpenRA
 		{
 			try
 			{
-				Process.Start(Log.LogPath);
+				Process.Start(Platform.SupportDir + "Logs" + Path.DirectorySeparatorChar);
 			}
 			catch { }
 		}
@@ -97,7 +104,7 @@ namespace OpenRA
 		{
 			try
 			{
-				Process.Start(Game.Settings.Debug.FatalErrorDialogFaq);
+				Process.Start(settings.Debug.FatalErrorDialogFaq);
 			}
 			catch { }
 		}

OpenRA.Editor/ActorPropertiesDialog.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -11,7 +11,6 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Editor
 {

OpenRA.Editor/ActorTemplate.cs

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

OpenRA.Editor/ActorTool.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -9,8 +9,6 @@
 #endregion
 
 using System.Linq;
-using OpenRA.FileFormats;
-
 using SGraphics = System.Drawing.Graphics;
 
 namespace OpenRA.Editor
@@ -40,7 +38,7 @@ namespace OpenRA.Editor
 			};
 		}
 
-		string NextActorName(Surface surface)
+		static string NextActorName(Surface surface)
 		{
 			var id = 0;
 			for (;;)

OpenRA.Editor/BrushTool.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -11,8 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
-
 using SGraphics = System.Drawing.Graphics;
 
 namespace OpenRA.Editor
@@ -39,16 +37,15 @@ namespace OpenRA.Editor
 			for (var u = 0; u < template.Size.X; u++)
 				for (var v = 0; v < template.Size.Y; v++)
 				{
-					if (surface.Map.IsInMap(new CVec(u, v) + pos))
+					var cell = pos + new CVec(u, v);
+					if (surface.Map.Contains(cell))
 					{
 						var z = u + v * template.Size.X;
 						if (tile[z].Length > 0)
-							surface.Map.MapTiles.Value[u + pos.X, v + pos.Y] =
-								new TileReference<ushort, byte>
-								{
-									Type = brushTemplate.N,
-									Index = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z,
-								};
+						{
+							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))
@@ -64,7 +61,7 @@ namespace OpenRA.Editor
 		{
 			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,
+					surface.TileSetRenderer.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
 					brushTemplate.Bitmap.Width * surface.Zoom,
 					brushTemplate.Bitmap.Height * surface.Zoom);
 		}
@@ -72,14 +69,15 @@ namespace OpenRA.Editor
 		void FloodFillWithBrush(Surface s, CPos pos)
 		{
 			var queue = new Queue<CPos>();
-			var replace = s.Map.MapTiles.Value[pos.X, pos.Y];
+			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) =>
 			{
-				if (s.Map.IsInMap(x, y) && !touched[x, y])
+				var c = new CPos(x, y);
+				if (s.Map.Contains(c) && !touched[x, y])
 				{
-					queue.Enqueue(new CPos(x, y));
+					queue.Enqueue(c);
 					touched[x, y] = true;
 				}
 			};
@@ -88,7 +86,7 @@ namespace OpenRA.Editor
 			while (queue.Count > 0)
 			{
 				var p = queue.Dequeue();
-				if (s.Map.MapTiles.Value[p.X, p.Y].Type != replace.Type)
+				if (s.Map.MapTiles.Value[p].Type != replace.Type)
 					continue;
 
 				var a = FindEdge(s, p, new CVec(-1, 0), replace);
@@ -96,10 +94,10 @@ namespace OpenRA.Editor
 
 				for (var x = a.X; x <= b.X; x++)
 				{
-					s.Map.MapTiles.Value[x, p.Y] = new TileReference<ushort, byte> { Type = brushTemplate.N, Index = (byte)0 };
-					if (s.Map.MapTiles.Value[x, p.Y - 1].Type == replace.Type)
+					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[x, p.Y + 1].Type == replace.Type)
+					if (s.Map.MapTiles.Value[new CPos(x, p.Y + 1)].Type == replace.Type)
 						maybeEnqueue(x, p.Y + 1);
 				}
 			}
@@ -109,13 +107,13 @@ namespace OpenRA.Editor
 			s.Chunks.Clear();
 		}
 
-		CPos FindEdge(Surface s, CPos p, CVec d, TileReference<ushort, byte> replace)
+		static CPos FindEdge(Surface s, CPos p, CVec d, TerrainTile replace)
 		{
 			for (;;)
 			{
 				var q = p + d;
-				if (!s.Map.IsInMap(q)) return p;
-				if (s.Map.MapTiles.Value[q.X, q.Y].Type != replace.Type) return p;
+				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,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,

OpenRA.Editor/ErrorListDialog.cs

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

OpenRA.Editor/Form1.Designer.cs

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

OpenRA.Editor/Form1.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -14,7 +14,7 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
+using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
@@ -25,11 +25,11 @@ namespace OpenRA.Editor
 		public Form1(string[] args)
 		{
 			InitializeComponent();
-			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
+			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
 
 			currentMod = args.FirstOrDefault() ?? "ra";
 
-			toolStripComboBox1.Items.AddRange(Mod.AllMods.Keys.ToArray());
+			toolStripComboBox1.Items.AddRange(ModMetadata.AllMods.Keys.ToArray());
 
 			toolStripComboBox1.SelectedIndexChanged += (_, e) =>
 			{
@@ -47,8 +47,8 @@ namespace OpenRA.Editor
 				currentMod = toolStripComboBox1.SelectedItem as string;
 
 				Game.modData = new ModData(currentMod);
-				FileSystem.LoadFromManifest(Game.modData.Manifest);
-				Rules.LoadRules(Game.modData.Manifest, new Map());
+				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);
@@ -69,7 +69,8 @@ namespace OpenRA.Editor
 		void OnMapChanged()
 		{
 			MakeDirty();
-			miniMapBox.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
+			var tileSet = Program.Rules.TileSets[surface1.Map.Tileset];
+			miniMapBox.Image = Minimap.RenderMapPreview(tileSet, surface1.Map, true);
 			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
 		}
 
@@ -84,10 +85,14 @@ namespace OpenRA.Editor
 				var objSaved = kv.Value.Save();
 
 				// TODO: make this work properly
-				foreach (var init in Rules.Info[kv.Value.Type].GetInitKeys())
+				foreach (var init in Program.Rules.Actors[kv.Value.Type].GetInitKeys())
 					apd.AddRow(init.First,
 						apd.MakeEditorControl(init.Second,
-							() => objSaved.NodesDict.ContainsKey(init.First) ? objSaved.NodesDict[init.First].Value : null,
+							() =>
+							{
+								var nodesDict = objSaved.ToDictionary();
+								return nodesDict.ContainsKey(init.First) ? nodesDict[init.First].Value : null;
+							},
 							_ => { }));
 
 				apd.ShowDialog();
@@ -120,7 +125,7 @@ namespace OpenRA.Editor
 			if (map.Players.Count == 0)
 				map.MakeDefaultPlayers();
 
-			PrepareMapResources(Game.modData.Manifest, map);
+			PrepareMapResources(Game.modData, map);
 
 			// Calculate total net worth of resources in cash
 			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
@@ -135,23 +140,24 @@ namespace OpenRA.Editor
 			resourcePalette.Controls.Clear();
 
 			loadedMapName = null;
-			PrepareMapResources(Game.modData.Manifest, map);
+			PrepareMapResources(Game.modData, map);
 
 			MakeDirty();
 		}
 
 		// this code is insanely stupid, and mostly my fault -- chrisf
-		void PrepareMapResources(Manifest manifest, Map map)
+		void PrepareMapResources(ModData modData, Map map)
 		{
-			Rules.LoadRules(manifest, map);
-			tileset = Rules.TileSets[map.Tileset];
-			tilesetRenderer = new TileSetRenderer(tileset, manifest.TileSize);
+			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 Palette(FileSystem.Open(tileset.Palette), shadowIndex);
+			var palette = new ImmutablePalette(GlobalFileSystem.Open(tileset.Palette), shadowIndex);
 
 			// required for desert terrain in RA
 			var playerPalette = tileset.PlayerPalette ?? tileset.Palette;
-			var shadowedPalette = new Palette(FileSystem.Open(playerPalette), shadowIndex);
+			var shadowedPalette = new ImmutablePalette(GlobalFileSystem.Open(playerPalette), shadowIndex);
 
 			surface1.Bind(map, tileset, tilesetRenderer, palette, shadowedPalette);
 
@@ -160,7 +166,7 @@ namespace OpenRA.Editor
 			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 => templateOrder.ToList().IndexOf(t.Key)))
+			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
@@ -208,12 +214,12 @@ namespace OpenRA.Editor
 
 			var actorTemplates = new List<ActorTemplate>();
 
-			foreach (var a in Rules.Info.Keys)
+			foreach (var a in Program.Rules.Actors.Keys)
 			{
 				try
 				{
-					var info = Rules.Info[a];
-					if (!info.Traits.Contains<RenderSimpleInfo>()) continue;
+					var info = Program.Rules.Actors[a];
+					if (!info.Traits.Contains<ILegacyEditorRenderInfo>()) continue;
 
 					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
 					if (etf != null && etf.ExcludeTilesets != null
@@ -222,10 +228,10 @@ namespace OpenRA.Editor
 						&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
 
 					var templatePalette = shadowedPalette;
-					var rsi = info.Traits.GetOrDefault<RenderSimpleInfo>();
+					var rsi = info.Traits.GetOrDefault<ILegacyEditorRenderInfo>();
 
 					// exception for desert buildings
-					if (rsi != null && rsi.Palette != null && rsi.Palette.Contains("terrain"))
+					if (rsi != null && rsi.EditorPalette != null && rsi.EditorPalette.Contains("terrain"))
 						templatePalette = palette;
 
 					var template = RenderUtils.RenderActor(info, tileset, templatePalette);
@@ -253,7 +259,7 @@ namespace OpenRA.Editor
 
 			var resourceTemplates = new List<ResourceTemplate>();
 
-			foreach (var a in Rules.Info["world"].Traits.WithInterface<ResourceTypeInfo>())
+			foreach (var a in Program.Rules.Actors["world"].Traits.WithInterface<ResourceTypeInfo>())
 			{
 				try
 				{
@@ -286,7 +292,7 @@ namespace OpenRA.Editor
 				p.ResumeLayout();
 			}
 
-			miniMapBox.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
+			miniMapBox.Image = Minimap.RenderMapPreview(tileset, surface1.Map, true);
 
 			propertiesToolStripMenuItem.Enabled = true;
 			toolStripMenuItemProperties.Enabled = true;
@@ -305,7 +311,7 @@ namespace OpenRA.Editor
 			actorOwnerChooser.Items.Clear();
 			actorOwnerChooser.Items.AddRange(surface1.Map.Players.Values.ToArray());
 			actorOwnerChooser.SelectedIndex = 0;
-			surface1.NewActorOwner = (actorOwnerChooser.SelectedItem as PlayerReference).Name;
+			surface1.NewActorOwner = ((PlayerReference)actorOwnerChooser.SelectedItem).Name;
 		}
 
 		void ResizeClicked(object sender, EventArgs e)
@@ -379,7 +385,7 @@ namespace OpenRA.Editor
 				nms.ButtonOkay.Text = "Open";
 
 				if (DialogResult.OK == nms.ShowDialog())
-					LoadMap(nms.NewText.Tag as string);
+					LoadMap((string)nms.NewText.Tag);
 			}
 		}
 
@@ -388,12 +394,12 @@ namespace OpenRA.Editor
 			using (var nmd = new NewMapDialog())
 			{
 				nmd.TheaterBox.Items.Clear();
-				nmd.TheaterBox.Items.AddRange(Rules.TileSets.Select(a => a.Value.Id).ToArray());
+				nmd.TheaterBox.Items.AddRange(Program.Rules.TileSets.Select(a => a.Value.Id).ToArray());
 				nmd.TheaterBox.SelectedIndex = 0;
 
 				if (DialogResult.OK == nmd.ShowDialog())
 				{
-					var tileset = OpenRA.Rules.TileSets[nmd.TheaterBox.SelectedItem as string];
+					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);
@@ -402,7 +408,7 @@ namespace OpenRA.Editor
 
 					map.Players.Clear();
 					map.MakeDefaultPlayers();
-					map.FixOpenAreas();
+					map.FixOpenAreas(Program.Rules);
 
 					NewMap(map);
 				}
@@ -485,7 +491,7 @@ namespace OpenRA.Editor
 		void FixOpenAreas(object sender, EventArgs e)
 		{
 			dirty = true;
-			surface1.Map.FixOpenAreas();
+			surface1.Map.FixOpenAreas(Program.Rules);
 			surface1.Chunks.Clear();
 			surface1.Invalidate();
 		}
@@ -505,7 +511,7 @@ namespace OpenRA.Editor
 		void DrawPlayerListItem(object sender, DrawItemEventArgs e)
 		{
 			// color block
-			var player = e.Index >= 0 ? (PlayerReference)(sender as ComboBox).Items[e.Index] : null;
+			var player = e.Index >= 0 ? (PlayerReference)((ComboBox)sender).Items[e.Index] : null;
 
 			e.DrawBackground();
 			e.DrawFocusRectangle();
@@ -533,17 +539,17 @@ namespace OpenRA.Editor
 
 		void OpenRAWebsiteToolStripMenuItemClick(object sender, EventArgs e)
 		{
-			System.Diagnostics.Process.Start("http://www.open-ra.org");
+			System.Diagnostics.Process.Start("http://www.openra.net");
 		}
 
 		void OpenRAResourcesToolStripMenuItemClick(object sender, EventArgs e)
 		{
-			System.Diagnostics.Process.Start("http://content.open-ra.org");
+			System.Diagnostics.Process.Start("http://resource.openra.net");
 		}
 
 		void WikiDocumentationToolStripMenuItemClick(object sender, EventArgs e)
 		{
-			System.Diagnostics.Process.Start("http://github.com/OpenRA/OpenRA/wiki");
+			System.Diagnostics.Process.Start("http://wiki.openra.net");
 		}
 
 		void DiscussionForumsToolStripMenuItemClick(object sender, EventArgs e)
@@ -553,7 +559,7 @@ namespace OpenRA.Editor
 
 		void IssueTrackerToolStripMenuItemClick(object sender, EventArgs e)
 		{
-			System.Diagnostics.Process.Start("http://github.com/OpenRA/OpenRA/issues");
+			System.Diagnostics.Process.Start("http://bugs.openra.net");
 		}
 
 		void DeveloperBountiesToolStripMenuItemClick(object sender, EventArgs e)
@@ -576,7 +582,7 @@ namespace OpenRA.Editor
 
 		void HelpToolStripButton_Click(object sender, EventArgs e)
 		{
-			System.Diagnostics.Process.Start("http://github.com/OpenRA/OpenRA/wiki/Mapping");
+			System.Diagnostics.Process.Start("http://wiki.openra.net/Mapping");
 		}
 
 		void ToolStripMenuItemNewClick(object sender, EventArgs e)
@@ -631,11 +637,12 @@ namespace OpenRA.Editor
 		
 		public int CalculateTotalResource()
 		{
-			int totalResource = 0;
-			for (int i = 0; i < surface1.Map.MapSize.X; i++)
-				for (int j = 0; j < surface1.Map.MapSize.Y; j++)
+			var totalResource = 0;
+			for (var i = 0; i < surface1.Map.MapSize.X; i++)
+				for (var j = 0; j < surface1.Map.MapSize.Y; j++)
 				{
-					if (surface1.Map.MapResources.Value[i, j].Type != 0)
+					var cell = new CPos(i, j);
+					if (surface1.Map.MapResources.Value[cell].Type != 0)
 						totalResource += GetResourceValue(i, j);
 				}
 
@@ -644,13 +651,16 @@ namespace OpenRA.Editor
 		
 		int GetAdjecentCellsWith(int resourceType, int x, int y)
 		{
-			int sum = 0;
+			var sum = 0;
 			for (var u = -1; u < 2; u++)
 				for (var v = -1; v < 2; v++)
 				{
-					if (!surface1.Map.IsInMap(new CPos(x + u, y + v)))
+					var cell = new CPos(x + u, y + v);
+
+					if (!surface1.Map.Contains(cell))
 						continue;
-					if (surface1.Map.MapResources.Value[x + u, y + v].Type == resourceType)
+
+					if (surface1.Map.MapResources.Value[cell].Type == resourceType)
 						++sum;
 				}
 
@@ -659,15 +669,15 @@ namespace OpenRA.Editor
 
 		int GetResourceValue(int x, int y)
 		{
-			int imageLength = 0;
-			int type = surface1.Map.MapResources.Value[x, y].Type;
+			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;
-			int density = (GetAdjecentCellsWith(type, x, y) * imageLength - 1) / 9;
-			int value = template.Info.ValuePerUnit;
+			var density = (GetAdjecentCellsWith(type, x, y) * imageLength - 1) / 9;
+			var value = template.Info.ValuePerUnit;
 			return density * value;
 		}
 

OpenRA.Editor/ITool.cs

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

OpenRA.Editor/MapSelect.Designer.cs

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

OpenRA.Editor/MapSelect.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -47,7 +47,7 @@ namespace OpenRA.Editor
 
 			foreach (var map in MapCache.FindMapsIn(MapFolderPath))
 			{
-				ListViewItem map1 = new ListViewItem();
+				var map1 = new ListViewItem();
 				map1.Tag = map;
 				map1.Text = Path.GetFileNameWithoutExtension(map);
 				map1.ImageIndex = 0;
@@ -66,7 +66,7 @@ namespace OpenRA.Editor
 				NewText.Text = MapList.SelectedItems[0].Text;
 				NewText.Tag = MapList.SelectedItems[0].Tag;
 
-				var map = new Map(NewText.Tag as string);
+				var map = new Map((string)NewText.Tag);
 				TitleText.Text = map.Title;
 				AuthorText.Text = map.Author;
 				TheaterText.Text = map.Tileset;
@@ -75,7 +75,8 @@ namespace OpenRA.Editor
 
 				try
 				{
-					MiniMapBox.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
+					var tileset = Program.Rules.TileSets[map.Tileset];
+					MiniMapBox.Image = Minimap.RenderMapPreview(tileset, map, true);
 				}
 				catch (Exception ed)
 				{

OpenRA.Editor/NewMapDialog.Designer.cs

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

OpenRA.Editor/NewMapDialog.cs

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

OpenRA.Editor/OpenRA.Editor.csproj

@@ -10,7 +10,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OpenRA.Editor</RootNamespace>
     <AssemblyName>OpenRA.Editor</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
     <FileUpgradeFlags>
@@ -33,45 +32,35 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>..\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+      <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>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ActorPropertiesDialog.cs">
@@ -167,10 +156,6 @@
     <Compile Include="TileSetRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
-      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRA.FileFormats</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
       <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
       <Name>OpenRA.Game</Name>

OpenRA.Editor/Program.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -10,18 +10,19 @@
 
 using System;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
 
 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);

OpenRA.Editor/PropertiesDialog.Designer.cs

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

OpenRA.Editor/PropertiesDialog.cs

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

OpenRA.Editor/RenderUtils.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -8,18 +8,19 @@
  */
 #endregion
 
-using System.Collections;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
 using OpenRA.FileFormats;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
 using OpenRA.Traits;
 
 namespace OpenRA.Editor
 {
 	static class RenderUtils
 	{
-		static Bitmap RenderShp(ISpriteSource shp, Palette p)
+		static Bitmap RenderShp(ISpriteSource shp, IPalette p)
 		{
 			var frame = shp.Frames.First();
 
@@ -32,7 +33,7 @@ namespace OpenRA.Editor
 
 			unsafe
 			{
-				byte* q = (byte*)data.Scan0.ToPointer();
+				var q = (byte*)data.Scan0.ToPointer();
 				var stride2 = data.Stride;
 
 				for (var i = 0; i < frame.Size.Width; i++)
@@ -44,18 +45,17 @@ namespace OpenRA.Editor
 			return bitmap;
 		}
 
-		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
+		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, IPalette p)
 		{
-			var image = RenderSprites.GetImage(info);
-
-			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			var image = info.Traits.Get<ILegacyEditorRenderInfo>().EditorImage(info);
+			using (var s = GlobalFileSystem.OpenWithExts(image, tileset.Extensions))
 			{
 				var shp = new ShpReader(s);
 				var bitmap = RenderShp(shp, p);
 
 				try
 				{
-					using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
+					using (var s2 = GlobalFileSystem.OpenWithExts(image + "2", tileset.Extensions))
 					{
 						var shp2 = new ShpReader(s2);
 						var roofBitmap = RenderShp(shp2, p);
@@ -75,10 +75,10 @@ namespace OpenRA.Editor
 			}
 		}
 
-		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
+		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, IPalette p)
 		{
 			var image = info.EditorSprite;
-			using (var s = FileSystem.OpenWithExts(image, exts))
+			using (var s = GlobalFileSystem.OpenWithExts(image, exts))
 			{
 				// TODO: Do this properly
 				var shp = new ShpReader(s) as ISpriteSource;
@@ -91,7 +91,7 @@ namespace OpenRA.Editor
 
 				unsafe
 				{
-					byte* q = (byte*)data.Scan0.ToPointer();
+					var q = (byte*)data.Scan0.ToPointer();
 					var stride = data.Stride;
 
 					for (var i = 0; i < frame.Size.Width; i++)
@@ -100,7 +100,7 @@ namespace OpenRA.Editor
 				}
 
 				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.Frames.Count() - 1 };
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.Frames.Count - 1 };
 			}
 		}
 	}

OpenRA.Editor/ResizeDialog.Designer.cs

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

OpenRA.Editor/ResizeDialog.cs

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

OpenRA.Editor/ResourceTool.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -9,8 +9,6 @@
 #endregion
 
 using System;
-using OpenRA.FileFormats;
-
 using SGraphics = System.Drawing.Graphics;
 
 namespace OpenRA.Editor
@@ -23,12 +21,9 @@ namespace OpenRA.Editor
 
 		public void Apply(Surface surface)
 		{
-			surface.Map.MapResources.Value[surface.GetBrushLocation().X, surface.GetBrushLocation().Y]
-				= new TileReference<byte, byte>
-				{
-					Type = (byte)resourceTemplate.Info.ResourceType,
-					Index = (byte)random.Next(resourceTemplate.Info.MaxDensity)
-				};
+			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);

OpenRA.Editor/Surface.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -14,7 +14,8 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 using SGraphics = System.Drawing.Graphics;
@@ -44,8 +45,8 @@ namespace OpenRA.Editor
 		public Map Map { get; private set; }
 		public TileSet TileSet { get; private set; }
 		public TileSetRenderer TileSetRenderer { get; private set; }
-		public Palette Palette { get; private set; }
-		public Palette PlayerPalette { get; private set; }
+		public IPalette Palette { get; private set; }
+		public IPalette PlayerPalette { get; private set; }
 		public int2 Offset;
 
 		public int2 GetOffset() { return Offset; }
@@ -61,8 +62,8 @@ namespace OpenRA.Editor
 		public bool ShowRuler;
 
 		public bool IsPaste { get { return TileSelection != null && ResourceSelection != null; } }
-		public TileReference<ushort, byte>[,] TileSelection;
-		public TileReference<byte, byte>[,] ResourceSelection;
+		public TerrainTile[,] TileSelection;
+		public ResourceTile[,] ResourceSelection;
 		public CPos SelectionStart;
 		public CPos SelectionEnd;
 
@@ -80,7 +81,7 @@ namespace OpenRA.Editor
 
 		public Keys GetModifiers() { return ModifierKeys; }
 
-		public void Bind(Map m, TileSet ts, TileSetRenderer tsr, Palette p, Palette pp)
+		public void Bind(Map m, TileSet ts, TileSetRenderer tsr, IPalette p, IPalette pp)
 		{
 			Map = m;
 			TileSet = ts;
@@ -205,9 +206,9 @@ namespace OpenRA.Editor
 			var key = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == brushLocation);
 			if (key.Key != null) Map.Actors.Value.Remove(key.Key);
 
-			if (Map.MapResources.Value[brushLocation.X, brushLocation.Y].Type != 0)
+			if (Map.MapResources.Value[brushLocation].Type != 0)
 			{
-				Map.MapResources.Value[brushLocation.X, brushLocation.Y] = new TileReference<byte, byte>();
+				Map.MapResources.Value[brushLocation] = new ResourceTile(0, 0);
 				var ch = new int2(brushLocation.X / ChunkSize, brushLocation.Y / ChunkSize);
 				if (Chunks.ContainsKey(ch))
 				{
@@ -264,13 +265,14 @@ namespace OpenRA.Editor
 
 			unsafe
 			{
-				int* p = (int*)data.Scan0.ToPointer();
+				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 tr = Map.MapTiles.Value[u * ChunkSize + i, v * ChunkSize + j];
+						var cell = new CPos(u * ChunkSize + i, v * ChunkSize + j);
+						var tr = Map.MapTiles.Value[cell];
 						var tile = TileSetRenderer.Data(tr.Type);
 						var index = (tr.Index < tile.Count) ? tr.Index : (byte)0;
 						var rawImage = tile[index];
@@ -278,13 +280,13 @@ namespace OpenRA.Editor
 							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[u * ChunkSize + i, v * ChunkSize + j].Type != 0)
+						if (Map.MapResources.Value[cell].Type != 0)
 						{
-							var resourceImage = ResourceTemplates[Map.MapResources.Value[u * ChunkSize + i, v * ChunkSize + j].Type].Bitmap;
+							var resourceImage = ResourceTemplates[Map.MapResources.Value[cell].Type].Bitmap;
 							var srcdata = resourceImage.LockBits(resourceImage.Bounds(),
 								ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
 
-							int* q = (int*)srcdata.Scan0.ToPointer();
+							var q = (int*)srcdata.Scan0.ToPointer();
 							var srcstride = srcdata.Stride >> 2;
 
 							for (var x = 0; x < TileSetRenderer.TileSize; x++)
@@ -343,10 +345,10 @@ namespace OpenRA.Editor
 		float2 GetDrawPosition(CPos location, Bitmap bmp, bool centered)
 		{
 			float offsetX = centered ? bmp.Width / 2 - TileSetRenderer.TileSize / 2 : 0;
-			float drawX = TileSetRenderer.TileSize * location.X * Zoom + Offset.X - offsetX;
+			var drawX = TileSetRenderer.TileSize * location.X * Zoom + Offset.X - offsetX;
 
 			float offsetY = centered ? bmp.Height / 2 - TileSetRenderer.TileSize / 2 : 0;
-			float drawY = TileSetRenderer.TileSize * location.Y * Zoom + Offset.Y - offsetY;
+			var drawY = TileSetRenderer.TileSize * location.Y * Zoom + Offset.Y - offsetY;
 
 			return new float2(drawX, drawY);
 		}
@@ -377,9 +379,9 @@ namespace OpenRA.Editor
 		ColorPalette GetPaletteForPlayerInner(string name)
 		{
 			var pr = Map.Players[name];
-			var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
+			var pcpi = Program.Rules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>();
 			var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp);
-			return new Palette(PlayerPalette, remap).AsSystemPalette();
+			return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette();
 		}
 
 		Cache<string, ColorPalette> playerPalettes;
@@ -416,8 +418,8 @@ namespace OpenRA.Editor
 
 					var drawX = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
 					var drawY = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
-					RectangleF sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
-					RectangleF destRect = new RectangleF(drawX, drawY, bmp.Width * Zoom, bmp.Height * Zoom);
+					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);
 				}
 
@@ -466,20 +468,20 @@ namespace OpenRA.Editor
 
 			if (ShowRuler && Zoom > 0.2)
 			{
-				for (int i = Map.Bounds.Left; i <= Map.Bounds.Right; i += 8)
+				for (var i = Map.Bounds.Left; i <= Map.Bounds.Right; i += 8)
 				{
 					if (i % 8 == 0)
 					{
-						PointF point = new PointF(i * TileSetRenderer.TileSize * Zoom + Offset.X, (Map.Bounds.Top - 8) * TileSetRenderer.TileSize * Zoom + Offset.Y);
+						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 (int i = Map.Bounds.Top; i <= Map.Bounds.Bottom; i += 8)
+				for (var i = Map.Bounds.Top; i <= Map.Bounds.Bottom; i += 8)
 				{
 					if (i % 8 == 0)
 					{
-						PointF point = new PointF((Map.Bounds.Left - 8) * TileSetRenderer.TileSize * Zoom + Offset.X, i * TileSetRenderer.TileSize * Zoom + Offset.Y);
+						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);
 					}
 				}
@@ -504,19 +506,20 @@ namespace OpenRA.Editor
 
 			if (start == end) return;
 
-			int width = Math.Abs((start - end).X);
-			int height = Math.Abs((start - end).Y);
+			var width = Math.Abs((start - end).X);
+			var height = Math.Abs((start - end).Y);
 
-			TileSelection = new TileReference<ushort, byte>[width, height];
-			ResourceSelection = new TileReference<byte, byte>[width, height];
+			TileSelection = new TerrainTile[width, height];
+			ResourceSelection = new ResourceTile[width, height];
 
-			for (int x = 0; x < width; x++)
+			for (var x = 0; x < width; x++)
 			{
-				for (int y = 0; y < height; y++)
+				for (var y = 0; y < height; y++)
 				{
 					// TODO: crash prevention
-					TileSelection[x, y] = Map.MapTiles.Value[start.X + x, start.Y + y];
-					ResourceSelection[x, y] = Map.MapResources.Value[start.X + x, start.Y + y];
+					var cell = new CPos(start.X + x, start.Y + y);
+					TileSelection[x, y] = Map.MapTiles.Value[cell];
+					ResourceSelection[x, y] = Map.MapResources.Value[cell];
 				}
 			}
 		}
@@ -527,16 +530,17 @@ namespace OpenRA.Editor
 			var width = Math.Abs((SelectionStart - SelectionEnd).X);
 			var height = Math.Abs((SelectionStart - SelectionEnd).Y);
 
-			for (int x = 0; x < width; x++)
+			for (var x = 0; x < width; x++)
 			{
-				for (int y = 0; y < height; y++)
+				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[mapX, mapY] = TileSelection[x, y];
-					Map.MapResources.Value[mapX, mapY] = ResourceSelection[x, y];
+					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))

OpenRA.Editor/TileSetRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -12,17 +12,17 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.IO;
 using System.Linq;
-using OpenRA.FileFormats;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
 
 namespace OpenRA.Editor
 {
 	public class TileSetRenderer
 	{
+		public readonly int TileSize;
 		public TileSet TileSet;
 		Dictionary<ushort, List<byte[]>> templates;
-		public readonly int TileSize;
 
 		// Extract a square tile that the editor can render
 		byte[] ExtractSquareTile(ISpriteFrame frame)
@@ -49,7 +49,7 @@ namespace OpenRA.Editor
 			ISpriteSource source;
 			if (!sourceCache.ContainsKey(filename))
 			{
-				using (var s = FileSystem.OpenWithExts(filename, exts))
+				using (var s = GlobalFileSystem.OpenWithExts(filename, exts))
 					source = SpriteSource.LoadSpriteSource(s, filename);
 
 				if (source.CacheWhenLoadingTileset)
@@ -61,7 +61,7 @@ namespace OpenRA.Editor
 			if (frames != null)
 			{
 				var ret = new List<byte[]>();
-				var srcFrames = source.Frames.ToArray();
+				var srcFrames = source.Frames;
 				foreach (var i in frames)
 					ret.Add(ExtractSquareTile(srcFrames[i]));
 
@@ -82,7 +82,7 @@ namespace OpenRA.Editor
 				templates.Add(t.Key, LoadTemplate(t.Value.Image, tileset.Extensions, sourceCache, t.Value.Frames));
 		}
 
-		public Bitmap RenderTemplate(ushort id, Palette p)
+		public Bitmap RenderTemplate(ushort id, IPalette p)
 		{
 			var template = TileSet.Templates[id];
 			var templateData = templates[id];

OpenRA.FileFormats/CPos.cs

@@ -1,76 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-
-namespace OpenRA
-{
-	/// <summary>
-	/// Cell coordinate position in the world (coarse).
-	/// </summary>
-	public struct CPos
-	{
-		public readonly int X, Y;
-
-		public CPos(int x, int y) { X = x; Y = y; }
-		public static readonly CPos Zero = new CPos(0, 0);
-
-		public static explicit operator CPos(int2 a) { return new CPos(a.X, a.Y); }
-
-		public static CPos operator +(CVec a, CPos b) { return new CPos(a.X + b.X, a.Y + b.Y); }
-		public static CPos operator +(CPos a, CVec b) { return new CPos(a.X + b.X, a.Y + b.Y); }
-		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y); }
-
-		public static CVec operator -(CPos a, CPos b) { return new CVec(a.X - b.X, a.Y - b.Y); }
-
-		public static bool operator ==(CPos me, CPos other) { return (me.X == other.X && me.Y == other.Y); }
-		public static bool operator !=(CPos me, CPos other) { return !(me == other); }
-
-		public static CPos Max(CPos a, CPos b) { return new CPos(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
-		public static CPos Min(CPos a, CPos b) { return new CPos(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
-
-		public float2 ToFloat2() { return new float2(X, Y); }
-		public int2 ToInt2() { return new int2(X, Y); }
-
-		public WPos CenterPosition { get { return new WPos(1024 * X + 512, 1024 * Y + 512, 0); } }
-		public WPos TopLeft { get { return new WPos(1024 * X, 1024 * Y, 0); } }
-		public WPos BottomRight { get { return new WPos(1024 * X + 1023, 1024 * Y + 1023, 0); } }
-
-		public CPos Clamp(Rectangle r)
-		{
-			return new CPos(Math.Min(r.Right, Math.Max(X, r.Left)),
-							Math.Min(r.Bottom, Math.Max(Y, r.Top)));
-		}
-
-		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
-
-		public override bool Equals(object obj)
-		{
-			var o = obj as CPos?;
-			return o != null && o == this;
-		}
-
-		public override string ToString() { return "{0},{1}".F(X, Y); }
-
-	}
-
-	public static class RectangleExtensions
-	{
-		public static CPos TopLeftAsCPos(this Rectangle r) { return new CPos(r.Left, r.Top); }
-		public static CPos BottomRightAsCPos(this Rectangle r) { return new CPos(r.Right, r.Bottom); }
-	}
-
-	public static class WorldCoordinateExtensions
-	{
-		public static CPos ToCPos(this WPos a) { return new CPos(a.X / 1024, a.Y / 1024); }
-		public static CVec ToCVec(this WVec a) { return new CVec(a.X / 1024, a.Y / 1024); }
-	}
-}

OpenRA.FileFormats/FileFormats/Format40.cs

@@ -1,78 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public static class Format40
-	{
-		public static int DecodeInto( byte[] src, byte[] dest )
-		{
-			var ctx = new FastByteReader(src);
-			int destIndex = 0;
-
-			while( true )
-			{
-				byte i = ctx.ReadByte();
-				if( ( i & 0x80 ) == 0 )
-				{
-					int count = i & 0x7F;
-					if( count == 0 )
-					{
-						// case 6
-						count = ctx.ReadByte();
-						byte value = ctx.ReadByte();
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] ^= value;
-					}
-					else
-					{
-						// case 5
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[destIndex] ^= ctx.ReadByte();
-					}
-				}
-				else
-				{
-					int count = i & 0x7F;
-					if( count == 0 )
-					{
-						count = ctx.ReadWord();
-						if( count == 0 )
-							return destIndex;
-
-						if( ( count & 0x8000 ) == 0 )
-						{
-							// case 2
-							destIndex += ( count & 0x7FFF );
-						}
-						else if( ( count & 0x4000 ) == 0 )
-						{
-							// case 3
-							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
-								dest[destIndex] ^= ctx.ReadByte();
-						}
-						else
-						{
-							// case 4
-							byte value = ctx.ReadByte();
-							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
-								dest[ destIndex ] ^= value;
-						}
-					}
-					else
-					{
-						// case 1
-						destIndex += count;
-					}
-				}
-			}
-		}
-	}
-}

OpenRA.FileFormats/FileFormats/WavLoader.cs

@@ -1,74 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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;
-
-namespace OpenRA.FileFormats
-{
-	public class WavLoader
-	{
-		public readonly int FileSize;
-		public readonly string Format;
-
-		public readonly int FmtChunkSize;
-		public readonly int AudioFormat;
-		public readonly int Channels;
-		public readonly int SampleRate;
-		public readonly int ByteRate;
-		public readonly int BlockAlign;
-		public readonly int BitsPerSample;
-
-		public readonly int DataSize;
-		public readonly byte[] RawOutput;
-
-		public WavLoader(Stream s)
-		{
-			while (s.Position < s.Length)
-			{
-				if ((s.Position & 1) == 1)
-					s.ReadByte(); // Alignment
-
-				var type = s.ReadASCII(4);
-				switch (type)
-				{
-					case "RIFF":
-						FileSize = s.ReadInt32();
-						Format = s.ReadASCII(4);
-						if (Format != "WAVE")
-							throw new NotSupportedException("Not a canonical WAVE file.");
-						break;
-					case "fmt ":
-						FmtChunkSize = s.ReadInt32();
-						if (FmtChunkSize != 16)
-							throw new NotSupportedException("{0} fmt chunk size is not a supported encoding scheme.".F(FmtChunkSize));
-						AudioFormat = s.ReadInt16();
-						if (AudioFormat != 1)
-							throw new NotSupportedException("Non-PCM compression is not supported.");
-						Channels = s.ReadInt16();
-						SampleRate = s.ReadInt32();
-						ByteRate = s.ReadInt32();
-						BlockAlign = s.ReadInt16();
-						BitsPerSample = s.ReadInt16();
-						break;
-					case "data":
-						DataSize = s.ReadInt32();
-						RawOutput = s.ReadBytes(DataSize);
-						break;
-					default:
-						// Ignore unknown chunks
-						var chunkSize = s.ReadInt32();
-						s.ReadBytes(chunkSize);
-						break;
-				}
-			}
-		}
-	}
-}

OpenRA.FileFormats/Graphics/R8Reader.cs

@@ -1,78 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	class R8Image : ISpriteFrame
-	{
-		public Size Size { get; private set; }
-		public Size FrameSize { get; private set; }
-		public float2 Offset { get; private set; }
-		public byte[] Data { get; set; }
-
-		public R8Image(Stream s)
-		{
-			// Scan forward until we find some data
-			var type = s.ReadUInt8();
-			while (type == 0)
-				type = s.ReadUInt8();
-
-			var width = s.ReadInt32();
-			var height = s.ReadInt32();
-			var x = s.ReadInt32();
-			var y = s.ReadInt32();
-
-			Size = new Size(width, height);
-			Offset = new int2(width/2 - x, height/2 - y);
-
-			/*var imageOffset = */s.ReadInt32();
-			var paletteOffset = s.ReadInt32();
-			var bpp = s.ReadUInt8();
-			if (bpp != 8)
-				throw new InvalidDataException("Error: {0} bits per pixel are not supported.".F(bpp));
-
-			var frameHeight = s.ReadUInt8();
-			var frameWidth = s.ReadUInt8();
-			FrameSize = new Size(frameWidth, frameHeight);
-
-			// Skip alignment byte
-			s.ReadUInt8();
-
-			Data = s.ReadBytes(width*height);
-
-			// Ignore palette
-			if (type == 1 && paletteOffset != 0)
-				s.Seek(520, SeekOrigin.Current);
-		}
-	}
-
-	public class R8Reader : ISpriteSource
-	{
-		readonly List<R8Image> frames = new List<R8Image>();
-		public IEnumerable<ISpriteFrame> Frames { get { return frames.Cast<ISpriteFrame>(); } }
-		public bool CacheWhenLoadingTileset { get { return true; } }
-
-		public readonly int ImageCount;
-		public R8Reader(Stream stream)
-		{
-			while (stream.Position < stream.Length)
-			{
-				frames.Add(new R8Image(stream));
-				ImageCount++;
-			}
-		}
-	}
-}

OpenRA.FileFormats/Graphics/ShpD2Reader.cs

@@ -1,114 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	[Flags] enum FormatFlags : int
-	{
-		PaletteTable = 1,
-		SkipFormat80 = 2,
-		VariableLengthTable = 4
-	}
-
-	class Frame : ISpriteFrame
-	{
-		public Size Size { get; private set; }
-		public Size FrameSize { get { return Size; } }
-		public float2 Offset { get { return float2.Zero; } }
-		public byte[] Data { get; set; }
-
-		public Frame(Stream s)
-		{
-			var flags = (FormatFlags)s.ReadUInt16();
-			s.Position += 1;
-			var width = s.ReadUInt16();
-			var height = s.ReadUInt8();
-			Size = new Size(width, height);
-
-			// Subtract header size
-			var dataLeft = s.ReadUInt16() - 10;
-			var dataSize = s.ReadUInt16();
-
-			byte[] table;
-			if ((flags & FormatFlags.PaletteTable) != 0)
-			{
-				var n = (flags & FormatFlags.VariableLengthTable) != 0 ? s.ReadUInt8() : (byte)16;
-				table = new byte[n];
-				for (var i = 0; i < n; i++)
-					table[i] = s.ReadUInt8();
-
-				dataLeft -= n;
-			}
-			else
-			{
-				table = new byte[256];
-				for (var i = 0; i < 256; i++)
-					table[i] = (byte)i;
-				table[1] = 0x7f;
-				table[2] = 0x7e;
-				table[3] = 0x7d;
-				table[4] = 0x7c;
-			}
-
-			Data = new byte[width * height];
-
-			// Decode image data
-			var compressed = s.ReadBytes(dataLeft);
-			if ((flags & FormatFlags.SkipFormat80) == 0)
-			{
-				var temp = new byte[dataSize];
-				Format80.DecodeInto(compressed, temp);
-				compressed = temp;
-			}
-
-			Format2.DecodeInto(compressed, Data, 0);
-
-			// Lookup values in lookup table
-			for (var j = 0; j < Data.Length; j++)
-				Data[j] = table[Data[j]];
-		}
-	}
-
-	public class ShpD2Reader : ISpriteSource
-	{
-		List<Frame> headers = new List<Frame>();
-		public IEnumerable<ISpriteFrame> Frames { get { return headers.Cast<ISpriteFrame>(); } }
-		public bool CacheWhenLoadingTileset { get { return false; } }
-
-		public ShpD2Reader(Stream s)
-		{
-			var imageCount = s.ReadUInt16();
-
-			// Last offset is pointer to end of file.
-			var offsets = new uint[imageCount + 1];
-			var temp = s.ReadUInt32();
-
-			// If fourth byte in file is non-zero, the offsets are two bytes each.
-			var twoByteOffset = (temp & 0xFF0000) > 0;
-			s.Position = 2;
-
-			for (var i = 0; i < imageCount + 1; i++)
-				offsets[i] = (twoByteOffset ? s.ReadUInt16() : s.ReadUInt32()) + 2;
-
-			for (var i = 0; i < imageCount; i++)
-			{
-				s.Position = offsets[i];
-				headers.Add(new Frame(s));
-			}
-		}
-	}
-}

OpenRA.FileFormats/Graphics/ShpTSReader.cs

@@ -1,99 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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.Drawing;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	class FrameHeader : ISpriteFrame
-	{
-		public Size Size { get; private set; }
-		public Size FrameSize { get; private set; }
-		public float2 Offset { get; private set; }
-		public byte[] Data { get; set; }
-
-		public readonly uint FileOffset;
-		public readonly byte Format;
-
-		public FrameHeader(Stream stream, Size frameSize)
-		{
-			var x = stream.ReadUInt16();
-			var y = stream.ReadUInt16();
-			var width = stream.ReadUInt16();
-			var height = stream.ReadUInt16();
-
-			Offset = new float2(x + 0.5f * (width - frameSize.Width), y + 0.5f * (height - frameSize.Height));
-			Size = new Size(width, height);
-			FrameSize = frameSize;
-
-			Format = stream.ReadUInt8();
-			stream.Position += 11;
-			FileOffset = stream.ReadUInt32();
-		}
-	}
-
-	public class ShpTSReader : ISpriteSource
-	{
-		readonly List<FrameHeader> frames = new List<FrameHeader>();
-		public IEnumerable<ISpriteFrame> Frames { get { return frames.Cast<ISpriteFrame>(); } }
-		public bool CacheWhenLoadingTileset { get { return false; } }
-
-		public ShpTSReader(Stream stream)
-		{
-			stream.ReadUInt16();
-			var width = stream.ReadUInt16();
-			var height = stream.ReadUInt16();
-			var size = new Size(width, height);
-			var frameCount = stream.ReadUInt16();
-
-			for (var i = 0; i < frameCount; i++)
-				frames.Add(new FrameHeader(stream, size));
-
-			for (var i = 0; i < frameCount; i++)
-			{
-				var f = frames[i];
-				if (f.FileOffset == 0)
-					continue;
-
-				stream.Position = f.FileOffset;
-
-				// Uncompressed
-				if (f.Format == 1 || f.Format == 0)
-					f.Data = stream.ReadBytes(f.Size.Width * f.Size.Height);
-
-				// Uncompressed scanlines
-				else if (f.Format == 2)
-				{
-					f.Data = new byte[f.Size.Width * f.Size.Height];
-					for (var j = 0; j < f.Size.Height; j++)
-					{
-						var length = stream.ReadUInt16() - 2;
-						stream.Read(f.Data, f.Size.Width * j, length);
-					}
-				}
-
-				// RLE-zero compressed scanlines
-				else if (f.Format == 3)
-				{
-					f.Data = new byte[f.Size.Width * f.Size.Height];
-
-					for (var j = 0; j < f.Size.Height; j++)
-					{
-						var length = stream.ReadUInt16() - 2;
-						Format2.DecodeInto(stream.ReadBytes(length), f.Data, j * f.Size.Width);
-					}
-				}
-			}
-		}
-	}
-}

OpenRA.FileFormats/Manifest.cs

@@ -1,93 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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.Drawing;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	// Describes what is to be loaded in order to run a mod
-	public class Manifest
-	{
-		public readonly Mod Mod;
-		public readonly string[]
-			Folders, MapFolders, Rules, ServerTraits,
-			Sequences, VoxelSequences, Cursors, Chrome, Assemblies, ChromeLayout,
-			Weapons, Voices, Notifications, Music, Movies, Translations, TileSets,
-			ChromeMetrics, PackageContents, LuaScripts, MapCompatibility;
-
-		public readonly Dictionary<string, string> Packages;
-		public readonly MiniYaml LoadScreen;
-		public readonly MiniYaml LobbyDefaults;
-		public readonly Dictionary<string, Pair<string, int>> Fonts;
-		public readonly Size TileSize = new Size(24, 24);
-
-		public Manifest(string mod)
-		{
-			var path = new[] { "mods", mod, "mod.yaml" }.Aggregate(Path.Combine);
-			var yaml = new MiniYaml(null, MiniYaml.FromFile(path)).NodesDict;
-
-			Mod = FieldLoader.Load<Mod>(yaml["Metadata"]);
-			Mod.Id = mod;
-
-			// TODO: Use fieldloader
-			Folders = YamlList(yaml, "Folders");
-			MapFolders = YamlList(yaml, "MapFolders");
-			Packages = yaml["Packages"].NodesDict.ToDictionary(x => x.Key, x => x.Value.Value);
-			Rules = YamlList(yaml, "Rules");
-			ServerTraits = YamlList(yaml, "ServerTraits");
-			Sequences = YamlList(yaml, "Sequences");
-			VoxelSequences = YamlList(yaml, "VoxelSequences");
-			Cursors = YamlList(yaml, "Cursors");
-			Chrome = YamlList(yaml, "Chrome");
-			Assemblies = YamlList(yaml, "Assemblies");
-			ChromeLayout = YamlList(yaml, "ChromeLayout");
-			Weapons = YamlList(yaml, "Weapons");
-			Voices = YamlList(yaml, "Voices");
-			Notifications = YamlList(yaml, "Notifications");
-			Music = YamlList(yaml, "Music");
-			Movies = YamlList(yaml, "Movies");
-			Translations = YamlList(yaml, "Translations");
-			TileSets = YamlList(yaml, "TileSets");
-			ChromeMetrics = YamlList(yaml, "ChromeMetrics");
-			PackageContents = YamlList(yaml, "PackageContents");
-			LuaScripts = YamlList(yaml, "LuaScripts");
-
-			LoadScreen = yaml["LoadScreen"];
-			LobbyDefaults = yaml["LobbyDefaults"];
-			Fonts = yaml["Fonts"].NodesDict.ToDictionary(x => x.Key,
-				x => Pair.New(x.Value.NodesDict["Font"].Value,
-					int.Parse(x.Value.NodesDict["Size"].Value)));
-
-			if (yaml.ContainsKey("TileSize"))
-				TileSize = FieldLoader.GetValue<Size>("TileSize", yaml["TileSize"].Value);
-
-			// Allow inherited mods to import parent maps.
-			var compat = new List<string>();
-			compat.Add(mod);
-
-			if (yaml.ContainsKey("SupportsMapsFrom"))
-				foreach (var c in yaml["SupportsMapsFrom"].Value.Split(','))
-					compat.Add(c.Trim());
-
-			MapCompatibility = compat.ToArray();
-		}
-
-		static string[] YamlList(Dictionary<string, MiniYaml> yaml, string key)
-		{
-			if (!yaml.ContainsKey(key))
-				return new string[] { };
-
-			return yaml[key].NodesDict.Keys.ToArray();
-		}
-	}
-}

OpenRA.FileFormats/Map/TileReference.cs

@@ -1,26 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public struct TileReference<T, U>
-	{
-		public T Type;
-		public U Index;
-
-		public TileReference(T t, U i)
-		{
-			Type = t;
-			Index = i;
-		}
-
-		public override int GetHashCode() { return Type.GetHashCode() ^ Index.GetHashCode(); }
-	}
-}

OpenRA.FileFormats/Map/TileSet.cs

@@ -1,143 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Reflection;
-
-namespace OpenRA.FileFormats
-{
-	public class TerrainTypeInfo
-	{
-		public string Type;
-		public string[] TargetTypes = { };
-		public string[] AcceptsSmudgeType = { };
-		public bool IsWater = false; // TODO: Remove this
-		public Color Color;
-		public string CustomCursor;
-
-		public TerrainTypeInfo() { }
-		public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
-
-		public MiniYaml Save() { return FieldSaver.Save(this); }
-	}
-
-	public class TileTemplate
-	{
-		public ushort Id;
-		public string Image;
-		public int[] Frames;
-		public int2 Size;
-		public bool PickAny;
-		public string Category;
-
-		[FieldLoader.LoadUsing("LoadTiles")]
-		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
-
-		public TileTemplate() { }
-		public TileTemplate(MiniYaml my) { FieldLoader.Load(this, my); }
-
-		static object LoadTiles(MiniYaml y)
-		{
-			return y.NodesDict["Tiles"].NodesDict.ToDictionary(
-				t => byte.Parse(t.Key),
-				t => t.Value.Value);
-		}
-
-		static readonly string[] Fields = { "Id", "Image", "Frames", "Size", "PickAny" };
-
-		public MiniYaml Save()
-		{
-			var root = new List<MiniYamlNode>();
-			foreach (var field in Fields)
-			{
-				FieldInfo f = this.GetType().GetField(field);
-				if (f.GetValue(this) == null)
-					continue;
-
-				root.Add(new MiniYamlNode(field, FieldSaver.FormatValue(this, f)));
-			}
-
-			root.Add(new MiniYamlNode("Tiles", null,
-				Tiles.Select(x => new MiniYamlNode(x.Key.ToString(), x.Value)).ToList()));
-
-			return new MiniYaml(null, root);
-		}
-	}
-
-	public class TileSet
-	{
-		public string Name;
-		public string Id;
-		public int SheetSize = 512;
-		public string Palette;
-		public string PlayerPalette;
-		public string[] Extensions;
-		public int WaterPaletteRotationBase = 0x60; 
-		public Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
-		public Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
-		public string[] EditorTemplateOrder;
-
-		static readonly string[] Fields = { "Name", "Id", "SheetSize", "Palette", "Extensions" };
-
-		public TileSet() { }
-
-		public TileSet(string filepath)
-		{
-			var yaml = MiniYaml.DictFromFile(filepath);
-
-			// General info
-			FieldLoader.Load(this, yaml["General"]);
-
-			// TerrainTypes
-			Terrain = yaml["Terrain"].NodesDict.Values
-				.Select(y => new TerrainTypeInfo(y)).ToDictionary(t => t.Type);
-
-			// Templates
-			Templates = yaml["Templates"].NodesDict.Values
-				.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
-		}
-
-		public void Save(string filepath)
-		{
-			var root = new List<MiniYamlNode>();
-			var gen = new List<MiniYamlNode>();
-
-			foreach (var field in Fields)
-			{
-				var f = this.GetType().GetField(field);
-				if (f.GetValue(this) == null)
-					continue;
-
-				gen.Add(new MiniYamlNode(field, FieldSaver.FormatValue(this, f)));
-			}
-
-			root.Add(new MiniYamlNode("General", null, gen));
-
-			root.Add(new MiniYamlNode("Terrain", null,
-				Terrain.Select(t => new MiniYamlNode("TerrainType@{0}".F(t.Value.Type), t.Value.Save())).ToList()));
-
-			root.Add(new MiniYamlNode("Templates", null,
-				Templates.Select(t => new MiniYamlNode("Template@{0}".F(t.Value.Id), t.Value.Save())).ToList()));
-			root.WriteToFile(filepath);
-		}
-
-		public string GetTerrainType(TileReference<ushort, byte> r)
-		{
-			var tt = Templates[r.Type].Tiles;
-			string ret;
-			if (!tt.TryGetValue(r.Index, out ret))
-				return "Clear"; // Default walkable
-
-			return ret;
-		}
-	}
-}

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.FileFormats</RootNamespace>
-    <AssemblyName>OpenRA.FileFormats</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Evaluator.cs" />
-    <Compile Include="Exts.cs" />
-    <Compile Include="FieldLoader.cs" />
-    <Compile Include="FieldSaver.cs" />
-    <Compile Include="FileFormats\AudLoader.cs" />
-    <Compile Include="FileFormats\Blast.cs" />
-    <Compile Include="FileFormats\Blowfish.cs" />
-    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
-    <Compile Include="FileFormats\CRC32.cs" />
-    <Compile Include="FileFormats\Format2.cs" />
-    <Compile Include="FileFormats\Format40.cs" />
-    <Compile Include="FileFormats\Format80.cs" />
-    <Compile Include="FileFormats\IniFile.cs" />
-    <Compile Include="Graphics\IGraphicsDevice.cs" />
-    <Compile Include="Graphics\IInputHandler.cs" />
-    <Compile Include="Graphics\PngLoader.cs" />
-    <Compile Include="Graphics\ShpReader.cs" />
-    <Compile Include="Graphics\Vertex.cs" />
-    <Compile Include="Graphics\VqaReader.cs" />
-    <Compile Include="InstallUtils.cs" />
-    <Compile Include="Manifest.cs" />
-    <Compile Include="Map\PlayerReference.cs" />
-    <Compile Include="Map\SmudgeReference.cs" />
-    <Compile Include="Map\TileReference.cs" />
-    <Compile Include="Map\TileSet.cs" />
-    <Compile Include="MiniYaml.cs" />
-    <Compile Include="Mod.cs" />
-    <Compile Include="PackageEntry.cs" />
-    <Compile Include="Palette.cs" />
-    <Compile Include="Platform.cs" />
-    <Compile Include="PlayerColorRemap.cs" />
-    <Compile Include="Primitives\ActionQueue.cs" />
-    <Compile Include="Primitives\Bits.cs" />
-    <Compile Include="Primitives\Cache.cs" />
-    <Compile Include="Primitives\Cached.cs" />
-    <Compile Include="Primitives\DisposableAction.cs" />
-    <Compile Include="Primitives\IObservableCollection.cs" />
-    <Compile Include="Primitives\Lazy.cs" />
-    <Compile Include="Primitives\ObservableCollection.cs" />
-    <Compile Include="Primitives\ObservableDictionary.cs" />
-    <Compile Include="Primitives\Pair.cs" />
-    <Compile Include="Primitives\PriorityQueue.cs" />
-    <Compile Include="Primitives\Set.cs" />
-    <Compile Include="Primitives\float2.cs" />
-    <Compile Include="Primitives\int2.cs" />
-    <Compile Include="Support\Log.cs" />
-    <Compile Include="Support\Stopwatch.cs" />
-    <Compile Include="Support\Timer.cs" />
-    <Compile Include="Random.cs" />
-    <Compile Include="TypeDictionary.cs" />
-    <Compile Include="WPos.cs" />
-    <Compile Include="WVec.cs" />
-    <Compile Include="WAngle.cs" />
-    <Compile Include="WRot.cs" />
-    <Compile Include="WRange.cs" />
-    <Compile Include="HSLColor.cs" />
-    <Compile Include="Graphics\ShpTSReader.cs" />
-    <Compile Include="FileFormats\XccLocalDatabase.cs" />
-    <Compile Include="FileFormats\XccGlobalDatabase.cs" />
-    <Compile Include="Graphics\VxlReader.cs" />
-    <Compile Include="Graphics\HvaReader.cs" />
-    <Compile Include="StreamExts.cs" />
-    <Compile Include="FileFormats\WavLoader.cs" />
-    <Compile Include="Graphics\R8Reader.cs" />
-    <Compile Include="Keycode.cs" />
-    <Compile Include="Hotkey.cs" />
-    <Compile Include="FileSystem\FileSystem.cs" />
-    <Compile Include="FileSystem\Folder.cs" />
-    <Compile Include="FileSystem\InstallShieldPackage.cs" />
-    <Compile Include="FileSystem\MixFile.cs" />
-    <Compile Include="FileSystem\ZipFile.cs" />
-    <Compile Include="FileSystem\D2kSoundResources.cs" />
-    <Compile Include="Graphics\SpriteSource.cs" />
-    <Compile Include="Graphics\TmpRAReader.cs" />
-    <Compile Include="Graphics\TmpTDReader.cs" />
-    <Compile Include="Graphics\ShpD2Reader.cs" />
-    <Compile Include="FileSystem\Pak.cs" />
-    <Compile Include="CPos.cs" />
-    <Compile Include="CVec.cs" />
-    <Compile Include="Graphics\TmpTSReader.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

OpenRA.FileFormats/Palette.cs

@@ -1,126 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2012 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Reflection;
-
-namespace OpenRA.FileFormats
-{
-	public class Palette
-	{
-		public static Palette Load(string filename, int[] remap)
-		{
-			using (var s = File.OpenRead(filename))
-				return new Palette(s, remap);
-		}
-
-		uint[] colors;
-		public Color GetColor(int index)
-		{
-			return Color.FromArgb((int)colors[index]);
-		}
-
-		public void SetColor(int index, Color color)
-		{
-			colors[index] = (uint)color.ToArgb();
-		}
-
-		public void SetColor(int index, uint color)
-		{
-			colors[index] = (uint)color;
-		}
-
-		public uint[] Values
-		{
-			get { return colors; }
-		}
-
-		public void ApplyRemap(IPaletteRemap r)
-		{
-			for (int i = 0; i < 256; i++)
-				colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)colors[i]), i).ToArgb();
-		}
-
-		public Palette(Stream s, int[] remapShadow)
-		{
-			colors = new uint[256];
-
-			using (BinaryReader reader = new BinaryReader(s))
-			{
-				for (int i = 0; i < 256; i++)
-				{
-					byte r = (byte)(reader.ReadByte() << 2);
-					byte g = (byte)(reader.ReadByte() << 2);
-					byte b = (byte)(reader.ReadByte() << 2);
-					colors[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
-				}
-			}
-
-			colors[0] = 0; // convert black background to transparency
-			foreach (int i in remapShadow)
-				colors[i] = 140u << 24;
-		}
-
-		public Palette(Palette p, IPaletteRemap r)
-		{
-			colors = (uint[])p.colors.Clone();
-			ApplyRemap(r);
-		}
-
-		public Palette(Palette p)
-		{
-			colors = (uint[])p.colors.Clone();
-		}
-
-		public Palette(uint[] data)
-		{
-			if (data.Length != 256)
-				throw new InvalidDataException("Attempting to create palette with incorrect array size");
-			colors = (uint[])data.Clone();
-		}
-
-		public ColorPalette AsSystemPalette()
-		{
-			ColorPalette pal;
-			using (var b = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-				pal = b.Palette;
-
-			for (var i = 0; i < 256; i++)
-				pal.Entries[i] = GetColor(i);
-
-			// hack around a mono bug -- the palette flags get set wrong.
-			if (Platform.CurrentPlatform != PlatformType.Windows)
-				typeof(ColorPalette).GetField("flags",
-					BindingFlags.Instance | BindingFlags.NonPublic).SetValue(pal, 1);
-
-			return pal;
-		}
-
-		public Bitmap AsBitmap()
-		{
-			var b = new Bitmap(256, 1, PixelFormat.Format32bppArgb);
-			var data = b.LockBits(new Rectangle(0, 0, b.Width, b.Height),
-								  ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-			unsafe
-			{
-				uint* c = (uint*)data.Scan0;
-				for (var x = 0; x < 256; x++)
-					*(c + x) = colors[x];
-			}
-
-			b.UnlockBits(data);
-			return b;
-		}
-	}
-
-	public interface IPaletteRemap { Color GetRemappedColor(Color original, int index); }
-}

OpenRA.FileFormats/Primitives/Cache.cs

@@ -1,53 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace OpenRA.FileFormats
-{
-	public class Cache<T, U> : IEnumerable<KeyValuePair<T, U>>
-	{
-		Dictionary<T, U> hax;
-		Func<T,U> loader;
-
-		public Cache(Func<T,U> loader, IEqualityComparer<T> c)
-		{
-			hax = new Dictionary<T, U>(c);
-			if (loader == null)
-				throw new ArgumentNullException();
-
-			this.loader = loader;
-		}
-
-		public Cache(Func<T, U> loader)
-			: this(loader, EqualityComparer<T>.Default) { }
-
-		public U this[T key]
-		{
-			get
-			{
-				U result;
-				if (!hax.TryGetValue(key, out result))
-					hax.Add(key, result = loader(key));
-
-				return result;
-			}
-		}
-
-		public IEnumerator<KeyValuePair<T, U>> GetEnumerator() { return hax.GetEnumerator(); }
-
-		IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
-
-		public IEnumerable<T> Keys { get { return hax.Keys; } }
-		public IEnumerable<U> Values { get { return hax.Values; } }
-	}
-}

OpenRA.FileFormats/Primitives/Cached.cs

@@ -1,55 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-
-namespace OpenRA.FileFormats
-{
-	public class Cached<T>
-	{
-		Func<T> p;
-		T value;
-		bool hasValue;
-
-		public Cached(Func<T> p)
-		{
-			if (p == null)
-				throw new ArgumentNullException();
-
-			this.p = p;
-		}
-
-		public T Value
-		{
-			get
-			{
-				if (hasValue)
-					return value;
-
-				value = p();
-				hasValue = true;
-				return value;
-			}
-		}
-
-		public T Force() { return Value; }
-
-		public void Invalidate()
-		{
-			hasValue = false;
-		}
-	}
-
-	public static class Cached
-	{
-		public static Cached<T> New<T>(Func<T> p) { return new Cached<T>(p); }
-	}
-}
-

OpenRA.FileFormats/Primitives/Lazy.cs

@@ -1,48 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-
-namespace OpenRA.FileFormats
-{
-	public class Lazy<T>
-	{
-		Func<T> p;
-		T value;
-
-		public Lazy(Func<T> p)
-		{
-			if (p == null)
-				throw new ArgumentNullException();
-
-			this.p = p;
-		}
-
-		public T Value
-		{
-			get
-			{
-				if (p == null)
-					return value;
-
-				value = p();
-				p = null;
-				return value;
-			}
-		}
-
-		public T Force() { return Value; }
-	}
-
-	public static class Lazy
-	{
-		public static Lazy<T> New<T>(Func<T> p) { return new Lazy<T>(p); }
-	}
-}

OpenRA.FileFormats/Primitives/Set.cs

@@ -1,56 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace OpenRA.FileFormats
-{
-	public class Set<T> : IEnumerable<T>
-	{
-		Dictionary<T, bool> data = new Dictionary<T, bool>();
-
-		public void Add( T obj )
-		{
-			data.Add( obj, false );
-			if( OnAdd != null )
-				OnAdd( obj );
-		}
-
-		public void Remove( T obj )
-		{
-			data.Remove( obj );
-			if( OnRemove != null )
-				OnRemove( obj );
-		}
-
-		public event Action<T> OnAdd;
-		public event Action<T> OnRemove;
-
-		public IEnumerator<T> GetEnumerator()
-		{
-			return data.Keys.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-
-		public bool Contains( T obj ) { return data.ContainsKey(obj); }
-
-		public Set( params T[] ts )
-		{
-			foreach( var t in ts )
-				Add(t);
-		}
-	}
-}

OpenRA.FileFormats/Settings.StyleCop

@@ -1,349 +0,0 @@
-<StyleCopSettings Version="105">
-  <Analyzers>
-    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
-      <Rules>
-        <Rule Name="ElementsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="EnumerationItemsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationMustContainValidXml">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustHaveSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementDocumentationMustHaveSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustHaveSummaryText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementDocumentationMustHaveSummaryText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustNotHaveDefaultSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParametersMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustMatchElementParameters">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustDeclareParameterName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementReturnValueMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementReturnValueDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="VoidReturnValueMustNotBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParametersMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParametersMustBeDocumentedPartialClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustMatchTypeParameters">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustDeclareParameterName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PropertySummaryDocumentationMustMatchAccessors">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PropertySummaryDocumentationMustOmitSetAccessorWithRestrictedAccess">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustNotBeCopiedAndPasted">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="SingleLineCommentsMustNotUseDocumentationStyleSlashes">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustNotBeEmpty">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustContainWhitespace">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationMustMeetCharacterPercentage">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ConstructorSummaryDocumentationMustBeginWithStandardText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DestructorSummaryDocumentationMustBeginWithStandardText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationHeadersMustNotContainBlankLines">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="IncludedDocumentationXPathDoesNotExist">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="IncludeNodeDoesNotContainValidFileAndPath">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="InheritDocMustBeUsedWithInheritingClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustBeSpelledCorrectly">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileMustHaveHeader">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustShowCopyright">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustHaveCopyrightText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustContainFileName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustHaveValidCompanyText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderFileNameDocumentationMustMatchTypeName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.SpacingRules">
-      <Rules>
-        <Rule Name="TabsMustNotBeUsed">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.LayoutRules">
-      <Rules>
-        <Rule Name="CurlyBracketsForMultiLineStatementsMustNotShareLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="StatementMustNotBeOnSingleLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementMustNotBeOnSingleLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="CurlyBracketsMustNotBeOmitted">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustBeSeparatedByBlankLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ChainedStatementBlocksMustNotBePrecededByBlankLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.OrderingRules">
-      <Rules>
-        <Rule Name="UsingDirectivesMustBePlacedWithinNamespace">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustAppearInTheCorrectOrder">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustBeOrderedByAccess">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.ReadabilityRules">
-      <Rules>
-        <Rule Name="CodeMustNotContainMultipleStatementsOnOneLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="UseStringEmptyForEmptyStrings">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PrefixLocalCallsWithThis">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PrefixCallsCorrectly">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ParametersMustBeOnSameLineOrSeparateLines">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ParameterMustFollowComma">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="SplitParametersMustStartOnLineAfterDeclaration">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.MaintainabilityRules">
-      <Rules>
-        <Rule Name="AccessModifierMustBeDeclared">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FieldsMustBePrivate">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileMayOnlyContainASingleClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ArithmeticExpressionsMustDeclarePrecedence">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-  </Analyzers>
-</StyleCopSettings>

OpenRA.FileFormats/Support/Stopwatch.cs

@@ -1,31 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Support
-{
-	public class Stopwatch
-	{
-		System.Diagnostics.Stopwatch sw;
-		public Stopwatch ()
-		{
-			Reset();
-		}
-
-		public double ElapsedTime()
-		{
-			return sw.Elapsed.TotalMilliseconds / 1000.0;
-		}
-
-		public void Reset()
-		{
-			sw = System.Diagnostics.Stopwatch.StartNew();
-		}
-	}
-}

OpenRA.FileFormats/Support/Timer.cs

@@ -1,27 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Support
-{
-	public static class Timer
-	{
-		static Stopwatch sw = new Stopwatch();
-		static double lastTime = 0;
-
-		public static void Time( string message )
-		{
-			var time = sw.ElapsedTime();
-			var dt = time - lastTime;
-			if( dt > 0.0001 )
-				Log.Write("perf", message, dt );
-			lastTime = time;
-		}
-	}
-}

OpenRA.FileFormats/WRange.cs

@@ -1,99 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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.Linq;
-
-namespace OpenRA
-{
-	/// <summary>
-	/// 1d world distance - 1024 units = 1 cell.
-	/// </summary>
-	public struct WRange : IComparable, IComparable<WRange>
-	{
-		public readonly int Range;
-
-		public WRange(int r) { Range = r; }
-		public static readonly WRange Zero = new WRange(0);
-		public static WRange FromCells(int cells) { return new WRange(1024*cells); }
-
-		public static WRange operator +(WRange a, WRange b) { return new WRange(a.Range + b.Range); }
-		public static WRange operator -(WRange a, WRange b) { return new WRange(a.Range - b.Range); }
-		public static WRange operator -(WRange a) { return new WRange(-a.Range); }
-		public static WRange operator /(WRange a, int b) { return new WRange(a.Range / b); }
-		public static WRange operator *(WRange a, int b) { return new WRange(a.Range * b); }
-		public static WRange operator *(int a, WRange b) { return new WRange(a * b.Range); }
-
-		public static bool operator ==(WRange me, WRange other) { return (me.Range == other.Range); }
-		public static bool operator !=(WRange me, WRange other) { return !(me == other); }
-
-		// Sampled a N-sample probability density function in the range [-1024..1024]
-		// 1 sample produces a rectangular probability
-		// 2 samples produces a triangular probability
-		// ...
-		// N samples approximates a true gaussian
-		public static WRange FromPDF(Thirdparty.Random r, int samples)
-		{
-			return new WRange(Exts.MakeArray(samples, _ => r.Next(-1024, 1024))
-				.Sum() / samples);
-		}
-
-		public static bool TryParse(string s, out WRange result)
-		{
-			s = s.ToLowerInvariant();
-			var components = s.Split('c');
-			int cell = 0;
-			int subcell = 0;
-			result = WRange.Zero;
-
-			switch (components.Length)
-			{
-			case 2:
-				if (!int.TryParse(components[0], out cell) ||
-				    !int.TryParse(components[1], out subcell))
-					return false;
-				break;
-			case 1:
-				if (!int.TryParse(components[0], out subcell))
-					return false;
-				break;
-			default: return false;
-			}
-
-			// Propagate sign to fractional part
-			if (cell < 0)
-				subcell = -subcell;
-
-			result = new WRange(1024*cell + subcell);
-			return true;
-		}
-
-		public override int GetHashCode() { return Range.GetHashCode(); }
-
-		public override bool Equals(object obj)
-		{
-			var o = obj as WRange?;
-			return o != null && o == this;
-		}
-
-		public int CompareTo(object obj)
-		{
-			var o = obj as WRange?;
-			if (o == null)
-				return 1;
-
-			return Range.CompareTo(o.Value.Range);
-		}
-
-		public int CompareTo(WRange other) { return Range.CompareTo(other.Range); }
-
-		public override string ToString() { return "{0}".F(Range); }
-	}
-}

OpenRA.Game/Actor.cs

@@ -12,13 +12,16 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.FileFormats;
+using Eluant;
+using Eluant.ObjectBinding;
 using OpenRA.Graphics;
+using OpenRA.Primitives;
+using OpenRA.Scripting;
 using OpenRA.Traits;
 
 namespace OpenRA
 {
-	public class Actor
+	public class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>
 	{
 		public readonly ActorInfo Info;
 
@@ -62,30 +65,27 @@ namespace OpenRA
 			if (initDict.Contains<OwnerInit>())
 				Owner = init.Get<OwnerInit, Player>();
 
-			occupySpace = Lazy.New(() => TraitOrDefault<IOccupySpace>());
+			occupySpace = Exts.Lazy(() => TraitOrDefault<IOccupySpace>());
 
 			if (name != null)
 			{
-				if (!Rules.Info.ContainsKey(name.ToLowerInvariant()))
+				if (!world.Map.Rules.Actors.ContainsKey(name.ToLowerInvariant()))
 					throw new NotImplementedException("No rules definition for unit {0}".F(name.ToLowerInvariant()));
 
-				Info = Rules.Info[name.ToLowerInvariant()];
+				Info = world.Map.Rules.Actors[name.ToLowerInvariant()];
 				foreach (var trait in Info.TraitsInConstructOrder())
 					AddTrait(trait.Create(init));
 			}
 
-			facing = Lazy.New(() => TraitOrDefault<IFacing>());
-			health = Lazy.New(() => TraitOrDefault<Health>());
-			effectiveOwner = Lazy.New(() => TraitOrDefault<IEffectiveOwner>());
+			facing = Exts.Lazy(() => TraitOrDefault<IFacing>());
+			health = Exts.Lazy(() => TraitOrDefault<Health>());
+			effectiveOwner = Exts.Lazy(() => TraitOrDefault<IEffectiveOwner>());
 
-			applyIRender = (x, wr) => x.Render(this, wr);
-			applyRenderModifier = (m, p, wr) => p.ModifyRender(this, wr, m);
-
-			Bounds = Lazy.New(() =>
+			Bounds = Exts.Lazy(() =>
 			{
 				var si = Info.Traits.GetOrDefault<SelectableInfo>();
 				var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
-				    TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
+					TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
 
 				var offset = -size / 2;
 				if (si != null && si.Bounds != null && si.Bounds.Length > 2)
@@ -109,14 +109,19 @@ namespace OpenRA
 			get { return currentActivity == null; }
 		}
 
-		// note: these delegates are cached to avoid massive allocation.
-		Func<IRender, WorldRenderer, IEnumerable<IRenderable>> applyIRender;
-		Func<IEnumerable<IRenderable>, IRenderModifier, WorldRenderer, IEnumerable<IRenderable>> applyRenderModifier;
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
-			var mods = TraitsImplementing<IRenderModifier>();
-			var sprites = TraitsImplementing<IRender>().SelectMany(x => applyIRender(x, wr));
-			return mods.Aggregate(sprites, (m, p) => applyRenderModifier(m, p, wr));
+			var renderables = Renderables(wr);
+			foreach (var modifier in TraitsImplementing<IRenderModifier>())
+				renderables = modifier.ModifyRender(this, wr, renderables);
+			return renderables;
+		}
+
+		IEnumerable<IRenderable> Renderables(WorldRenderer wr)
+		{
+			foreach (var render in TraitsImplementing<IRender>())
+				foreach (var renderable in render.Render(this, wr))
+					yield return renderable;
 		}
 
 		public bool IsInWorld { get; internal set; }
@@ -155,7 +160,12 @@ namespace OpenRA
 		public override bool Equals(object obj)
 		{
 			var o = obj as Actor;
-			return o != null && o.ActorID == ActorID;
+			return o != null && Equals(o);
+		}
+
+		public bool Equals(Actor other)
+		{
+			return ActorID == other.ActorID;
 		}
 
 		public override string ToString()
@@ -194,9 +204,12 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (Destroyed) return;
+				if (Destroyed)
+					return;
+
+				if (IsInWorld)
+					World.Remove(this);
 
-				World.Remove(this);
 				World.traitDict.RemoveActor(this);
 				Destroyed = true;
 			});
@@ -207,6 +220,9 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
+				if (this.Destroyed)
+					return;
+
 				var oldOwner = Owner;
 
 				// momentarily remove from world so the ownership queries don't get confused
@@ -240,5 +256,40 @@ namespace OpenRA
 
 			health.Value.InflictDamage(this, attacker, health.Value.MaxHP, null, true);
 		}
+
+		#region Scripting interface
+
+		Lazy<ScriptActorInterface> luaInterface;
+		public void OnScriptBind(ScriptContext context)
+		{
+			luaInterface = Exts.Lazy(() => new ScriptActorInterface(context, this));
+		}
+
+		public LuaValue this[LuaRuntime runtime, LuaValue keyValue]
+		{
+			get { return luaInterface.Value[runtime, keyValue]; }
+			set { luaInterface.Value[runtime, keyValue] = value; }
+		}
+
+		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
+		{
+			Actor a, b;
+			if (!left.TryGetClrValue<Actor>(out a) || !right.TryGetClrValue<Actor>(out b))
+				return false;
+
+			return a == b;
+		}
+
+		public LuaValue ToString(LuaRuntime runtime)
+		{
+			return "Actor ({0})".F(this);
+		}
+
+		public bool HasScriptProperty(string name)
+		{
+			return luaInterface.Value.ContainsKey(name);
+		}
+
+		#endregion
 	}
 }

OpenRA.Game/CPos.cs

@@ -0,0 +1,104 @@
+#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 Eluant;
+using Eluant.ObjectBinding;
+using OpenRA.Scripting;
+
+namespace OpenRA
+{
+	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
+	{
+		public readonly int X, Y;
+
+		public CPos(int x, int y) { X = x; Y = y; }
+		public static readonly CPos Zero = new CPos(0, 0);
+
+		public static explicit operator CPos(int2 a) { return new CPos(a.X, a.Y); }
+
+		public static CPos operator +(CVec a, CPos b) { return new CPos(a.X + b.X, a.Y + b.Y); }
+		public static CPos operator +(CPos a, CVec b) { return new CPos(a.X + b.X, a.Y + b.Y); }
+		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y); }
+
+		public static CVec operator -(CPos a, CPos b) { return new CVec(a.X - b.X, a.Y - b.Y); }
+
+		public static bool operator ==(CPos me, CPos other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator !=(CPos me, CPos other) { return !(me == other); }
+
+		public static CPos Max(CPos a, CPos b) { return new CPos(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static CPos Min(CPos a, CPos b) { return new CPos(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public 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 override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
+
+		public override string ToString() { return X + "," + Y; }
+
+		#region Scripting interface
+
+		public LuaValue Add(LuaRuntime runtime, LuaValue left, LuaValue right)
+		{
+			CPos a;
+			CVec b;
+			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CVec>(out b))
+				throw new LuaException("Attempted to call CPos.Add(CPos, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
+
+			return new LuaCustomClrObject(a + b);
+		}
+
+		public LuaValue Subtract(LuaRuntime runtime, LuaValue left, LuaValue right)
+		{
+			CPos a;
+			CVec b;
+			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CVec>(out b))
+				throw new LuaException("Attempted to call CPos.Subtract(CPos, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
+
+			return new LuaCustomClrObject(a - b);
+		}
+
+		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
+		{
+			CPos a, b;
+			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CPos>(out b))
+				return false;
+
+			return a == b;
+		}
+
+		public LuaValue this[LuaRuntime runtime, LuaValue key]
+		{
+			get
+			{
+				switch (key.ToString())
+				{
+					case "X": return X;
+					case "Y": return Y;
+					default: throw new LuaException("CPos does not define a member '{0}'".F(key));
+				}
+			}
+
+			set
+			{
+				throw new LuaException("CPos is read-only. Use CPos.New to create a new value");
+			}
+		}
+
+		#endregion
+	}
+}

OpenRA.Game/CVec.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -10,24 +10,19 @@
 
 using System;
 using System.Drawing;
+using Eluant;
+using Eluant.ObjectBinding;
+using OpenRA.Scripting;
 
 namespace OpenRA
 {
-	/// <summary>
-	/// Cell coordinate vector (coarse).
-	/// </summary>
-	public struct CVec
+	public struct CVec : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaUnaryMinusBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CVec>
 	{
 		public readonly int X, Y;
 
 		public CVec(int x, int y) { X = x; Y = y; }
-		public CVec(Size p) { X = p.Width; Y = p.Height; }
-
 		public static readonly CVec Zero = new CVec(0, 0);
 
-		public static explicit operator CVec(int2 a) { return new CVec(a.X, a.Y); }
-		public static explicit operator CVec(float2 a) { return new CVec((int)a.X, (int)a.Y); }
-
 		public static CVec operator +(CVec a, CVec b) { return new CVec(a.X + b.X, a.Y + b.Y); }
 		public static CVec operator -(CVec a, CVec b) { return new CVec(a.X - b.X, a.Y - b.Y); }
 		public static CVec operator *(int a, CVec b) { return new CVec(a * b.X, a * b.Y); }
@@ -47,11 +42,7 @@ namespace OpenRA
 		public CVec Sign() { return new CVec(Math.Sign(X), Math.Sign(Y)); }
 		public CVec Abs() { return new CVec(Math.Abs(X), Math.Abs(Y)); }
 		public int LengthSquared { get { return X * X + Y * Y; } }
-		public int Length { get { return (int)Math.Sqrt(LengthSquared); } }
-
-		public float2 ToFloat2() { return new float2(X, Y); }
-		public int2 ToInt2() { return new int2(X, Y); }
-		public WVec ToWVec() { return new WVec(X*1024, Y*1024, 0); }
+		public int Length { get { return Exts.ISqrt(LengthSquared); } }
 
 		public CVec Clamp(Rectangle r)
 		{
@@ -63,13 +54,10 @@ namespace OpenRA
 
 		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
 
-		public override bool Equals(object obj)
-		{
-			var o = obj as CVec?;
-			return o != null && o == this;
-		}
+		public bool Equals(CVec other) { return other == this; }
+		public override bool Equals(object obj) { return obj is CVec && Equals((CVec)obj); }
 
-		public override string ToString() { return "{0},{1}".F(X, Y); }
+		public override string ToString() { return X + "," + Y; }
 
 		public static readonly CVec[] directions =
 		{
@@ -82,5 +70,59 @@ namespace OpenRA
 			new CVec(1,  0),
 			new CVec(1,  1),
 		};
+
+		#region Scripting interface
+
+		public LuaValue Add(LuaRuntime runtime, LuaValue left, LuaValue right)
+		{
+			CVec a, b;
+			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
+				throw new LuaException("Attempted to call CVec.Add(CVec, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
+
+			return new LuaCustomClrObject(a + b);
+		}
+
+		public LuaValue Subtract(LuaRuntime runtime, LuaValue left, LuaValue right)
+		{
+			CVec a, b;
+			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
+				throw new LuaException("Attempted to call CVec.Subtract(CVec, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
+
+			return new LuaCustomClrObject(a - b);
+		}
+
+		public LuaValue Minus(LuaRuntime runtime)
+		{
+			return new LuaCustomClrObject(-this);
+		}
+
+		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
+		{
+			CVec a, b;
+			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
+				return false;
+
+			return a == b;
+		}
+
+		public LuaValue this[LuaRuntime runtime, LuaValue key]
+		{
+			get
+			{
+				switch (key.ToString())
+				{
+					case "X": return X;
+					case "Y": return Y;
+					default: throw new LuaException("CVec does not define a member '{0}'".F(key));
+				}
+			}
+
+			set
+			{
+				throw new LuaException("WVec is read-only. Use CVec.New to create a new value");
+			}
+		}
+
+		#endregion
 	}
 }

OpenRA.Game/Download.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -28,7 +28,9 @@ namespace OpenRA
 			switch (ex.Status)
 			{
 				case WebExceptionStatus.NameResolutionFailure:
+					return "DNS lookup failed";
 				case WebExceptionStatus.Timeout:
+					return "Connection timeout";
 				case WebExceptionStatus.ConnectFailure:
 					return "Cannot connect to remote server";
 				case WebExceptionStatus.ProtocolError:
@@ -70,7 +72,8 @@ namespace OpenRA
 		{
 			Game.OnQuit -= Cancel;
 			wc.CancelAsync();
+			wc.Dispose();
 			cancelled = true;
 		}
 	}
-}
+}

OpenRA.Game/Effects/DelayedAction.cs

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

OpenRA.Game/Effects/FlashTarget.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -18,15 +18,13 @@ namespace OpenRA.Effects
 	{
 		Actor target;
 		Player player;
-		int remainingTicks = 4;
+		int remainingTicks;
 
-		public FlashTarget(Actor target)
-			: this(target, null) { }
-
-		public FlashTarget(Actor target, Player asPlayer)
+		public FlashTarget(Actor target, Player asPlayer = null, int ticks = 4)
 		{
 			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);
 		}

OpenRA.Game/Effects/IEffect.cs

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

OpenRA.Game/Effects/SpriteEffect.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -13,15 +13,17 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Effects
 {
-	public class MoveFlash : IEffect
+	public class SpriteEffect : IEffect
 	{
+		string palette;
 		Animation anim;
 		WPos pos;
 
-		public MoveFlash(WPos pos, World world)
+		public SpriteEffect(WPos pos, World world, string sprite, string palette)
 		{
 			this.pos = pos;
-			anim = new Animation("moveflsh");
+			this.palette = palette;
+			anim = new Animation(world, sprite);
 			anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
 		}
 
@@ -32,7 +34,7 @@ namespace OpenRA.Effects
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
-			return anim.Render(pos, WVec.Zero, 0, wr.Palette("moveflash"), 1f / wr.Viewport.Zoom);
+			return anim.Render(pos, WVec.Zero, 0, wr.Palette(palette), 1f / wr.Viewport.Zoom);
 		}
 	}
 }

OpenRA.Game/Exts.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -11,13 +11,20 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using OpenRA.Support;
 
 namespace OpenRA
 {
 	public static class Exts
 	{
+		public static bool IsUppercase(this string str)
+		{
+			return string.Compare(str.ToUpperInvariant(), str, false) == 0;
+		}
+
 		public static string F(this string fmt, params object[] args)
 		{
 			return string.Format(fmt, args);
@@ -35,6 +42,8 @@ namespace OpenRA
 				fn(ee);
 		}
 
+		public static Lazy<T> Lazy<T>(Func<T> p) { return new Lazy<T>(p); }
+
 		public static IEnumerable<string> GetNamespaces(this Assembly a)
 		{
 			return a.GetTypes().Select(t => t.Namespace).Distinct().Where(n => n != null);
@@ -97,13 +106,16 @@ namespace OpenRA
 			return ret;
 		}
 
-		public static T Random<T>(this IEnumerable<T> ts, Thirdparty.Random r)
+		public static T Random<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
-			var xs = ts.ToArray();
-			return xs[r.Next(xs.Length)];
+			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)];
 		}
 
-		public static T RandomOrDefault<T>(this IEnumerable<T> ts, Thirdparty.Random r)
+		public static T RandomOrDefault<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
 			if (!ts.Any())
 				return default(T);
@@ -127,6 +139,54 @@ namespace OpenRA
 			for (;;) { yield return t; t = f(t); }
 		}
 
+		public static T MinBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
+		{
+			return ts.CompareBy(selector, 1, true);
+		}
+
+		public static T MaxBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
+		{
+			return ts.CompareBy(selector, -1, true);
+		}
+
+		public static T MinByOrDefault<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
+		{
+			return ts.CompareBy(selector, 1, false);
+		}
+
+		public static T MaxByOrDefault<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
+		{
+			return ts.CompareBy(selector, -1, false);
+		}
+
+		static T CompareBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector, int modifier, bool throws)
+		{
+			var comparer = Comparer<U>.Default;
+			T t;
+			U u;
+			using (var e = ts.GetEnumerator())
+			{
+				if (!e.MoveNext())
+					if (throws)
+						throw new ArgumentException("Collection must not be empty.", "ts");
+					else
+						return default(T);
+				t = e.Current;
+				u = selector(t);
+				while (e.MoveNext())
+				{
+					var nextT = e.Current;
+					var nextU = selector(nextT);
+					if (comparer.Compare(nextU, u) * modifier < 0)
+					{
+						t = nextT;
+						u = nextU;
+					}
+				}
+				return t;
+			}
+		}
+
 		public static int NextPowerOf2(int v)
 		{
 			--v;
@@ -145,9 +205,94 @@ namespace OpenRA
 
 		public static Size NextPowerOf2(this Size s) { return new Size(NextPowerOf2(s.Width), NextPowerOf2(s.Height)); }
 
+		public enum ISqrtRoundMode { Floor, Nearest, Ceiling }
+		public static int ISqrt(int number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
+		{
+			if (number < 0)
+				throw new InvalidOperationException("Attempted to calculate the square root of a negative integer: {0}".F(number));
+
+			return (int)ISqrt((uint)number, round);
+		}
+
+		public static uint ISqrt(uint number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
+		{
+			var divisor = 1U << 30;
+
+			var root = 0U;
+			var remainder = number;
+
+			// Find the highest term in the divisor
+			while (divisor > number)
+				divisor >>= 2;
+
+			// Evaluate the root, two bits at a time
+			while (divisor != 0)
+			{
+				if (root + divisor <= remainder)
+				{
+					remainder -= root + divisor;
+					root += 2 * divisor;
+				}
+
+				root >>= 1;
+				divisor >>= 2;
+			}
+
+			// Adjust for other rounding modes
+			if (round == ISqrtRoundMode.Nearest && remainder > root)
+				root += 1;
+
+			else if (round == ISqrtRoundMode.Ceiling && root * root < number)
+				root += 1;
+
+			return root;
+		}
+
+		public static long ISqrt(long number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
+		{
+			if (number < 0)
+				throw new InvalidOperationException("Attempted to calculate the square root of a negative integer: {0}".F(number));
+
+			return (long)ISqrt((ulong)number, round);
+		}
+
+		public static ulong ISqrt(ulong number, ISqrtRoundMode round = ISqrtRoundMode.Floor)
+		{
+			var divisor = 1UL << 62;
+
+			var root = 0UL;
+			var remainder = number;
+
+			// Find the highest term in the divisor
+			while (divisor > number)
+				divisor >>= 2;
+
+			// Evaluate the root, two bits at a time
+			while (divisor != 0)
+			{
+				if (root + divisor <= remainder)
+				{
+					remainder -= root + divisor;
+					root += 2 * divisor;
+				}
+
+				root >>= 1;
+				divisor >>= 2;
+			}
+
+			// Adjust for other rounding modes
+			if (round == ISqrtRoundMode.Nearest && remainder > root)
+				root += 1;
+
+			else if (round == ISqrtRoundMode.Ceiling && root * root < number)
+				root += 1;
+
+			return root;
+		}
+
 		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
 		{
-			return string.Join(j, ts.Select(t => t.ToString()).ToArray());
+			return string.Join(j, ts);
 		}
 
 		public static IEnumerable<T> Append<T>(this IEnumerable<T> ts, params T[] moreTs)
@@ -171,8 +316,8 @@ namespace OpenRA
 			var d = new Dictionary<TKey, TElement>();
 			foreach (var item in source)
 			{
-				TKey key = keySelector(item);
-				TElement element = elementSelector(item);
+				var key = keySelector(item);
+				var element = elementSelector(item);
 
 				// Check for a key conflict:
 				if (d.ContainsKey(key))
@@ -217,8 +362,8 @@ namespace OpenRA
 
 		public static T[] MakeArray<T>(int count, Func<int, T> f)
 		{
-			T[] result = new T[count];
-			for (int i = 0; i < count; i++)
+			var result = new T[count];
+			for (var i = 0; i < count; i++)
 				result[i] = f(i);
 
 			return result;
@@ -249,6 +394,16 @@ namespace OpenRA
 				throw new InvalidOperationException("ToBits only accepts up to 32 values.");
 			return result;
 		}
+
+		public static int ParseIntegerInvariant(string s)
+		{
+			return int.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
+		}
+
+		public static bool TryParseIntegerInvariant(string s, out int i)
+		{
+			return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
+		}
 	}
 
 	public static class Enum<T>

OpenRA.Game/FieldLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -10,13 +10,16 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
+using OpenRA.Graphics;
+using OpenRA.Primitives;
 
-namespace OpenRA.FileFormats
+namespace OpenRA
 {
 	public static class FieldLoader
 	{
@@ -32,38 +35,44 @@ namespace OpenRA.FileFormats
 
 		public static void Load(object self, MiniYaml my)
 		{
-			var loadDict = typeLoadInfo[self.GetType()];
+			var loadInfo = typeLoadInfo[self.GetType()];
 
-			foreach (var kv in loadDict)
+			Dictionary<string, MiniYaml> md = null;
+
+			foreach (var fli in loadInfo)
 			{
 				object val;
-				if (kv.Value != null)
-					val = kv.Value(kv.Key.Name, kv.Key.FieldType, my);
-				else if (!TryGetValueFromYaml(kv.Key, my, out val))
-					continue;
 
-				kv.Key.SetValue(self, val);
+				if (fli.Loader != null)
+					val = fli.Loader(my);
+				else
+				{
+					if (md == null)
+						md = my.ToDictionary();
+
+					if (!TryGetValueFromYaml(fli.YamlName, fli.Field, md, out val))
+						continue;
+				}
+
+				fli.Field.SetValue(self, val);
 			}
 		}
 
-		static bool TryGetValueFromYaml(FieldInfo field, MiniYaml yaml, out object ret)
+		static bool TryGetValueFromYaml(string yamlName, FieldInfo field, Dictionary<string, MiniYaml> md, out object ret)
 		{
 			ret = null;
-			var n = yaml.Nodes.Where(x => x.Key == field.Name).ToList();
-			if (n.Count == 0)
+
+			MiniYaml yaml;
+			if (!md.TryGetValue(yamlName, out yaml))
 				return false;
-			if (n.Count == 1 && n[0].Value.Nodes.Count == 0)
+
+			if (yaml.Nodes.Count == 0)
 			{
-				ret = GetValue(field.Name, field.FieldType, n[0].Value.Value, field);
+				ret = GetValue(field.Name, field.FieldType, yaml.Value, field);
 				return true;
 			}
-			else if (n.Count > 1)
-			{
-				throw new InvalidOperationException("The field {0} has multiple definitions:\n{1}"
-					.F(field.Name, n.Select(m => "\t- " + m.Location).JoinWith("\n")));
-			}
 
-			throw new InvalidOperationException("TryGetValueFromYaml: unable to load field {0} (of type {1})".F(field.Name, field.FieldType));
+			throw new InvalidOperationException("TryGetValueFromYaml: unable to load field {0} (of type {1})".F(yamlName, field.FieldType));
 		}
 
 		public static T Load<T>(MiniYaml y) where T : new()
@@ -74,27 +83,31 @@ namespace OpenRA.FileFormats
 		}
 
 		static readonly object[] NoIndexes = { };
-		public static void LoadField(object self, string key, string value)
+		public static void LoadField(object target, string key, string value)
 		{
-			var field = self.GetType().GetField(key.Trim());
+			const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 
+			key = key.Trim();
+
+			var field = target.GetType().GetField(key, flags);
 			if (field != null)
 			{
-				if (!field.HasAttribute<FieldFromYamlKeyAttribute>())
-					field.SetValue(self, GetValue(field.Name, field.FieldType, value, field));
+				var sa = field.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
+				if (!sa.FromYamlKey)
+					field.SetValue(target, GetValue(field.Name, field.FieldType, value, field));
 				return;
 			}
 
-			var prop = self.GetType().GetProperty(key.Trim());
-
+			var prop = target.GetType().GetProperty(key, flags);
 			if (prop != null)
 			{
-				if (!prop.HasAttribute<FieldFromYamlKeyAttribute>())
-					prop.SetValue(self, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
+				var sa = prop.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
+				if (!sa.FromYamlKey)
+					prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
 				return;
 			}
 
-			UnknownFieldAction(key.Trim(), self.GetType());
+			UnknownFieldAction(key, target.GetType());
 		}
 
 		public static T GetValue<T>(string field, string value)
@@ -114,7 +127,7 @@ namespace OpenRA.FileFormats
 			if (fieldType == typeof(int))
 			{
 				int res;
-				if (int.TryParse(value, out res))
+				if (Exts.TryParseIntegerInvariant(value, out res))
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -122,7 +135,7 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(ushort))
 			{
 				ushort res;
-				if (ushort.TryParse(value, out res))
+				if (ushort.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out res))
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -130,7 +143,7 @@ namespace OpenRA.FileFormats
 			if (fieldType == typeof(long))
 			{
 				long res;
-				if (long.TryParse(value, out res))
+				if (long.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out res))
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -138,7 +151,7 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(float))
 			{
 				float res;
-				if (float.TryParse(value.Replace("%", ""),  NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
+				if (float.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
 					return res * (value.Contains('%') ? 0.01f : 1f);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -146,7 +159,7 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(decimal))
 			{
 				decimal res;
-				if (decimal.TryParse(value.Replace("%", ""),  NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
+				if (decimal.TryParse(value.Replace("%", ""),  NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
 					return res * (value.Contains('%') ? 0.01m : 1m);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -162,9 +175,16 @@ namespace OpenRA.FileFormats
 			{
 				var parts = value.Split(',');
 				if (parts.Length == 3)
-					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255));
+					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(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255), int.Parse(parts[3]).Clamp(0, 255));
+					return 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);
 			}
 
@@ -175,9 +195,9 @@ namespace OpenRA.FileFormats
 				// Allow old ColorRamp format to be parsed as HSLColor
 				if (parts.Length == 3 || parts.Length == 4)
 					return new HSLColor(
-						(byte)int.Parse(parts[0]).Clamp(0, 255),
-						(byte)int.Parse(parts[1]).Clamp(0, 255),
-						(byte)int.Parse(parts[2]).Clamp(0, 255));
+						(byte)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);
 			}
@@ -213,6 +233,27 @@ namespace OpenRA.FileFormats
 				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)
+				{
+					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);
+				}
+
+				return vecs;
+			}
+
 			else if (fieldType == typeof(WPos))
 			{
 				var parts = value.Split(',');
@@ -229,7 +270,7 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(WAngle))
 			{
 				int res;
-				if (int.TryParse(value, out res))
+				if (Exts.TryParseIntegerInvariant(value, out res))
 					return new WAngle(res);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -240,8 +281,10 @@ namespace OpenRA.FileFormats
 				if (parts.Length == 3)
 				{
 					int rr, rp, ry;
-					if (int.TryParse(value, out rr) && int.TryParse(value, out rp) && int.TryParse(value, out ry))
-						return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(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);
@@ -250,20 +293,29 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(CPos))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new CPos(int.Parse(parts[0]), int.Parse(parts[1]));
+				return new CPos(
+					Exts.ParseIntegerInvariant(parts[0]),
+					Exts.ParseIntegerInvariant(parts[1]));
 			}
 
 			else if (fieldType == typeof(CVec))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new CVec(int.Parse(parts[0]), int.Parse(parts[1]));
+				return new CVec(
+					Exts.ParseIntegerInvariant(parts[0]),
+					Exts.ParseIntegerInvariant(parts[1]));
 			}
 
 			else if (fieldType.IsEnum)
 			{
-				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(value.ToLower()))
+				try
+				{
+					return Enum.Parse(fieldType, value, true);
+				}
+				catch (ArgumentException)
+				{
 					return InvalidValueAction(value, fieldType, fieldName);
-				return Enum.Parse(fieldType, value, true);
+				}
 			}
 
 			else if (fieldType == typeof(bool))
@@ -277,7 +329,7 @@ namespace OpenRA.FileFormats
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
 				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
-				for (int i = 0; i < parts.Length; i++)
+				for (var i = 0; i < parts.Length; i++)
 					ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
 				return ret;
 			}
@@ -285,13 +337,17 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(Size))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new Size(int.Parse(parts[0]), int.Parse(parts[1]));
+				return new Size(
+					Exts.ParseIntegerInvariant(parts[0]),
+					Exts.ParseIntegerInvariant(parts[1]));
 			}
 
 			else if (fieldType == typeof(int2))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
+				return new int2(
+					Exts.ParseIntegerInvariant(parts[0]),
+					Exts.ParseIntegerInvariant(parts[1]));
 			}
 
 			else if (fieldType == typeof(float2))
@@ -300,9 +356,9 @@ namespace OpenRA.FileFormats
 				float xx = 0;
 				float yy = 0;
 				float res;
-				if (float.TryParse(parts[0].Replace("%", ""), out 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("%", ""), out res))
+				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);
 			}
@@ -310,7 +366,11 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(Rectangle))
 			{
 				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new Rectangle(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
+				return new Rectangle(
+					Exts.ParseIntegerInvariant(parts[0]),
+					Exts.ParseIntegerInvariant(parts[1]),
+					Exts.ParseIntegerInvariant(parts[2]),
+					Exts.ParseIntegerInvariant(parts[3]));
 			}
 
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
@@ -328,6 +388,30 @@ namespace OpenRA.FileFormats
 				return fieldType.GetConstructor(new[] { innerType }).Invoke(new[] { innerValue });
 			}
 
+			else if (fieldType == typeof(DateTime))
+			{
+				DateTime dt;
+				if (DateTime.TryParseExact(value, "yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out dt))
+					return dt;
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
+
+			else
+			{
+				var conv = TypeDescriptor.GetConverter(fieldType);
+				if (conv.CanConvertFrom(typeof(string)))
+				{
+					try
+					{
+						return conv.ConvertFromInvariantString(value);
+					}
+					catch
+					{
+						return InvalidValueAction(value, fieldType, fieldName);
+					}
+				}
+			}
+
 			UnknownFieldAction("[Type] {0}".F(value), fieldType);
 			return null;
 		}
@@ -342,49 +426,101 @@ namespace OpenRA.FileFormats
 			return InvalidValueAction(p, fieldType, field);
 		}
 
-		static Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>> typeLoadInfo = new Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>>(GetTypeLoadInfo);
-
-		static Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>> GetTypeLoadInfo(Type type)
+		public sealed class FieldLoadInfo
 		{
-			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
+			public readonly FieldInfo Field;
+			public readonly SerializeAttribute Attribute;
+			public readonly string YamlName;
+			public readonly Func<MiniYaml, object> Loader;
 
-			foreach (var ff in type.GetFields())
+			internal FieldLoadInfo(FieldInfo field, SerializeAttribute attr, string yamlName, Func<MiniYaml, object> loader = null)
+			{
+				Field = field;
+				Attribute = attr;
+				YamlName = yamlName;
+				Loader = loader;
+			}
+		}
+
+		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));
+		}
+
+		static Cache<Type, List<FieldLoadInfo>> typeLoadInfo = new Cache<Type, List<FieldLoadInfo>>(BuildTypeLoadInfo);
+
+		static List<FieldLoadInfo> BuildTypeLoadInfo(Type type)
+		{
+			var ret = new List<FieldLoadInfo>();
+
+			foreach (var ff in type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
 			{
 				var field = ff;
-				var ignore = field.GetCustomAttributes<IgnoreAttribute>(false);
-				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>(false);
-				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>(false);
-				if (loadUsing.Length != 0)
-					ret[field] = (_1, fieldType, yaml) => loadUsing[0].LoaderFunc(field)(yaml);
-				else if (fromYamlKey.Length != 0)
-					ret[field] = (f, ft, yaml) => GetValue(f, ft, yaml.Value, field);
-				else if (ignore.Length == 0)
-					ret[field] = null;
+
+				var sa = field.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
+				if (!sa.Serialize)
+					continue;
+
+				var yamlName = string.IsNullOrEmpty(sa.YamlName) ? field.Name : sa.YamlName;
+
+				var loader = sa.GetLoader(type);
+				if (loader == null && sa.FromYamlKey)
+					loader = (yaml) => GetValue(yamlName, field.FieldType, yaml.Value, field);
+
+				var fli = new FieldLoadInfo(field, sa, yamlName, loader);
+				ret.Add(fli);
 			}
 
 			return ret;
 		}
 
 		[AttributeUsage(AttributeTargets.Field)]
-		public class IgnoreAttribute : Attribute { }
+		public sealed class IgnoreAttribute : SerializeAttribute
+		{
+			public IgnoreAttribute()
+				: base(false) { }
+		}
 
 		[AttributeUsage(AttributeTargets.Field)]
-		public class LoadUsingAttribute : Attribute
+		public sealed class LoadUsingAttribute : SerializeAttribute
 		{
-			Func<MiniYaml, object> loaderFuncCache;
-			public readonly string Loader;
-
 			public LoadUsingAttribute(string loader)
 			{
 				Loader = loader;
 			}
+		}
 
-			internal Func<MiniYaml, object> LoaderFunc(FieldInfo field)
+		[AttributeUsage(AttributeTargets.Field)]
+		public class SerializeAttribute : Attribute
+		{
+			public static readonly SerializeAttribute Default = new SerializeAttribute(true);
+
+			public bool IsDefault { get { return this == Default; } }
+
+			public readonly bool Serialize;
+			public string YamlName;
+			public string Loader;
+			public bool FromYamlKey;
+
+			public SerializeAttribute(bool serialize = true)
 			{
-				const BindingFlags BindingFlag = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
-				if (loaderFuncCache == null)
-					loaderFuncCache = (Func<MiniYaml, object>)Delegate.CreateDelegate(typeof(Func<MiniYaml, object>), field.DeclaringType.GetMethod(Loader, BindingFlag));
-				return loaderFuncCache;
+				Serialize = serialize;
+			}
+
+			internal Func<MiniYaml, object> GetLoader(Type type)
+			{
+				const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.FlattenHierarchy;
+
+				if (!string.IsNullOrEmpty(Loader))
+				{
+					var method = type.GetMethod(Loader, flags);
+					if (method == null)
+						throw new InvalidOperationException("{0} does not specify a loader function '{1}'".F(type.Name, Loader));
+
+					return (Func<MiniYaml, object>)Delegate.CreateDelegate(typeof(Func<MiniYaml, object>), method);
+				}
+
+				return null;
 			}
 		}
 
@@ -404,12 +540,19 @@ namespace OpenRA.FileFormats
 	}
 
 	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-	public class TranslateAttribute : Attribute { }
+	public sealed class TranslateAttribute : Attribute { }
 
-	public class FieldFromYamlKeyAttribute : Attribute { }
+	[AttributeUsage(AttributeTargets.Field)]
+	public sealed class FieldFromYamlKeyAttribute : FieldLoader.SerializeAttribute
+	{
+		public FieldFromYamlKeyAttribute()
+		{
+			FromYamlKey = true;
+		}
+	}
 
 	// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
-	public class DescAttribute : Attribute
+	public sealed class DescAttribute : Attribute
 	{
 		public readonly string[] Lines;
 		public DescAttribute(params string[] lines) { Lines = lines; }

OpenRA.Game/FieldSaver.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -10,40 +10,44 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
 
-namespace OpenRA.FileFormats
+namespace OpenRA
 {
 	public static class FieldSaver
 	{
-		public static MiniYaml Save(object o)
+		public static MiniYaml Save(object o, bool includePrivateByDefault = false)
 		{
 			var nodes = new List<MiniYamlNode>();
 			string root = null;
 
-			foreach (var f in o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance))
+			foreach (var info in FieldLoader.GetTypeLoadInfo(o.GetType(), includePrivateByDefault))
 			{
-				if (f.HasAttribute<FieldFromYamlKeyAttribute>())
-					root = FormatValue(o, f);
+				if (info.Attribute.FromYamlKey)
+					root = FormatValue(o, info.Field);
 				else
-					nodes.Add(new MiniYamlNode(f.Name, FormatValue(o, f)));
+					nodes.Add(new MiniYamlNode(info.YamlName, FormatValue(o, info.Field)));
 			}
 
 			return new MiniYaml(root, nodes);
 		}
 
-		public static MiniYaml SaveDifferences(object o, object from)
+		public static MiniYaml SaveDifferences(object o, object from, bool includePrivateByDefault = false)
 		{
 			if (o.GetType() != from.GetType())
 				throw new InvalidOperationException("FieldLoader: can't diff objects of different types");
 
-			var fields = o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
-				.Where(f => FormatValue(o, f) != FormatValue(from, f));
+			var fields = FieldLoader.GetTypeLoadInfo(o.GetType(), includePrivateByDefault)
+				.Where(info => FormatValue(o, info.Field) != FormatValue(from, info.Field));
 
-			return new MiniYaml(null, fields.Select(f => new MiniYamlNode(f.Name, FormatValue(o, f))).ToList());
+			return new MiniYaml(
+				null,
+				fields.Select(info => new MiniYamlNode(info.YamlName, FormatValue(o, info.Field))).ToList()
+			);
 		}
 
 		public static MiniYamlNode SaveField(object o, string field)
@@ -66,9 +70,13 @@ namespace OpenRA.FileFormats
 					((int)c.B).Clamp(0, 255));
 			}
 
-			// Don't save floats in settings.yaml using country-specific decimal separators which can be misunderstood as group seperators.
+			// Don't save using country-specific decimal separators which can be misunderstood as group seperators.
 			if (t == typeof(float))
 				return ((float)v).ToString(CultureInfo.InvariantCulture);
+			if (t == typeof(decimal))
+				return ((decimal)v).ToString(CultureInfo.InvariantCulture);
+			if (t == typeof(double))
+				return ((double)v).ToString(CultureInfo.InvariantCulture);
 
 			if (t == typeof(Rectangle))
 			{
@@ -79,7 +87,26 @@ namespace OpenRA.FileFormats
 			if (t.IsArray)
 			{
 				var elems = ((Array)v).OfType<object>();
-				return elems.JoinWith(",");
+				return elems.JoinWith(", ");
+			}
+
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))
+				return ""; // TODO
+
+			if (t == typeof(DateTime))
+				return ((DateTime)v).ToString("yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture);
+
+			// Try the TypeConverter
+			var conv = TypeDescriptor.GetConverter(t);
+			if (conv.CanConvertTo(typeof(string)))
+			{
+				try
+				{
+					return conv.ConvertToInvariantString(v);
+				}
+				catch
+				{
+				}
 			}
 
 			return v.ToString();

OpenRA.Game/FileFormats/AudLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -36,7 +36,7 @@ namespace OpenRA.FileFormats
 			Chunk c;
 			c.CompressedSize = s.ReadUInt16();
 			c.OutputSize = s.ReadUInt16();
-			if (0xdeaf != s.ReadUInt32())
+			if (s.ReadUInt32() != 0xdeaf)
 				throw new InvalidDataException("Chunk header is bogus");
 			return c;
 		}
@@ -45,17 +45,19 @@ namespace OpenRA.FileFormats
 	public static class AudLoader
 	{
 		static int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
-		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,
-									97,    107,   118,   130,   143,   157,    173,   190,   209,
-									230,   253,   279,   307,   337,   371,    408,   449,   494,
-									544,   598,   658,   724,   796,   876,    963,   1060,  1166,
-									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 };
+		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,
+			97, 107, 118, 130, 143, 157, 173, 190, 209,
+			230, 253, 279, 307, 337, 371, 408, 449, 494,
+			544, 598, 658, 724, 796, 876, 963, 1060, 1166,
+			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 
+		};
 
 		static short DecodeSample(byte b, ref int index, ref int current)
 		{
@@ -131,7 +133,7 @@ namespace OpenRA.FileFormats
 			while (dataSize > 0)
 			{
 				var chunk = Chunk.Read(s);
-				for (int n = 0; n < chunk.CompressedSize; n++)
+				for (var n = 0; n < chunk.CompressedSize; n++)
 				{
 					var b = s.ReadUInt8();
 

OpenRA.Game/FileFormats/Blast.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -92,7 +92,7 @@ namespace OpenRA.FileFormats
 					// Magic number for "done"
 					if (len == 519)
 					{
-						for (int i = 0; i < next; i++)
+						for (var i = 0; i < next; i++)
 							ms.WriteByte(outBuffer[i]);
 						break;
 					}
@@ -135,7 +135,7 @@ namespace OpenRA.FileFormats
 						// Flush window to outstream
 						if (next == MAXWIN)
 						{
-							for (int i = 0; i < next; i++)
+							for (var i = 0; i < next; i++)
 								ms.WriteByte(outBuffer[i]);
 							next = 0;
 							first = false;
@@ -149,7 +149,7 @@ namespace OpenRA.FileFormats
 					outBuffer[next++] = (byte)symbol;
 					if (next == MAXWIN)
 					{
-						for (int i = 0; i < next; i++)
+						for (var i = 0; i < next; i++)
 							ms.WriteByte(outBuffer[i]);
 						next = 0;
 						first = false;
@@ -236,7 +236,7 @@ namespace OpenRA.FileFormats
 			var s = 0; // current symbol
 
 			// convert compact repeat counts into symbol bit length list
-			foreach (byte code in rep)
+			foreach (var code in rep)
 			{
 				var num = (code >> 4) + 1; // Number of codes (top four bits plus 1)
 				var len = (byte)(code & 15); // Code length (low four bits)
@@ -250,7 +250,7 @@ namespace OpenRA.FileFormats
 
 			// count number of codes of each length
 			Count = new short[Blast.MAXBITS + 1];
-			for (int i = 0; i < n; i++)
+			for (var i = 0; i < n; i++)
 				Count[length[i]]++;
 
 			// no codes!
@@ -259,7 +259,7 @@ namespace OpenRA.FileFormats
 
 			// check for an over-subscribed or incomplete set of lengths
 			var left = 1; // one possible code of zero length
-			for (int len = 1; len <= Blast.MAXBITS; len++)
+			for (var len = 1; len <= Blast.MAXBITS; len++)
 			{
 				left <<= 1;	// one more bit, double codes left
 				left -= Count[len];	// deduct count from possible codes
@@ -269,7 +269,7 @@ namespace OpenRA.FileFormats
 
 			// generate offsets into symbol table for each length for sorting
 			var offs = new short[Blast.MAXBITS + 1];
-			for (int len = 1; len < Blast.MAXBITS; len++)
+			for (var len = 1; len < Blast.MAXBITS; len++)
 				offs[len + 1] = (short)(offs[len] + Count[len]);
 
 			// put symbols in table sorted by length, by symbol order within each length

OpenRA.Game/FileFormats/Blowfish.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -26,15 +26,15 @@ namespace OpenRA.FileFormats
 
 			uint l = 0, r = 0;
 
-			for (int i = 0; i < 18; )
+			for (var i = 0; i < 18; )
 			{
 				Encrypt(ref l, ref r);
 				m_p[i++] = l;
 				m_p[i++] = r;
 			}
 
-			for (int i = 0; i < 4; ++i)
-				for (int j = 0; j < 256; )
+			for (var i = 0; i < 4; ++i)
+				for (var j = 0; j < 256; )
 				{
 					Encrypt(ref l, ref r);
 					m_s[i, j++] = l;
@@ -47,16 +47,16 @@ namespace OpenRA.FileFormats
 
 		delegate void CipherFunc( ref uint a, ref uint b );
 
-		uint[] RunCipher(uint[] data, CipherFunc f)
+		static uint[] RunCipher(uint[] data, CipherFunc f)
 		{
-			uint[] result = new uint[data.Length];
+			var result = new uint[data.Length];
 
-			int size = data.Length / 2;
-			int i = 0;
+			var size = data.Length / 2;
+			var i = 0;
 			while (size-- > 0)
 			{
-				uint a = SwapBytes(data[i]);
-				uint b = SwapBytes(data[i+1]);
+				var a = SwapBytes(data[i]);
+				var b = SwapBytes(data[i+1]);
 
 				f(ref a, ref b);
 
@@ -72,8 +72,8 @@ namespace OpenRA.FileFormats
 			uint _a = a, _b = b;
 			_a ^= m_p[0];
 
-			bool x = false;
-			for( int i = 1; i <= 16; i++, x ^= true)
+			var x = false;
+			for( var i = 1; i <= 16; i++, x ^= true)
 			{
 				if (x)
 					Round(ref _a, _b, i);
@@ -91,8 +91,8 @@ namespace OpenRA.FileFormats
 			uint _a = a, _b = b;
 			_a ^= m_p[17];
 
-			bool x = false;
-			for (int i = 16; i >= 1; i--, x ^= true)
+			var x = false;
+			for (var i = 16; i >= 1; i--, x ^= true)
 			{
 				if (x)
 					Round(ref _a, _b, i);
@@ -120,7 +120,7 @@ namespace OpenRA.FileFormats
 			a ^= bf_f(b) ^ m_p[n];
 		}
 
-		uint SwapBytes(uint i)
+		static uint SwapBytes(uint i)
 		{
 			i = (i << 16) | (i >> 16);
 			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);

OpenRA.Game/FileFormats/BlowfishKeyProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -35,13 +35,13 @@ namespace OpenRA.FileFormats
 		uint glob1_hi_bitlen;
 		uint glob1_hi_inv_lo, glob1_hi_inv_hi;
 
-		void init_bignum(uint[] n, uint val, uint len)
+		static void init_bignum(uint[] n, uint val, uint len)
 		{
-			for (int i = 0; i < len; i++) n[i] = 0;
+			for (var i = 0; i < len; i++) n[i] = 0;
 			n[0] = val;
 		}
 
-		void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
+		static void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
 		{
 			byte sign;
 
@@ -52,20 +52,20 @@ namespace OpenRA.FileFormats
 			{
 				fixed (uint* _pn = &n[0])
 				{
-					byte* pn = (byte*)_pn;
-					uint i = blen * 4;
+					var pn = (byte*)_pn;
+					var i = blen * 4;
 					for (; i > klen; i--) pn[i - 1] = (byte)sign;
 					for (; i > 0; i--) pn[i - 1] = key[klen - i];
 				}
 			}
 		}
 
-		void key_to_bignum(uint[] n, byte[] key, uint len)
+		static void key_to_bignum(uint[] n, byte[] key, uint len)
 		{
 			uint keylen;
 			int i;
 
-			int j = 0;
+			var j = 0;
 
 			if (key[j] != 2) return;
 			j++;
@@ -85,7 +85,7 @@ namespace OpenRA.FileFormats
 				move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
 		}
 
-		uint len_bignum(uint[] n, uint len)
+		static uint len_bignum(uint[] n, uint len)
 		{
 			uint i;
 			i = len - 1;
@@ -93,7 +93,7 @@ namespace OpenRA.FileFormats
 			return i + 1;
 		}
 
-		uint bitlen_bignum(uint[] n, uint len)
+		static uint bitlen_bignum(uint[] n, uint len)
 		{
 			uint ddlen, bitlen, mask;
 			ddlen = len_bignum(n, len);
@@ -118,11 +118,11 @@ namespace OpenRA.FileFormats
 
 		uint len_predata()
 		{
-			uint a = (pubkey.len - 1) / 8;
+			var a = (pubkey.len - 1) / 8;
 			return (55 / a + 1) * (a + 1);
 		}
 
-		int cmp_bignum(uint[] n1, uint[] n2, uint len)
+		static int cmp_bignum(uint[] n1, uint[] n2, uint len)
 		{
 
 			while (len > 0)
@@ -134,14 +134,14 @@ namespace OpenRA.FileFormats
 			return 0;
 		}
 
-		void mov_bignum(uint[] dest, uint[] src, uint len)
+		static void mov_bignum(uint[] dest, uint[] src, uint len)
 		{
 			Array.Copy(src, dest, len);
 		}
 
-		void shr_bignum(uint[] n, int bits, int len)
+		static void shr_bignum(uint[] n, int bits, int len)
 		{
-			int i; int i2 = bits / 32;
+			int i; var i2 = bits / 32;
 
 			if (i2 > 0)
 			{
@@ -155,7 +155,7 @@ namespace OpenRA.FileFormats
 			n[i] = n[i] >> bits;
 		}
 
-		void shl_bignum(uint[] n, int bits, int len)
+		static void shl_bignum(uint[] n, int bits, int len)
 		{
 			int i, i2;
 
@@ -172,7 +172,7 @@ namespace OpenRA.FileFormats
 			n[0] <<= bits;
 		}
 
-		uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
+		static uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
 		{
 			uint i1, i2;
 
@@ -183,9 +183,9 @@ namespace OpenRA.FileFormats
 				fixed (uint* _ps2 = &src2[0])
 				fixed (uint* _pd = &dest[0])
 				{
-					ushort* ps1 = (ushort*)_ps1;
-					ushort* ps2 = (ushort*)_ps2;
-					ushort* pd = (ushort*)_pd;
+					var ps1 = (ushort*)_ps1;
+					var ps2 = (ushort*)_ps2;
+					var pd = (ushort*)_pd;
 
 					while (--len != -1)
 					{
@@ -199,15 +199,15 @@ namespace OpenRA.FileFormats
 			return carry;
 		}
 
-		unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
+		static unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
 		{
 			uint i1, i2;
 
 			len += len;
 
-			ushort* ps1 = (ushort*)src1;
-			ushort* ps2 = (ushort*)src2;
-			ushort* pd = (ushort*)dest;
+			var ps1 = (ushort*)src1;
+			var ps2 = (ushort*)src2;
+			var pd = (ushort*)dest;
 
 			while (--len != -1)
 			{
@@ -220,13 +220,13 @@ namespace OpenRA.FileFormats
 			return carry;
 		}
 
-		void inv_bignum(uint[] n1, uint[] n2, uint len)
+		static void inv_bignum(uint[] n1, uint[] n2, uint len)
 		{
-			uint[] n_tmp = new uint[64];
+			var n_tmp = new uint[64];
 			uint n2_bytelen, bit;
 			int n2_bitlen;
 
-			int j = 0;
+			var j = 0;
 
 			init_bignum(n_tmp, 0, len);
 			init_bignum(n1, 0, len);
@@ -255,9 +255,9 @@ namespace OpenRA.FileFormats
 			init_bignum(n_tmp, 0, len);
 		}
 
-		void inc_bignum(uint[] n, uint len)
+		static void inc_bignum(uint[] n, uint len)
 		{
-			int i = 0;
+			var i = 0;
 			while ((++n[i] == 0) && (--len > 0)) i++;
 		}
 
@@ -282,14 +282,14 @@ namespace OpenRA.FileFormats
 			glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
 		}
 
-		unsafe void mul_bignum_word(ushort *pn1, uint[] n2, uint mul, uint len)
+		static unsafe void mul_bignum_word(ushort* pn1, uint[] n2, uint mul, uint len)
 		{
 			uint i, tmp;
 			unsafe
 			{
 				fixed (uint* _pn2 = &n2[0])
 				{
-					ushort* pn2 = (ushort*)_pn2;
+					var pn2 = (ushort*)_pn2;
 
 					tmp = 0;
 					for (i = 0; i < len; i++)
@@ -305,7 +305,7 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
+		static void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
 		{
 		  uint i;
 
@@ -314,8 +314,8 @@ namespace OpenRA.FileFormats
 			  fixed( uint * _psrc2 = &src2[0] )
 			  fixed(uint* _pdest = &dest[0])
 			  {
-				  ushort* psrc2 = (ushort*)_psrc2;
-				  ushort* pdest = (ushort*)_pdest;
+				  var psrc2 = (ushort*)_psrc2;
+				  var pdest = (ushort*)_pdest;
 
 				  init_bignum(dest, 0, len * 2);
 				  for (i = 0; i < len * 2; i++)
@@ -324,13 +324,13 @@ namespace OpenRA.FileFormats
 		  }
 		}
 
-		void not_bignum(uint[] n, uint len)
+		static void not_bignum(uint[] n, uint len)
 		{
 		  uint i;
 		  for (i = 0; i < len; i++) n[i] = ~n[i];
 		}
 
-		void neg_bignum(uint[] n, uint len)
+		static void neg_bignum(uint[] n, uint len)
 		{
 		  not_bignum(n, len);
 		  inc_bignum(n, len);
@@ -338,8 +338,8 @@ namespace OpenRA.FileFormats
 
 		unsafe uint get_mulword(uint* n)
 		{
-			ushort* wn = (ushort*)n;
-			uint i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
+			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
@@ -348,9 +348,9 @@ namespace OpenRA.FileFormats
 			return i & 0xffff;
 		}
 
-		void dec_bignum(uint[] n, uint len)
+		static void dec_bignum(uint[] n, uint len)
 		{
-			int i = 0;
+			var i = 0;
 			while ((--n[i] == 0xffffffff) && (--len > 0))
 				i++;
 		}
@@ -371,12 +371,12 @@ namespace OpenRA.FileFormats
 						inc_bignum(glob2, len * 2 + 1);
 						neg_bignum(glob2, len * 2 + 1);
 						len_diff = g2_len_x2 + 1 - glob1_len_x2;
-						ushort* esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
-						ushort* edi = ((ushort*)g2) + (g2_len_x2 + 1);
+						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--)
 						{
 							edi--;
-							uint tmp = get_mulword((uint*)edi);
+							var tmp = get_mulword((uint*)edi);
 							esi--;
 							if (tmp > 0)
 							{
@@ -410,7 +410,7 @@ namespace OpenRA.FileFormats
 
 		void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
 		{
-			uint[] n_tmp = new uint[64];
+			var n_tmp = new uint[64];
 			uint n3_len, n4_len;
 			int n3_bitlen;
 			uint bit_mask;
@@ -419,7 +419,7 @@ namespace OpenRA.FileFormats
 			{
 				fixed (uint* _pn3 = &n3[0])
 				{
-					uint* pn3 = _pn3;
+					var pn3 = _pn3;
 
 					init_bignum(n1, 1, len);
 					n4_len = len_bignum(n4, len);
@@ -450,17 +450,17 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		unsafe void memcpy(byte* dest, byte* src, int len)
+		static unsafe void memcpy(byte* dest, byte* src, int len)
 		{
 			while (len-- != 0) *dest++ = *src++;
 		}
 
 		unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
 		{
-			uint[] n2 = new uint[64];
-			uint[] n3 = new uint[64];
+			var n2 = new uint[64];
+			var n3 = new uint[64];
 
-			uint a = (pubkey.len - 1) / 8;
+			var a = (pubkey.len - 1) / 8;
 			while (a + 1 <= pre_len)
 			{
 				init_bignum(n2, 0, 64);
@@ -480,7 +480,7 @@ namespace OpenRA.FileFormats
 		public byte[] DecryptKey(byte[] src)
 		{
 			init_pubkey();
-			byte[] dest = new byte[256];
+			var dest = new byte[256];
 
 			unsafe
 			{

OpenRA.Game/FileFormats/CRC32.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -98,8 +98,8 @@ namespace OpenRA.FileFormats
 		/// </returns>
 		public static uint Calculate(byte[] data, uint polynomial)
 		{
-			uint crc = polynomial;
-			for (int i = 0; i < data.Length; i++)
+			var crc = polynomial;
+			for (var i = 0; i < data.Length; i++)
 				crc = (crc >> 8) ^ lookUp[(crc & 0xFF) ^ data[i]];
 			crc ^= polynomial;
 			return crc;
@@ -119,8 +119,8 @@ namespace OpenRA.FileFormats
 		/// <returns>The calculated checksum.</returns>
 		public static unsafe uint Calculate(byte* data, uint len, uint polynomial)
 		{
-			uint crc = polynomial;
-			for (int i = 0; i < len; i++)
+			var crc = polynomial;
+			for (var i = 0; i < len; i++)
 				crc = (crc >> 8) ^ lookUp[(crc & 0xFF) ^ *data++];
 			crc ^= polynomial;
 			return crc;

OpenRA.Game/FileFormats/Format2.cs

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

OpenRA.Game/FileFormats/Format40.cs

@@ -0,0 +1,78 @@
+#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.FileFormats
+{
+	public static class Format40
+	{
+		public static int DecodeInto(byte[] src, byte[] dest, int srcOffset)
+		{
+			var ctx = new FastByteReader(src, srcOffset);
+			var destIndex = 0;
+
+			while (true)
+			{
+				var i = ctx.ReadByte();
+				if ((i & 0x80) == 0)
+				{
+					var count = i & 0x7F;
+					if (count == 0)
+					{
+						// case 6
+						count = ctx.ReadByte();
+						var value = ctx.ReadByte();
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] ^= value;
+					}
+					else
+					{
+						// case 5
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] ^= ctx.ReadByte();
+					}
+				}
+				else
+				{
+					var count = i & 0x7F;
+					if (count == 0)
+					{
+						count = ctx.ReadWord();
+						if (count == 0)
+							return destIndex;
+
+						if ((count & 0x8000) == 0)
+						{
+							// case 2
+							destIndex += (count & 0x7FFF);
+						}
+						else if ((count & 0x4000) == 0)
+						{
+							// case 3
+							for (var end = destIndex + (count & 0x3FFF); destIndex < end; destIndex++)
+								dest[destIndex] ^= ctx.ReadByte();
+						}
+						else
+						{
+							// case 4
+							var value = ctx.ReadByte();
+							for (var end = destIndex + (count & 0x3FFF); destIndex < end; destIndex++)
+								dest[destIndex] ^= value;
+						}
+					}
+					else
+					{
+						// case 1
+						destIndex += count;
+					}
+				}
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/Format80.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -16,11 +16,12 @@ namespace OpenRA.FileFormats
 	class FastByteReader
 	{
 		readonly byte[] src;
-		int offset = 0;
+		int offset;
 
-		public FastByteReader(byte[] src)
+		public FastByteReader(byte[] src, int offset = 0)
 		{
 			this.src = src;
+			this.offset = offset;
 		}
 
 		public bool Done() { return offset >= src.Length; }
@@ -59,9 +60,9 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		public static int DecodeInto(byte[] src, byte[] dest)
+		public static int DecodeInto(byte[] src, byte[] dest, int srcOffset = 0)
 		{
-			var ctx = new FastByteReader(src);
+			var ctx = new FastByteReader(src, srcOffset);
 			var destIndex = 0;
 
 			while (true)
@@ -125,26 +126,78 @@ namespace OpenRA.FileFormats
 			}
 		}
 
+		static int CountSame(byte[] src, int offset, int maxCount)
+		{
+			maxCount = Math.Min(src.Length - offset, maxCount);
+			if (maxCount <= 0)
+				return 0;
+
+			var first = src[offset++];
+			var count = 1;
+
+			while (count < maxCount && src[offset++] == first)
+				count++;
+
+			return count;
+		}
+
+		static void WriteCopyBlocks(byte[] src, int offset, int count, MemoryStream output)
+		{
+			while (count > 0)
+			{
+				var writeNow = Math.Min(count, 0x3F);
+				output.WriteByte((byte)(0x80 | writeNow));
+				output.Write(src, offset, writeNow);
+
+				count -= writeNow;
+				offset += writeNow;
+			}
+		}
+
+		// Quick and dirty Format80 encoder version 2
+		// Uses raw copy and RLE compression
 		public static byte[] Encode(byte[] src)
 		{
-			/* quick & dirty format80 encoder -- only uses raw copy operator, terminated with a zero-run. */
-			/* this does not produce good compression, but it's valid format80 */
-
-			var ctx = new FastByteReader(src);
-			var ms = new MemoryStream();
-
-			do
+			using (var ms = new MemoryStream())
 			{
-				var len = Math.Min(ctx.Remaining(), 0x3F);
-				ms.WriteByte((byte)(0x80 | len));
-				while (len-- > 0)
-					ms.WriteByte(ctx.ReadByte());
+				var offset = 0;
+				var left = src.Length;
+				var blockStart = 0;
+
+				while (offset < left)
+				{
+					var repeatCount = CountSame(src, offset, 0xFFFF);
+					if (repeatCount >= 4)
+					{
+						// Write what we haven't written up to now
+						WriteCopyBlocks(src, blockStart, offset - blockStart, ms);
+
+						// 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]);
+
+						offset += repeatCount;
+						blockStart = offset;
+					}
+					else
+					{
+						offset++;
+					}
+				}
+
+				// Write what we haven't written up to now
+				WriteCopyBlocks(src, blockStart, offset - blockStart, ms);
+
+				// Write terminator
+				ms.WriteByte(0x80);
+
+				return ms.ToArray();
 			}
-			while (!ctx.Done());
-
-			ms.WriteByte(0x80);	// terminator -- 0-length run.
-
-			return ms.ToArray();
 		}
 	}
 }

OpenRA.Game/FileFormats/HvaReader.cs

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

OpenRA.Game/FileFormats/ImaAdpcmLoader.cs

@@ -0,0 +1,99 @@
+#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;
+
+namespace OpenRA.FileFormats
+{
+	struct ImaAdpcmChunk
+	{
+		public int CompressedSize;
+		public int OutputSize;
+
+		public static ImaAdpcmChunk Read(Stream s)
+		{
+			ImaAdpcmChunk c;
+			c.CompressedSize = s.ReadUInt16();
+			c.OutputSize = s.ReadUInt16();
+			if (s.ReadUInt32() != 0xdeaf)
+				throw new InvalidDataException("Chunk header is bogus");
+			return c;
+		}
+	}
+
+	public static class ImaAdpcmLoader
+	{
+		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,
+			97, 107, 118, 130, 143, 157, 173, 190, 209,
+			230, 253, 279, 307, 337, 371, 408, 449, 494,
+			544, 598, 658, 724, 796, 876, 963, 1060, 1166,
+			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 
+		};
+
+		static short DecodeImaAdpcmSample(byte b, ref int index, ref int current)
+		{
+			var sb = (b & 8) != 0;
+			b &= 7;
+
+			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];
+			if (index < 0) index = 0;
+			if (index > 88) index = 88;
+
+			return (short)current;
+		}
+
+		public static byte[] LoadImaAdpcmSound(byte[] raw, ref int index)
+		{
+			var currentSample = 0;
+			return LoadImaAdpcmSound(raw, ref index, ref currentSample);
+		}
+
+		public static byte[] LoadImaAdpcmSound(byte[] raw, ref int index, ref int currentSample)
+		{
+			var s = new MemoryStream(raw);
+			var dataSize = raw.Length;
+			var outputSize = raw.Length * 4;
+
+			var output = new byte[outputSize];
+			var offset = 0;
+
+			while (dataSize-- > 0)
+			{
+				var b = s.ReadUInt8();
+
+				var t = DecodeImaAdpcmSample(b, ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+
+				t = DecodeImaAdpcmSample((byte)(b >> 4), ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+			}
+
+			return output;
+		}
+	}
+}

OpenRA.Game/FileFormats/IniFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -33,7 +33,7 @@ namespace OpenRA.FileFormats
 
 		public void Load(Stream s)
 		{
-			StreamReader reader = new StreamReader(s);
+			var reader = new StreamReader(s);
 			IniSection currentSection = null;
 
 			while (!reader.EndOfStream)
@@ -55,10 +55,10 @@ namespace OpenRA.FileFormats
 
 		IniSection ProcessSection(string line)
 		{
-			Match m = sectionPattern.Match(line);
+			var m = sectionPattern.Match(line);
 			if (!m.Success)
 				return null;
-			string sectionName = m.Groups[1].Value.ToLowerInvariant();
+			var sectionName = m.Groups[1].Value.ToLowerInvariant();
 
 			IniSection ret;
 			if (!sections.TryGetValue(sectionName, out ret))
@@ -66,7 +66,7 @@ namespace OpenRA.FileFormats
 			return ret;
 		}
 
-		bool ProcessEntry(string line, IniSection currentSection)
+		static bool ProcessEntry(string line, IniSection currentSection)
 		{
 			var comment = line.IndexOf(';');
 			if (comment >= 0)
@@ -78,7 +78,7 @@ namespace OpenRA.FileFormats
 
 			var key = line;
 			var value = "";
-			int eq = line.IndexOf('=');
+			var eq = line.IndexOf('=');
 			if (eq >= 0)
 			{
 				key = line.Substring(0, eq);

OpenRA.Game/FileFormats/PngLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -18,7 +18,7 @@ using System.Net;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace OpenRA.FileFormats.Graphics
+namespace OpenRA.FileFormats
 {
 	public static class PngLoader
 	{
@@ -39,7 +39,7 @@ namespace OpenRA.FileFormats.Graphics
 
 				Bitmap bitmap = null;
 				Color[] palette = null;
-				List<byte> data = new List<byte>();
+				var data = new List<byte>();
 
 				for (; ; )
 				{

OpenRA.Game/FileFormats/R8Reader.cs

@@ -0,0 +1,80 @@
+#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.Drawing;
+using System.IO;
+using OpenRA.Graphics;
+
+namespace OpenRA.FileFormats
+{
+	public class R8Reader : ISpriteSource
+	{
+		class R8Image : ISpriteFrame
+		{
+			public Size Size { get; private set; }
+			public Size FrameSize { get; private set; }
+			public float2 Offset { get; private set; }
+			public byte[] Data { get; set; }
+
+			public R8Image(Stream s)
+			{
+				// Scan forward until we find some data
+				var type = s.ReadUInt8();
+				while (type == 0)
+					type = s.ReadUInt8();
+
+				var width = s.ReadInt32();
+				var height = s.ReadInt32();
+				var x = s.ReadInt32();
+				var y = s.ReadInt32();
+
+				Size = new Size(width, height);
+				Offset = new int2(width / 2 - x, height / 2 - y);
+
+				/*var imageOffset = */
+				s.ReadInt32();
+				var paletteOffset = s.ReadInt32();
+				var bpp = s.ReadUInt8();
+				if (bpp != 8)
+					throw new InvalidDataException("Error: {0} bits per pixel are not supported.".F(bpp));
+
+				var frameHeight = s.ReadUInt8();
+				var frameWidth = s.ReadUInt8();
+				FrameSize = new Size(frameWidth, frameHeight);
+
+				// Skip alignment byte
+				s.ReadUInt8();
+
+				Data = s.ReadBytes(width * height);
+
+				// Ignore palette
+				if (type == 1 && paletteOffset != 0)
+					s.Seek(520, SeekOrigin.Current);
+			}
+		}
+
+		public IReadOnlyList<ISpriteFrame> Frames { get; private set; }
+		public bool CacheWhenLoadingTileset { get { return true; } }
+
+		public readonly int ImageCount;
+		public R8Reader(Stream stream)
+		{
+			var frames = new List<R8Image>();
+			while (stream.Position < stream.Length)
+			{
+				frames.Add(new R8Image(stream));
+				ImageCount++;
+			}
+
+			Frames = frames.ToArray().AsReadOnly();
+		}
+	}
+}

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -0,0 +1,123 @@
+#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.Text;
+
+namespace OpenRA.FileFormats
+{
+	public class ReplayMetadata
+	{
+		// Must be an invalid replay 'client' value
+		public const int MetaStartMarker = -1;
+		public const int MetaEndMarker = -2;
+		public const int MetaVersion = 0x00000001;
+
+		public readonly GameInformation GameInfo;
+		public string FilePath { get; private set; }
+
+		public ReplayMetadata(GameInformation info)
+		{
+			if (info == null)
+				throw new ArgumentNullException("info");
+
+			GameInfo = info;
+		}
+
+		ReplayMetadata(FileStream fs, string path)
+		{
+			FilePath = path;
+
+			// Read start marker
+			if (fs.ReadInt32() != MetaStartMarker)
+				throw new InvalidOperationException("Expected MetaStartMarker but found an invalid value.");
+
+			// Read version
+			var version = fs.ReadInt32();
+			if (version != MetaVersion)
+				throw new NotSupportedException("Metadata version {0} is not supported".F(version));
+
+			// Read game info (max 100K limit as a safeguard against corrupted files)
+			var data = fs.ReadString(Encoding.UTF8, 1024 * 100);
+			GameInfo = GameInformation.Deserialize(data);
+		}
+
+		public void Write(BinaryWriter writer)
+		{
+			// Write start marker & version
+			writer.Write(MetaStartMarker);
+			writer.Write(MetaVersion);
+
+			// Write data
+			var dataLength = 0;
+			{
+				// Write lobby info data
+				writer.Flush();
+				dataLength += writer.BaseStream.WriteString(Encoding.UTF8, GameInfo.Serialize());
+			}
+
+			// Write total length & end marker
+			writer.Write(dataLength);
+			writer.Write(MetaEndMarker);
+		}
+
+		public void RenameFile(string newFilenameWithoutExtension)
+		{
+			var newPath = Path.Combine(Path.GetDirectoryName(FilePath), newFilenameWithoutExtension) + ".rep";
+			File.Move(FilePath, newPath);
+			FilePath = newPath;
+		}
+
+		public static ReplayMetadata Read(string path)
+		{
+			using (var fs = new FileStream(path, FileMode.Open))
+				return Read(fs, path);
+		}
+
+		static ReplayMetadata Read(FileStream fs, string path)
+		{
+			if (!fs.CanSeek)
+				return null;
+
+			if (fs.Length < 20)
+				return null;
+
+			try
+			{
+				fs.Seek(-(4 + 4), SeekOrigin.End);
+				var dataLength = fs.ReadInt32();
+				if (fs.ReadInt32() == MetaEndMarker)
+				{
+					// go back by (end marker + length storage + data + version + start marker) bytes
+					fs.Seek(-(4 + 4 + dataLength + 4 + 4), SeekOrigin.Current);
+					try
+					{
+						return new ReplayMetadata(fs, path);
+					}
+					catch (InvalidOperationException ex)
+					{
+						Log.Write("debug", ex.ToString());
+					}
+					catch (NotSupportedException ex)
+					{
+						Log.Write("debug", ex.ToString());
+					}
+				}
+			}
+			catch (IOException ex)
+			{
+				Log.Write("debug", ex.ToString());
+			}
+
+			return null;
+		}
+	}
+}

OpenRA.Game/FileFormats/ShpD2Reader.cs

@@ -0,0 +1,113 @@
+#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.IO;
+using OpenRA.Graphics;
+
+namespace OpenRA.FileFormats
+{
+	public class ShpD2Reader : ISpriteSource
+	{
+		[Flags] enum FormatFlags : int
+		{
+			PaletteTable = 1,
+			SkipFormat80 = 2,
+			VariableLengthTable = 4
+		}
+
+		class Frame : ISpriteFrame
+		{
+			public Size Size { get; private set; }
+			public Size FrameSize { get { return Size; } }
+			public float2 Offset { get { return float2.Zero; } }
+			public byte[] Data { get; set; }
+
+			public Frame(Stream s)
+			{
+				var flags = (FormatFlags)s.ReadUInt16();
+				s.Position += 1;
+				var width = s.ReadUInt16();
+				var height = s.ReadUInt8();
+				Size = new Size(width, height);
+
+				// Subtract header size
+				var dataLeft = s.ReadUInt16() - 10;
+				var dataSize = s.ReadUInt16();
+
+				byte[] table;
+				if ((flags & FormatFlags.PaletteTable) != 0)
+				{
+					var n = (flags & FormatFlags.VariableLengthTable) != 0 ? s.ReadUInt8() : (byte)16;
+					table = new byte[n];
+					for (var i = 0; i < n; i++)
+						table[i] = s.ReadUInt8();
+
+					dataLeft -= n;
+				}
+				else
+				{
+					table = new byte[256];
+					for (var i = 0; i < 256; i++)
+						table[i] = (byte)i;
+					table[1] = 0x7f;
+					table[2] = 0x7e;
+					table[3] = 0x7d;
+					table[4] = 0x7c;
+				}
+
+				Data = new byte[width * height];
+
+				// Decode image data
+				var compressed = s.ReadBytes(dataLeft);
+				if ((flags & FormatFlags.SkipFormat80) == 0)
+				{
+					var temp = new byte[dataSize];
+					Format80.DecodeInto(compressed, temp);
+					compressed = temp;
+				}
+
+				Format2.DecodeInto(compressed, Data, 0);
+
+				// Lookup values in lookup table
+				for (var j = 0; j < Data.Length; j++)
+					Data[j] = table[Data[j]];
+			}
+		}
+
+		public IReadOnlyList<ISpriteFrame> Frames { get; private set; }
+		public bool CacheWhenLoadingTileset { get { return false; } }
+
+		public ShpD2Reader(Stream s)
+		{
+			var imageCount = s.ReadUInt16();
+
+			// Last offset is pointer to end of file.
+			var offsets = new uint[imageCount + 1];
+			var temp = s.ReadUInt32();
+
+			// If fourth byte in file is non-zero, the offsets are two bytes each.
+			var twoByteOffset = (temp & 0xFF0000) > 0;
+			s.Position = 2;
+
+			for (var i = 0; i < imageCount + 1; i++)
+				offsets[i] = (twoByteOffset ? s.ReadUInt16() : s.ReadUInt32()) + 2;
+
+			var frames = new Frame[imageCount];
+			Frames = frames.AsReadOnly();
+			for (var i = 0; i < frames.Length; i++)
+			{
+				s.Position = offsets[i];
+				frames[i] = new Frame(s);
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/ShpReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -8,62 +8,67 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using OpenRA.Graphics;
 
 namespace OpenRA.FileFormats
 {
-	enum Format { Format20 = 0x20, Format40 = 0x40, Format80 = 0x80 }
-
-	class ImageHeader : ISpriteFrame
-	{
-		public Size Size { get { return reader.Size; } }
-		public Size FrameSize { get { return reader.Size; } }
-		public float2 Offset { get { return float2.Zero; } }
-		public byte[] Data { get; set; }
-
-		public uint FileOffset;
-		public Format Format;
-
-		public uint RefOffset;
-		public Format RefFormat;
-		public ImageHeader RefImage;
-
-		ShpReader reader;
-		// Used by ShpWriter
-		public ImageHeader() { }
-
-		public ImageHeader(Stream stream, ShpReader reader)
-		{
-			this.reader = reader;
-			var data = stream.ReadUInt32();
-			FileOffset = data & 0xffffff;
-			Format = (Format)(data >> 24);
-
-			RefOffset = stream.ReadUInt16();
-			RefFormat = (Format)stream.ReadUInt16();
-		}
-
-		public void WriteTo(BinaryWriter writer)
-		{
-			writer.Write(FileOffset | ((uint)Format << 24));
-			writer.Write((ushort)RefOffset);
-			writer.Write((ushort)RefFormat);
-		}
-	}
-
 	public class ShpReader : ISpriteSource
 	{
-		readonly List<ImageHeader> headers = new List<ImageHeader>();
-		public IEnumerable<ISpriteFrame> Frames { get { return headers.Cast<ISpriteFrame>(); } }
+		enum Format { Format20 = 0x20, Format40 = 0x40, Format80 = 0x80 }
+
+		class ImageHeader : ISpriteFrame
+		{
+			public Size Size { get { return reader.Size; } }
+			public Size FrameSize { get { return reader.Size; } }
+			public float2 Offset { get { return float2.Zero; } }
+			public byte[] Data { get; set; }
+
+			public uint FileOffset;
+			public Format Format;
+
+			public uint RefOffset;
+			public Format RefFormat;
+			public ImageHeader RefImage;
+
+			ShpReader reader;
+
+			// Used by ShpWriter
+			public ImageHeader() { }
+
+			public ImageHeader(Stream stream, ShpReader reader)
+			{
+				this.reader = reader;
+				var data = stream.ReadUInt32();
+				FileOffset = data & 0xffffff;
+				Format = (Format)(data >> 24);
+
+				RefOffset = stream.ReadUInt16();
+				RefFormat = (Format)stream.ReadUInt16();
+			}
+
+			public void WriteTo(BinaryWriter writer)
+			{
+				writer.Write(FileOffset | ((uint)Format << 24));
+				writer.Write((ushort)RefOffset);
+				writer.Write((ushort)RefFormat);
+			}
+		}
+
+		public IReadOnlyList<ISpriteFrame> Frames { get; private set; }
 		public bool CacheWhenLoadingTileset { get { return false; } }
 		public readonly Size Size;
 
 		int recurseDepth = 0;
 		readonly int imageCount;
 
+		readonly long shpBytesFileOffset;
+		readonly byte[] shpBytes;
+
 		public ShpReader(Stream stream)
 		{
 			imageCount = stream.ReadUInt16();
@@ -73,8 +78,10 @@ namespace OpenRA.FileFormats
 			Size = new Size(width, height);
 
 			stream.Position += 4;
-			for (var i = 0; i < imageCount; i++)
-				headers.Add(new ImageHeader(stream, this));
+			var headers = new ImageHeader[imageCount];
+			Frames = headers.AsReadOnly();
+			for (var i = 0; i < headers.Length; i++)
+				headers[i] = new ImageHeader(stream, this);
 
 			// Skip eof and zero headers
 			stream.Position += 16;
@@ -85,28 +92,18 @@ namespace OpenRA.FileFormats
 				var h = headers[i];
 				if (h.Format == Format.Format20)
 					h.RefImage = headers[i - 1];
-
 				else if (h.Format == Format.Format40 && !offsets.TryGetValue(h.RefOffset, out h.RefImage))
 					throw new InvalidDataException("Reference doesnt point to image data {0}->{1}".F(h.FileOffset, h.RefOffset));
 			}
 
+			shpBytesFileOffset = stream.Position;
+			shpBytes = stream.ReadBytes((int)(stream.Length - stream.Position));
+
 			foreach (var h in headers)
-				Decompress(stream, h);
+				Decompress(h);
 		}
 
-		static byte[] ReadCompressedData(Stream stream, ImageHeader h)
-		{
-			stream.Position = h.FileOffset;
-
-			// Actually, far too big. There's no length field with the correct length though :(
-			var compressedLength = (int)(stream.Length - stream.Position);
-			var compressedBytes = new byte[compressedLength];
-			stream.Read(compressedBytes, 0, compressedLength);
-
-			return compressedBytes;
-		}
-
-		void Decompress(Stream stream, ImageHeader h)
+		void Decompress(ImageHeader h)
 		{
 			// No extra work is required for empty frames
 			if (h.Size.Width == 0 || h.Size.Height == 0)
@@ -123,19 +120,19 @@ namespace OpenRA.FileFormats
 					if (h.RefImage.Data == null)
 					{
 						++recurseDepth;
-						Decompress(stream, h.RefImage);
+						Decompress(h.RefImage);
 						--recurseDepth;
 					}
 
 					h.Data = CopyImageData(h.RefImage.Data);
-					Format40.DecodeInto(ReadCompressedData(stream, h), h.Data);
+					Format40.DecodeInto(shpBytes, h.Data, (int)(h.FileOffset - shpBytesFileOffset));
 					break;
 				}
 
 				case Format.Format80:
 				{
 					var imageBytes = new byte[Size.Width * Size.Height];
-					Format80.DecodeInto(ReadCompressedData(stream, h), imageBytes);
+					Format80.DecodeInto(shpBytes, imageBytes, (int)(h.FileOffset - shpBytesFileOffset));
 					h.Data = imageBytes;
 					break;
 				}
@@ -148,9 +145,7 @@ namespace OpenRA.FileFormats
 		byte[] CopyImageData(byte[] baseImage)
 		{
 			var imageData = new byte[Size.Width * Size.Height];
-			for (var i = 0; i < Size.Width * Size.Height; i++)
-				imageData[i] = baseImage[i];
-
+			Array.Copy(baseImage, imageData, imageData.Length);
 			return imageData;
 		}
 

OpenRA.Game/FileFormats/ShpTSReader.cs

@@ -0,0 +1,103 @@
+#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.IO;
+using OpenRA.Graphics;
+
+namespace OpenRA.FileFormats
+{
+	public class ShpTSReader : ISpriteSource
+	{
+		class FrameHeader : ISpriteFrame
+		{
+			public Size Size { get; private set; }
+			public Size FrameSize { get; private set; }
+			public float2 Offset { get; private set; }
+			public byte[] Data { get; set; }
+
+			public readonly uint FileOffset;
+			public readonly byte Format;
+
+			public FrameHeader(Stream stream, Size frameSize)
+			{
+				var x = stream.ReadUInt16();
+				var y = stream.ReadUInt16();
+				var width = stream.ReadUInt16();
+				var height = stream.ReadUInt16();
+
+				// Note: the mixed Integer / fp division is intentional, and required for calculating the correct offset.
+				Offset = new float2(x + width / 2 - 0.5f * frameSize.Width, y + height / 2 - 0.5f * frameSize.Height);
+				Size = new Size(width, height);
+				FrameSize = frameSize;
+
+				Format = stream.ReadUInt8();
+				stream.Position += 11;
+				FileOffset = stream.ReadUInt32();
+			}
+		}
+
+		public IReadOnlyList<ISpriteFrame> Frames { get; private set; }
+		public bool CacheWhenLoadingTileset { get { return false; } }
+
+		public ShpTSReader(Stream stream)
+		{
+			stream.ReadUInt16();
+			var width = stream.ReadUInt16();
+			var height = stream.ReadUInt16();
+			var size = new Size(width, height);
+			var frameCount = stream.ReadUInt16();
+
+			var frames = new FrameHeader[frameCount];
+			Frames = frames.AsReadOnly();
+			for (var i = 0; i < frames.Length; i++)
+				frames[i] = new FrameHeader(stream, size);
+
+			for (var i = 0; i < frameCount; i++)
+			{
+				var f = frames[i];
+				if (f.FileOffset == 0)
+					continue;
+
+				stream.Position = f.FileOffset;
+
+				var frameSize = f.Size.Width * f.Size.Height;
+
+				// Uncompressed
+				if (f.Format == 1 || f.Format == 0)
+					f.Data = stream.ReadBytes(frameSize);
+
+				// Uncompressed scanlines
+				else if (f.Format == 2)
+				{
+					f.Data = new byte[frameSize];
+					for (var j = 0; j < f.Size.Height; j++)
+					{
+						var length = stream.ReadUInt16() - 2;
+						var offset = f.Size.Width * j;
+						stream.ReadBytes(f.Data, offset, length);
+					}
+				}
+
+				// RLE-zero compressed scanlines
+				else if (f.Format == 3)
+				{
+					f.Data = new byte[frameSize];
+					for (var j = 0; j < f.Size.Height; j++)
+					{
+						var length = stream.ReadUInt16() - 2;
+						var offset = f.Size.Width * j;
+						Format2.DecodeInto(stream.ReadBytes(length), f.Data, offset);
+					}
+				}
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/TmpRAReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -8,17 +8,15 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
+using OpenRA.Graphics;
 
 namespace OpenRA.FileFormats
 {
 	public class TmpRAReader : ISpriteSource
 	{
-		readonly List<TmpTile> tiles = new List<TmpTile>();
-		public IEnumerable<ISpriteFrame> Frames { get { return tiles.Cast<ISpriteFrame>(); } }
+		public IReadOnlyList<ISpriteFrame> Frames { get; private set; }
 		public bool CacheWhenLoadingTileset { get { return false; } }
 
 		public TmpRAReader(Stream s)
@@ -35,15 +33,19 @@ namespace OpenRA.FileFormats
 			var indexStart = s.ReadInt32();
 
 			s.Position = indexStart;
-			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
+			var count = indexEnd - indexStart;
+			var tiles = new TmpTile[count];
+			Frames = tiles.AsReadOnly();
+			var tilesIndex = 0;
+			foreach (var b in s.ReadBytes(count))
 			{
 				if (b != 255)
 				{
 					s.Position = imgStart + b * width * height;
-					tiles.Add(new TmpTile(s.ReadBytes(width * height), size));
+					tiles[tilesIndex++] = new TmpTile(s.ReadBytes(width * height), size);
 				}
 				else
-					tiles.Add(new TmpTile(null, size));
+					tiles[tilesIndex++] = new TmpTile(null, size);
 			}
 		}
 	}

OpenRA.Game/FileFormats/TmpTDReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -8,10 +8,9 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using System.IO;
+using OpenRA.Graphics;
 
 namespace OpenRA.FileFormats
 {
@@ -36,8 +35,7 @@ namespace OpenRA.FileFormats
 
 	public class TmpTDReader : ISpriteSource
 	{
-		readonly List<TmpTile> tiles = new List<TmpTile>();
-		public IEnumerable<ISpriteFrame> Frames { get { return tiles.Cast<ISpriteFrame>(); } }
+		public IReadOnlyList<ISpriteFrame> Frames { get; private set; }
 		public bool CacheWhenLoadingTileset { get { return false; } }
 
 		public TmpTDReader(Stream s)
@@ -53,15 +51,19 @@ namespace OpenRA.FileFormats
 			var indexStart = s.ReadInt32();
 
 			s.Position = indexStart;
-			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
+			var count = indexEnd - indexStart;
+			var tiles = new TmpTile[count];
+			Frames = tiles.AsReadOnly();
+			var tilesIndex = 0;
+			foreach (var b in s.ReadBytes(count))
 			{
 				if (b != 255)
 				{
 					s.Position = imgStart + b * width * height;
-					tiles.Add(new TmpTile(s.ReadBytes(width * height), size));
+					tiles[tilesIndex++] = new TmpTile(s.ReadBytes(width * height), size);
 				}
 				else
-					tiles.Add(new TmpTile(null, size));
+					tiles[tilesIndex++] = new TmpTile(null, size);
 			}
 		}
 	}

OpenRA.Game/FileFormats/TmpTSReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -8,11 +8,10 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
+using OpenRA.Graphics;
 
 namespace OpenRA.FileFormats
 {
@@ -40,7 +39,7 @@ namespace OpenRA.FileFormats
 				for (var j = 0; j < width; j++)
 					Data[start + j] = s.ReadUInt8();
 
-				width += (i < size.Height / 2 - 1? 1 : -1) * 4;
+				width += (i < size.Height / 2 - 1 ? 1 : -1) * 4;
 			}
 
 			// Ignore Z-data for now
@@ -50,8 +49,7 @@ namespace OpenRA.FileFormats
 
 	public class TmpTSReader : ISpriteSource
 	{
-		readonly List<TmpTSTile> tiles = new List<TmpTSTile>();
-		public IEnumerable<ISpriteFrame> Frames { get { return tiles.Cast<ISpriteFrame>(); } }
+		public IReadOnlyList<ISpriteFrame> Frames { get; private set; }
 		public bool CacheWhenLoadingTileset { get { return false; } }
 
 		public TmpTSReader(Stream s)
@@ -65,11 +63,14 @@ namespace OpenRA.FileFormats
 			for (var i = 0; i < offsets.Length; i++)
 				offsets[i] = s.ReadUInt32();
 
+			var tiles = new List<TmpTSTile>();
 			for (var i = 0; i < offsets.Length; i++)
 			{
 				s.Position = offsets[i];
 				tiles.Add(new TmpTSTile(s, size));
 			}
+
+			Frames = tiles.ToArray().AsReadOnly();
 		}
 	}
 }

OpenRA.Game/FileFormats/VqaReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -101,7 +101,7 @@ namespace OpenRA.FileFormats
 
 			// Frame offsets
 			offsets = new UInt32[Frames];
-			for (int i = 0; i < Frames; i++)
+			for (var i = 0; i < Frames; i++)
 			{
 				offsets[i] = stream.ReadUInt32();
 				if (offsets[i] > 0x40000000)
@@ -125,7 +125,7 @@ namespace OpenRA.FileFormats
 			var ms = new MemoryStream();
 			var adpcmIndex = 0;
 
-			bool compressed = false;
+			var compressed = false;
 			for (var i = 0; i < Frames; i++)
 			{
 				stream.Seek(offsets[i], SeekOrigin.Begin);
@@ -201,7 +201,7 @@ namespace OpenRA.FileFormats
 				// Chunks are aligned on even bytes; may be padded with a single null
 				if (s.Peek() == 0) s.ReadByte();
 				var type = s.ReadASCII(4);
-				int subchunkLength = (int)int2.Swap(s.ReadUInt32());
+				var subchunkLength = (int)int2.Swap(s.ReadUInt32());
 
 				switch(type)
 				{
@@ -235,11 +235,11 @@ namespace OpenRA.FileFormats
 
 					// Palette
 					case "CPL0":
-						for (int i = 0; i < numColors; i++)
+						for (var i = 0; i < numColors; i++)
 						{
-							byte r = (byte)(s.ReadUInt8() << 2);
-							byte g = (byte)(s.ReadUInt8() << 2);
-							byte b = (byte)(s.ReadUInt8() << 2);
+							var r = (byte)(s.ReadUInt8() << 2);
+							var g = (byte)(s.ReadUInt8() << 2);
+							var b = (byte)(s.ReadUInt8() << 2);
 							palette[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 						}
 					break;
@@ -257,7 +257,7 @@ namespace OpenRA.FileFormats
 
 		int cachedFrame = -1;
 
-		void DecodeFrameData( int frame )
+		void DecodeFrameData()
 		{
 			cachedFrame = currentFrame;
 			for (var y = 0; y < blocks.Y; y++)
@@ -269,7 +269,7 @@ namespace OpenRA.FileFormats
 						for (var i = 0; i < blockWidth; i++)
 						{
 							var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
-							byte color = (mod == 0x0f) ? px : cbf[cbfi];
+							var color = (mod == 0x0f) ? px : cbf[cbfi];
 							frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
 						}
 				}
@@ -280,7 +280,7 @@ namespace OpenRA.FileFormats
 			get
 			{
 				if (cachedFrame != currentFrame)
-					DecodeFrameData(currentFrame);
+					DecodeFrameData();
 
 				return frameData;
 			}

OpenRA.Game/FileFormats/VxlReader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -40,7 +40,7 @@ namespace OpenRA.FileFormats
 
 		uint BodySize;
 
-		void ReadVoxelData(Stream s, VxlLimb l)
+		static void ReadVoxelData(Stream s, VxlLimb l)
 		{
 			var baseSize = l.Size[0]*l.Size[1];
 			var colStart = new int[baseSize];
@@ -79,8 +79,8 @@ namespace OpenRA.FileFormats
 
 				s.Seek(dataStart + colStart[i], SeekOrigin.Begin);
 
-				byte x = (byte)(i % l.Size[0]);
-				byte y = (byte)(i / l.Size[0]);
+				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>();
 				do

OpenRA.Game/FileFormats/WavLoader.cs

@@ -0,0 +1,178 @@
+#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;
+
+namespace OpenRA.FileFormats
+{
+	public class WavLoader
+	{
+		public readonly int FileSize;
+		public readonly string Format;
+
+		public readonly int FmtChunkSize;
+		public readonly int AudioFormat;
+		public readonly int Channels;
+		public readonly int SampleRate;
+		public readonly int ByteRate;
+		public readonly int BlockAlign;
+		public readonly int BitsPerSample;
+
+		public readonly int UncompressedSize;
+		public readonly int DataSize;
+		public readonly byte[] RawOutput;
+
+		public enum WaveType { Pcm = 0x1, ImaAdpcm = 0x11 };
+		public static WaveType Type { get; private set; }
+		
+		public WavLoader(Stream s)
+		{
+			while (s.Position < s.Length)
+			{
+				if ((s.Position & 1) == 1)
+					s.ReadByte(); // Alignment
+
+				var type = s.ReadASCII(4);
+				switch (type)
+				{
+					case "RIFF":
+						FileSize = s.ReadInt32();
+						Format = s.ReadASCII(4);
+						if (Format != "WAVE")
+							throw new NotSupportedException("Not a canonical WAVE file.");
+						break;
+					case "fmt ":
+						FmtChunkSize = s.ReadInt32();
+						AudioFormat = s.ReadInt16();
+						Type = (WaveType)AudioFormat;
+						if (Type != WaveType.Pcm && Type != WaveType.ImaAdpcm)
+							throw new NotSupportedException("Compression type is not supported.");
+						Channels = s.ReadInt16();
+						SampleRate = s.ReadInt32();
+						ByteRate = s.ReadInt32();
+						BlockAlign = s.ReadInt16();
+						BitsPerSample = s.ReadInt16();
+
+						s.ReadBytes(FmtChunkSize - 16);
+						break;
+					case "fact":
+						{
+							var chunkSize = s.ReadInt32();
+							UncompressedSize = s.ReadInt32();
+							s.ReadBytes(chunkSize - 4);
+						}
+						break;
+					case "data":
+						DataSize = s.ReadInt32();
+						RawOutput = s.ReadBytes(DataSize);
+						break;
+					default:
+						// Ignore unknown chunks
+						{
+							var chunkSize = s.ReadInt32();
+							s.ReadBytes(chunkSize);
+						}
+						break;
+				}
+			}
+
+			if (Type == WaveType.ImaAdpcm)
+			{
+				RawOutput = DecodeImaAdpcmData();
+				BitsPerSample = 16;
+			}
+		}
+		
+		public static float WaveLength(Stream s)
+		{
+			s.Position = 12;
+			var fmt = s.ReadASCII(4);
+
+			if (fmt != "fmt ")
+				return 0;
+
+			s.Position = 22;
+			var channels = s.ReadInt16();
+			var sampleRate = s.ReadInt32();
+
+			s.Position = 34;
+			var bitsPerSample = s.ReadInt16();
+			var length = s.Length * 8;
+
+			return length / (channels * sampleRate * bitsPerSample);
+		}
+
+		public byte[] DecodeImaAdpcmData()
+		{
+			var s = new MemoryStream(RawOutput);
+
+			var numBlocks = DataSize / BlockAlign;
+			var blockDataSize = BlockAlign - (Channels * 4);
+			var outputSize = UncompressedSize * Channels * 2;
+
+			var outOffset = 0;
+			var output = new byte[outputSize];
+
+			var predictor = new int[Channels];
+			var index = new int[Channels];
+
+			// 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 
+				for (var c = 0; c < Channels; c++)
+				{
+					predictor[c] = s.ReadInt16();
+					index[c] = s.ReadUInt8();
+					/* unknown/reserved */ s.ReadUInt8();
+
+					// Output first sample from input
+					output[outOffset++] = (byte)predictor[c];
+					output[outOffset++] = (byte)(predictor[c] >> 8);
+
+					if (outOffset >= outputSize)
+						return output;
+				}
+
+				// Decode and output remaining data in this block
+				var blockOffset = 0;
+				while (blockOffset < blockDataSize)
+				{
+					for (var c = 0; c < Channels; c++)
+					{
+						// Decode 4 bytes (to 16 bytes of output) per channel
+						var chunk = s.ReadBytes(4);
+						var decoded = ImaAdpcmLoader.LoadImaAdpcmSound(chunk, ref index[c], ref predictor[c]);
+
+						// Interleave output, one sample per channel
+						var outOffsetChannel = outOffset + (2 * c);
+						for (var i = 0; i < decoded.Length; i += 2)
+						{
+							var outOffsetSample = outOffsetChannel + i;
+							if (outOffsetSample >= outputSize)
+								return output;
+
+							output[outOffsetSample] = decoded[i];
+							output[outOffsetSample + 1] = decoded[i + 1];
+							outOffsetChannel += 2 * (Channels - 1);
+						}
+
+						blockOffset += 4;
+					}
+
+					outOffset += 16 * Channels;
+				}
+			}
+
+			return output;
+		}
+	}
+}

OpenRA.Game/FileFormats/XccGlobalDatabase.cs

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

OpenRA.Game/FileFormats/XccLocalDatabase.cs

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

OpenRA.Game/FileSystem/BigFile.cs

@@ -0,0 +1,111 @@
+#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.IO;
+using System.Linq;
+
+namespace OpenRA.FileSystem
+{
+	public class BigFile : IFolder
+	{
+		public string Name { get; private set; }
+		public int Priority { get; private set; }
+		readonly Dictionary<string, Entry> entries = new Dictionary<string, Entry>();
+
+		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++)
+			{
+				var entry = new Entry(s);
+				entries.Add(entry.Path, entry);
+			}
+		}
+
+		class Entry
+		{
+			readonly Stream s;
+			readonly uint offset;
+			readonly uint size;
+			public readonly string Path;
+
+			public Entry(Stream s)
+			{
+				this.s = s;
+
+				offset = s.ReadUInt32();
+				size = s.ReadUInt32();
+				if (BitConverter.IsLittleEndian)
+				{
+					offset = int2.Swap(offset);
+					size = int2.Swap(size);
+				}
+
+				Path = s.ReadASCIIZ();
+			}
+
+			public Stream GetData()
+			{
+				s.Position = offset;
+				return new MemoryStream(s.ReadBytes((int)size));
+			}
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return entries[filename].GetData();
+		}
+
+		public bool Exists(string filename)
+		{
+			return entries.ContainsKey(filename);
+		}
+
+		public IEnumerable<uint> ClassicHashes()
+		{
+			return entries.Keys.Select(filename => PackageEntry.HashFilename(filename, PackageHashType.Classic));
+		}
+
+		public IEnumerable<uint> CrcHashes()
+		{
+			return Enumerable.Empty<uint>();
+		}
+
+		public IEnumerable<string> AllFileNames()
+		{
+			return entries.Keys;
+		}
+
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}