Merge pull request #5512 from Mailaender/d2k-repair-indicator-offset

Fixed the Dune 2000 repair indicator offset

.gitignore

@@ -14,11 +14,14 @@ _ReSharper.*/
 
 # binaries
 mods/*/*.dll
+mods/*/*.mdb
 /*.dll
 /*.dll.config
-*.pdb
-*.mdb
-*.exe
+/*.so
+/*.dylib
+/*.pdb
+/*.mdb
+/*.exe
 
 # backup files by various editors
 *~
@@ -47,12 +50,9 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
 OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 *.resources
 
-# KDE
-*.kate-swp
-*.directory
-
 # auto-generated documentation
 DOCUMENTATION.md
+Lua-API.md
 *.html
 
 # StyleCop

.travis.yml

@@ -6,19 +6,21 @@ 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 install mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6 dpkg rpm nsis markdown
+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.
+# Only watch the development and release branches.
 branches:
  only:
+   - master
+   - next
    - bleed
 
 # Notify developers when build passed/failed.
@@ -30,3 +32,20 @@ notifications:
       - "irc.freenode.net#openra"
     use_notice: true
     skip_join: true
+
+before_deploy: cd packaging && mkdir build && ./package-all.sh $TRAVIS_TAG build
+deploy:
+  provider: releases
+  api_key:
+    secure: XBjG29ypu7Ay+ISR7AIf5Uclm+1ZVvfc472Exr7GTP0qoE67k7ItXeoLsqMYgY6nxfWfAzOZHUTqfFpVD78/wZp6Z2LsLZazGAk4vVNf6SunZGn1GsyDSTE82mj9HYFg5QaNLOiVEjeSswx9WZQkhiVuo40JIZCSZq+KaxzPRFw=
+  file:
+    - packaging/build/OpenRA-$TRAVIS_TAG.exe
+    - packaging/build/OpenRA-$TRAVIS_TAG.zip
+    - packaging/build/openra-$TRAVIS_TAG-1-any.pkg.tar.xz
+    - packaging/build/openra-$TRAVIS_TAG-1-noarch.rpm
+    - packaging/build/openra_$TRAVIS_TAG_all.deb
+  skip_cleanup: true
+  on:
+    all_branches: true
+    tags: true
+    repo: OpenRA/OpenRA

AUTHORS

@@ -34,13 +34,14 @@ Also thanks to:
     * Erasmus Schroder (rasco)
     * Fahrradkette
     * Frank Razenberg (zzattack)
+    * Gareth Needham (Ripley`)
     * Igor Popov (ihptru)
     * Iran
     * James Dunne (jsd)
     * Jeff Harris (jeff_1amstudios)
     * Jes
     * Joakim Lindberg (booom3)
-    * JOo
+    * Kanar
     * Kenny Hoxworth (hoxworth)
     * Krishnakanth Mallik
     * Kyrre Soerensen (zypres)
@@ -49,26 +50,75 @@ Also thanks to:
     * Maarten Meuris (Nyerguds)
     * Mark Olson (markolson)
     * Matthew Gatland (mgatland)
+    * Matthew Uzzell (MUzzell)
     * Max621
     * Max Ugrumov (katzsmile)
     * 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)
+    * Simon Verbeke (Saticmotion)
+    * Taryn Hill (Phrohdoh)
+    * Teemu Nieminen (Temeez)
     * Tim Mylemans (gecko)
     * Tirili
     * Tristan Keating (Kilkakon)
+    * Tristan Mühlbacher (MicroBit)
     * Vladimir Komarov (VrKomarov)
     * Wuschel
+    * Ian T. Jacobsen (Smilex)
 
-Using GeoLite data created by MaxMind and
+Using Simple DirectMedia Layer distributed under
+the terms of the zlib license.
+
+Using FreeType distributed under the terms of the
+FreeType License.
+
+Using OpenAL Soft distributed under the GNU LGPL.
+
+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
+maintained by Vinicius Jarina and distributed
+under the MIT license.
+
+Using NLua created by Vinicius Jarina and
+distributed under the MIT license.
+
+Using SharpFont created by Robert Rouhani 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.
+
+Using FuzzyLogicLibrary (fuzzynet) by Dmitry
+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 initially by Mike
+Krueger and distributed under the GNU GPL terms.
+
+
 Finally, special thanks goes to the original teams
 at Westwood Studios and EA for creating the classic
 games which OpenRA aims to reimagine.

CONTRIBUTING.md

@@ -16,4 +16,6 @@ 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).
 
+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.

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,63 +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;
-
-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,106 +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;
-
-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,67 +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;
-
-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,53 +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;
-
-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,76 +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.Mods=ra` for Red Alert
-or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
-
-Debian/Ubuntu
--------------
-
-* mono-gmcs
-* 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,64 @@
+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)
+
+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. You
+can then run from the `openra` shortcut.
+
+Debian/Ubuntu
+-------------
+
+* mono-dmcs
+* libmono-winforms4.0-cil
+* cli-common-dev (>= 2.10)
+* freetype
+* openal
+
+Slackware
+---------
+
+The following packages from slackbuilds.org are required, on 13.37 32-bit:
+* libgdiplus
+* mono
+* openAL
+
+openSUSE
+--------
+
+* mono-devel
+* openal
+* freetype2
+* SDL2
+
+Gentoo
+------
+
+* dev-lang/mono
+* dev-dotnet/libgdiplus
+* media-libs/openal

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,13 +48,17 @@ prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
 datadir ?= $(datarootdir)
 bindir ?= $(prefix)/bin
+libdir ?= $(prefix)/lib
+gameinstalldir ?= $(libdir)/openra
+
 BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
-DATA_INSTALL_DIR = $(DESTDIR)$(datadir)/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
@@ -63,8 +67,8 @@ INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
-CORE = fileformats rcg rgl rsdl 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`)
 
@@ -73,126 +77,91 @@ 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_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
-PROGRAMS 			+= game
+game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
+game_TARGET = OpenRA.Game.exe
+game_KIND = winexe
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/SDL2-CS.dll thirdparty/SharpFont.dll
+game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
+PROGRAMS += game
 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_LIBS			= $(COMMON_LIBS) $(irc_DEPS)
-PROGRAMS			+= irc
+irc_SRCS := $(shell find OpenRA.Irc/ -iname '*.cs')
+irc_TARGET = OpenRA.Irc.dll
+irc_KIND = library
+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)
-
-rnull_SRCS			:= $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
-rnull_TARGET		= OpenRA.Renderer.Null.dll
-rnull_KIND			= library
-rnull_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-rnull_LIBS			= $(COMMON_LIBS) $(rnull_DEPS)
-PROGRAMS 			+= rcg rgl rsdl2 rnull rsdl
-renderers: $(rcg_TARGET) $(rgl_TARGET) $(rsdl2_TARGET) $(rnull_TARGET) $(rsdl_TARGET)
+rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
+rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
+rsdl2_KIND = library
+rsdl2_DEPS = $(game_TARGET)
+rsdl2_LIBS = $(COMMON_LIBS) thirdparty/SDL2-CS.dll $(rsdl2_DEPS)
 
+rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
+rnull_TARGET = OpenRA.Renderer.Null.dll
+rnull_KIND = library
+rnull_DEPS = $(game_TARGET)
+rnull_LIBS = $(COMMON_LIBS) $(rnull_DEPS)
+PROGRAMS += rsdl2 rnull
+renderers: $(rsdl2_TARGET) $(rnull_TARGET)
 
 ##### Official Mods #####
 
-STD_MOD_LIBS	= $(fileformats_TARGET) $(game_TARGET)
+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) $(utility_TARGET) $(geoip_TARGET) $(irc_TARGET)
-mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS) $(utility_TARGET) $(geoip_TARGET) $(irc_TARGET)
-PROGRAMS 			+= mod_ra
+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) $(irc_TARGET)
+mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(irc_TARGET)
+PROGRAMS += mod_ra
 mod_ra: $(mod_ra_TARGET)
 
 # Command and Conquer
-mod_cnc_SRCS		:= $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-mod_cnc_TARGET		= mods/cnc/OpenRA.Mods.Cnc.dll
-mod_cnc_KIND		= library
-mod_cnc_DEPS		= $(STD_MOD_DEPS) $(mod_ra_TARGET)
-mod_cnc_LIBS		= $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
-PROGRAMS 		+= mod_cnc
+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)
+PROGRAMS += mod_cnc
 mod_cnc: $(mod_cnc_TARGET)
 
 # Dune 2000
-mod_d2k_SRCS		:= $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
-mod_d2k_TARGET		= mods/d2k/OpenRA.Mods.D2k.dll
-mod_d2k_KIND		= library
-mod_d2k_DEPS		= $(STD_MOD_DEPS) $(mod_ra_TARGET) $(mod_cnc_TARGET)
-mod_d2k_LIBS		= $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
-PROGRAMS 		+= mod_d2k
+mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
+mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
+mod_d2k_KIND = library
+mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_ra_TARGET) $(mod_cnc_TARGET)
+mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
+PROGRAMS += mod_d2k
 mod_d2k: $(mod_d2k_TARGET)
 
 # Tiberian Sun
-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)
-PROGRAMS 		+= mod_ts
+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)
+PROGRAMS += mod_ts
 mod_ts: $(mod_ts_TARGET)
 
 ##### Tools #####
 
 # Map Editor
-editor_SRCS			:= $(shell find OpenRA.Editor/ -iname '*.cs')
-editor_TARGET			= OpenRA.Editor.exe
-editor_KIND			= winexe
-editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
-editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
-editor_FLAGS		= -win32icon:OpenRA.Editor/OpenRA.Editor.Icon.ico
+editor_SRCS := $(shell find OpenRA.Editor/ -iname '*.cs')
+editor_TARGET = OpenRA.Editor.exe
+editor_KIND = winexe
+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
 
-PROGRAMS 			+= editor
+PROGRAMS += editor
 OpenRA.Editor.MapSelect.resources:
 	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
 OpenRA.Editor.Form1.resources:
@@ -200,32 +169,32 @@ OpenRA.Editor.Form1.resources:
 editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
 
 # Analyses mod yaml for easy to detect errors
-ralint_SRCS			:= $(shell find OpenRA.Lint/ -iname '*.cs')
-ralint_TARGET			= OpenRA.Lint.exe
-ralint_KIND			= exe
-ralint_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-ralint_LIBS			= $(COMMON_LIBS) $(ralint_DEPS)
-PROGRAMS 			+= ralint
+ralint_SRCS := $(shell find OpenRA.Lint/ -iname '*.cs')
+ralint_TARGET = OpenRA.Lint.exe
+ralint_KIND = exe
+ralint_DEPS = $(game_TARGET)
+ralint_LIBS = $(COMMON_LIBS) $(ralint_DEPS)
+PROGRAMS += ralint
 ralint: $(ralint_TARGET)
 
 test:
-	@mono --debug OpenRA.Lint.exe ra
-	@echo "OpenRA.Lint: ra mod yaml checks passed."
-	@mono --debug OpenRA.Lint.exe cnc
-	@echo "OpenRA.Lint: cnc mod yaml checks passed."
-	@mono --debug OpenRA.Lint.exe d2k
-	@echo "OpenRA.Lint: d2k mod yaml checks passed."
-	@mono --debug OpenRA.Lint.exe ts
-	@echo "OpenRA.Lint: ts mod yaml checks passed."
+	@echo "OpenRA.Lint: checking Red Alert mod MiniYAML..."
+	@mono --debug OpenRA.Lint.exe --verbose ra
+	@echo "OpenRA.Lint: checking Tiberian Dawn mod MiniYAML..."
+	@mono --debug OpenRA.Lint.exe --verbose cnc
+	@echo "OpenRA.Lint: checking Dune 2000 mod MiniYAML..."
+	@mono --debug OpenRA.Lint.exe --verbose d2k
+	@echo "OpenRA.Lint: checking Tiberian Sun mod MiniYAML..."
+	@mono --debug OpenRA.Lint.exe --verbose ts
 
 # Builds and exports tilesets from a bitmap
-tsbuild_SRCS		:= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET		= OpenRA.TilesetBuilder.exe
-tsbuild_KIND		= winexe
-tsbuild_DEPS		= $(fileformats_TARGET) $(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
+tsbuild_SRCS := $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_TARGET = OpenRA.TilesetBuilder.exe
+tsbuild_KIND = winexe
+tsbuild_DEPS = $(game_TARGET)
+tsbuild_LIBS = $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
+tsbuild_EXTRA = -resource:OpenRA.TilesetBuilder.FormBuilder.resources -resource:OpenRA.TilesetBuilder.FormNew.resources -resource:OpenRA.TilesetBuilder.Surface.resources
+PROGRAMS += tsbuild
 OpenRA.TilesetBuilder.FormBuilder.resources:
 	resgen2 OpenRA.TilesetBuilder/FormBuilder.resx OpenRA.TilesetBuilder.FormBuilder.resources 1> /dev/null
 OpenRA.TilesetBuilder.FormNew.resources:
@@ -237,13 +206,22 @@ 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
-PROGRAMS 			+= utility
+utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
+utility_TARGET = OpenRA.Utility.exe
+utility_KIND = exe
+utility_DEPS = $(game_TARGET)
+utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll
+PROGRAMS += utility
 utility: $(utility_TARGET)
 
 
@@ -274,28 +252,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
 
-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} ; \
@@ -304,74 +293,83 @@ 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 --lua-docs ra > 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/"
 	@$(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/"
 	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) "$(DATA_INSTALL_DIR)/mods/ra"
 	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
 	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
+	@$(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)"
-	@$(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)"
+	@$(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 'DATADIR="$${ROOTDIR}'"$(datadir)"'"'	>> openra
-	@echo 'cd "$${DATADIR}/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)"
 
-	@echo "#!/bin/sh" 				>  openra-editor
-	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra-editor
-	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' 	>> openra-editor
-	@echo 'DATADIR="$${ROOTDIR}/'"$(datadir)"'"'	>> openra-editor
-	@echo 'cd "$${DATADIR}/openra"'			>> 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-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_DIR) "$(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 'cd "$(gameinstalldir)"' >> openra-editor
+	@echo 'exec mono OpenRA.Editor.exe "$$@"' >> openra-editor
+	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)"
+	@-$(RM) openra-editor
+
 uninstall:
 	@-$(RM_R) "$(DATA_INSTALL_DIR)"
 	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
@@ -405,8 +403,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,50 @@
+<?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|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>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>
+  <ItemGroup>
+    <Content Include="OpenRA.ico" />
+  </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,22 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Media;
+using System.Reflection;
 using System.Windows.Forms;
+using OpenRA;
 
-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 +34,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 +84,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 +96,7 @@ namespace OpenRA
 		{
 			try
 			{
-				Process.Start(Log.LogPath);
+				Process.Start(Platform.SupportDir + "Logs" + Path.DirectorySeparatorChar);
 			}
 			catch { }
 		}
@@ -97,7 +105,7 @@ namespace OpenRA
 		{
 			try
 			{
-				Process.Start(Game.Settings.Debug.FatalErrorDialogFaq);
+				Process.Start(settings.Debug.FatalErrorDialogFaq);
 			}
 			catch { }
 		}

OpenRA.Editor/ActorTemplate.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.GameRules;
 using OpenRA.Traits;
 
 namespace OpenRA.Editor

OpenRA.Editor/ActorTool.cs

@@ -40,7 +40,7 @@ namespace OpenRA.Editor
 			};
 		}
 
-		string NextActorName(Surface surface)
+		static string NextActorName(Surface surface)
 		{
 			var id = 0;
 			for (;;)

OpenRA.Editor/BrushTool.cs

@@ -42,7 +42,7 @@ namespace OpenRA.Editor
 					if (surface.Map.IsInMap(new CVec(u, v) + pos))
 					{
 						var z = u + v * template.Size.X;
-						if (tile[z] != null)
+						if (tile[z].Length > 0)
 							surface.Map.MapTiles.Value[u + pos.X, v + pos.Y] =
 								new TileReference<ushort, byte>
 								{
@@ -63,8 +63,8 @@ namespace OpenRA.Editor
 		public void Preview(Surface surface, SGraphics g)
 		{
 			g.DrawImage(brushTemplate.Bitmap,
-					surface.TileSetRenderer.TileSize.Width * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X,
-			        surface.TileSetRenderer.TileSize.Height * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
+					surface.TileSetRenderer.TileSize * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X,
+			        surface.TileSetRenderer.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
 					brushTemplate.Bitmap.Width * surface.Zoom,
 					brushTemplate.Bitmap.Height * surface.Zoom);
 		}
@@ -88,7 +88,7 @@ namespace OpenRA.Editor
 			while (queue.Count > 0)
 			{
 				var p = queue.Dequeue();
-				if (!s.Map.MapTiles.Value[p.X, p.Y].Equals(replace))
+				if (s.Map.MapTiles.Value[p.X, p.Y].Type != replace.Type)
 					continue;
 
 				var a = FindEdge(s, p, new CVec(-1, 0), replace);
@@ -97,9 +97,9 @@ 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].Equals(replace))
+					if (s.Map.MapTiles.Value[x, p.Y - 1].Type == replace.Type)
 						maybeEnqueue(x, p.Y - 1);
-					if (s.Map.MapTiles.Value[x, p.Y + 1].Equals(replace))
+					if (s.Map.MapTiles.Value[x, p.Y + 1].Type == replace.Type)
 						maybeEnqueue(x, p.Y + 1);
 				}
 			}
@@ -109,13 +109,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, TileReference<ushort, byte> replace)
 		{
 			for (;;)
 			{
 				var q = p + d;
 				if (!s.Map.IsInMap(q)) return p;
-				if (!s.Map.MapTiles.Value[q.X, q.Y].Equals(replace)) return p;
+				if (s.Map.MapTiles.Value[q.X, q.Y].Type != replace.Type) return p;
 				p = q;
 			}
 		}

OpenRA.Editor/Form1.Designer.cs

@@ -85,8 +85,6 @@ namespace OpenRA.Editor
 			this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.redAlertMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.miniMapExport = new System.Windows.Forms.ToolStripMenuItem();
 			this.miniMapToPng = new System.Windows.Forms.ToolStripMenuItem();
 			this.fullMapRenderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -582,7 +580,6 @@ namespace OpenRA.Editor
 			this.saveToolStripMenuItem,
 			this.saveAsToolStripMenuItem,
 			this.toolStripSeparator2,
-			this.toolStripMenuItem1,
 			this.miniMapExport,
 			this.toolStripSeparator3,
 			this.exitToolStripMenuItem});
@@ -639,25 +636,6 @@ namespace OpenRA.Editor
 			this.toolStripSeparator2.Name = "toolStripSeparator2";
 			this.toolStripSeparator2.Size = new System.Drawing.Size(120, 6);
 			// 
-			// toolStripMenuItem1
-			// 
-			this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			this.redAlertMapToolStripMenuItem});
-			this.toolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem1.Image")));
-			this.toolStripMenuItem1.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-			this.toolStripMenuItem1.Size = new System.Drawing.Size(123, 22);
-			this.toolStripMenuItem1.Text = "&Import";
-			// 
-			// cCRedAlertMapToolStripMenuItem
-			// 
-			this.redAlertMapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cCRedAlertMapToolStripMenuItem.Image")));
-			this.redAlertMapToolStripMenuItem.Name = "cCRedAlertMapToolStripMenuItem";
-			this.redAlertMapToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
-			this.redAlertMapToolStripMenuItem.Text = "&Legacy Map Format...";
-			this.redAlertMapToolStripMenuItem.ToolTipText = "Import an original C&C / Red Alert and convert it to the .oramap format.";
-			this.redAlertMapToolStripMenuItem.Click += new System.EventHandler(this.ImportLegacyMapClicked);
-			// 
 			// mnuExport
 			// 
 			this.miniMapExport.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1097,8 +1075,6 @@ namespace OpenRA.Editor
 		private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
-		private System.Windows.Forms.ToolStripMenuItem redAlertMapToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem miniMapExport;
 		private System.Windows.Forms.ToolStripMenuItem miniMapToPng;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;

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,11 +47,11 @@ 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.Mods[0];
-				Text = "{0} Mod Version: {1} - OpenRA Editor".F(Mod.AllMods[mod].Title, Mod.AllMods[mod].Version);			
+				var mod = Game.modData.Manifest.Mod;
+				Text = "{0} Mod Version: {1} - OpenRA Editor".F(mod.Title, mod.Version);
 
 				loadedMapName = null;
 			};
@@ -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,7 +85,7 @@ 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,
@@ -120,7 +121,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 +136,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, new Size(manifest.TileSize, 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 Palette(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 Palette(GlobalFileSystem.Open(playerPalette), shadowIndex);
 
 			surface1.Bind(map, tileset, tilesetRenderer, palette, shadowedPalette);
 
@@ -208,11 +210,11 @@ 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];
+					var info = Program.Rules.Actors[a];
 					if (!info.Traits.Contains<RenderSimpleInfo>()) continue;
 
 					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
@@ -253,7 +255,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 +288,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 +307,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)
@@ -343,6 +345,7 @@ namespace OpenRA.Editor
 				SaveAsClicked(sender, e);
 			else
 			{
+				surface1.Map.RequiresMod = currentMod;
 				surface1.Map.Save(loadedMapName);
 				dirty = false;
 			}
@@ -378,7 +381,7 @@ namespace OpenRA.Editor
 				nms.ButtonOkay.Text = "Open";
 
 				if (DialogResult.OK == nms.ShowDialog())
-					LoadMap(nms.NewText.Tag as string);
+					LoadMap((string)nms.NewText.Tag);
 			}
 		}
 
@@ -387,12 +390,13 @@ 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 map = Map.FromTileset(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);
 					map.ResizeCordon((int)nmd.CordonLeft.Value, (int)nmd.CordonTop.Value,
@@ -400,6 +404,7 @@ namespace OpenRA.Editor
 
 					map.Players.Clear();
 					map.MakeDefaultPlayers();
+					map.FixOpenAreas(Program.Rules);
 
 					NewMap(map);
 				}
@@ -435,37 +440,6 @@ namespace OpenRA.Editor
 			Close();
 		}
 
-		void ImportLegacyMapClicked(object sender, EventArgs e)
-		{
-			using (var ofd = new OpenFileDialog { RestoreDirectory = true,
-				Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
-				if (DialogResult.OK == ofd.ShowDialog())
-				{
-					/* massive hack: we should be able to call NewMap() with the imported Map object,
-					 * but something's not right internally in it, unless loaded via the real maploader */
-
-					var savePath = Path.Combine(Path.GetTempPath(), "OpenRA.Import");
-					Directory.CreateDirectory(savePath);
-
-					var errors = new List<string>();
-
-					var map = LegacyMapImporter.Import(ofd.FileName, a => errors.Add(a));
-
-					if (errors.Count > 0)
-						using (var eld = new ErrorListDialog(errors))
-							eld.ShowDialog();
-
-					map.MakeDefaultPlayers();
-
-					map.Save(savePath);
-					LoadMap(savePath);
-					loadedMapName = null;	/* editor needs to think this hasnt been saved */
-
-					Directory.Delete(savePath, true);
-					MakeDirty();
-				}
-		}
-
 		void OnFormClosing(object sender, FormClosingEventArgs e)
 		{
 			if (!dirty) return;
@@ -513,18 +487,7 @@ namespace OpenRA.Editor
 		void FixOpenAreas(object sender, EventArgs e)
 		{
 			dirty = true;
-			var r = new Random();
-
-			for (var j = surface1.Map.Bounds.Top; j < surface1.Map.Bounds.Bottom; j++)
-				for (var i = surface1.Map.Bounds.Left; i < surface1.Map.Bounds.Right; i++)
-				{
-					var tr = surface1.Map.MapTiles.Value[i, j];
-					if (tr.Type == 0xff || tr.Type == 0xffff || tr.Type == 1 || tr.Type == 2)
-						tr.Index = (byte)r.Next(0, surface1.TileSetRenderer.Data(tr.Type).Count);
-
-					surface1.Map.MapTiles.Value[i, j] = tr;
-				}
-
+			surface1.Map.FixOpenAreas(Program.Rules);
 			surface1.Chunks.Clear();
 			surface1.Invalidate();
 		}
@@ -544,7 +507,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();
@@ -572,17 +535,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)
@@ -592,12 +555,12 @@ 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)
 		{
-			System.Diagnostics.Process.Start("https://www.bountysource.com/#repos/OpenRA/OpenRA");
+			System.Diagnostics.Process.Start("https://www.bountysource.com/trackers/36085-openra");
 		}
 
 		void SourceCodeToolStripMenuItemClick(object sender, EventArgs e)
@@ -615,7 +578,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)
@@ -700,7 +663,7 @@ namespace OpenRA.Editor
 		{
 			int imageLength = 0;
 			int type = surface1.Map.MapResources.Value[x, y].Type;
-			var template = surface1.ResourceTemplates.Where(a => a.Value.Info.ResourceType == type).FirstOrDefault().Value;
+			var template = surface1.ResourceTemplates.FirstOrDefault(a => a.Value.Info.ResourceType == type).Value;
 			if (type == 1)
 				imageLength = 12;
 			else if (type == 2)
@@ -753,4 +716,4 @@ namespace OpenRA.Editor
 			surface1.IsErasing = eraserToolStripButton.Checked;
 		}
 	}
-}
+}

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,
@@ -45,7 +45,7 @@ namespace OpenRA.Editor
 			if (DirectoryIsEmpty(MapFolderPath))
 				return;
 
-			foreach (var map in ModData.FindMapsIn(MapFolderPath))
+			foreach (var map in MapCache.FindMapsIn(MapFolderPath))
 			{
 				ListViewItem map1 = new ListViewItem();
 				map1.Tag = map;
@@ -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,11 +75,12 @@ 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)
 				{
-					Console.WriteLine("No map preview image found: {0}", ed.ToString());
+					Console.WriteLine("No map preview image found: {0}", ed);
 				}
 			}
 		}

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>
@@ -60,18 +59,21 @@
   <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">
@@ -96,7 +98,6 @@
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
     <Compile Include="ITool.cs" />
-    <Compile Include="LegacyMapImporter.cs" />
     <Compile Include="MapSelect.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -165,12 +166,9 @@
     <Compile Include="Surface.cs">
       <SubType>Component</SubType>
     </Compile>
+    <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,
@@ -19,17 +19,12 @@ namespace OpenRA.Editor
 {
 	static class Program
 	{
+		public static Ruleset Rules;
+
 		[STAThread]
 		static void Main(string[] args)
 		{
-			if (args.Length >= 2 && args[0] == "--convert")
-			{
-				Game.modData = new ModData(args[1]);
-				FileSystem.LoadFromManifest(Game.modData.Manifest);
-				Rules.LoadRules(Game.modData.Manifest, new Map());
-				UpgradeMaps(args[1]);
-				return;
-			}
+			Log.AddChannel("perf", null);
 
 			Application.CurrentCulture = CultureInfo.InvariantCulture;
 			Application.EnableVisualStyles();
@@ -37,23 +32,5 @@ namespace OpenRA.Editor
 
 			Application.Run(new Form1(args));
 		}
-
-		static void UpgradeMaps(string mod)
-		{
-			var mapFolderPath = new string[] { Environment.CurrentDirectory, "mods", mod, "maps" }
-				.Aggregate(Path.Combine);
-
-			foreach (var path in ModData.FindMapsIn(mapFolderPath))
-			{
-				var map = new Map(path);
-
-				// Touch the lazy bits to initialize them
-				map.Actors.Force();
-				map.Smudges.Force();
-				map.MapTiles.Force();
-				map.MapResources.Force();
-				map.Save(path);
-			}
-		}
 	}
 }

OpenRA.Editor/RenderUtils.cs

@@ -8,21 +8,25 @@
  */
 #endregion
 
-using System;
+using System.Collections;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Linq;
 using OpenRA.FileFormats;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.Editor
 {
 	static class RenderUtils
 	{
-		static Bitmap RenderShp(ShpReader shp, Palette p)
+		static Bitmap RenderShp(ISpriteSource shp, Palette p)
 		{
-			var frame = shp[0];
+			var frame = shp.Frames.First();
 
-			var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
+			var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
 
 			bitmap.Palette = p.AsSystemPalette();
 
@@ -34,9 +38,9 @@ namespace OpenRA.Editor
 				byte* q = (byte*)data.Scan0.ToPointer();
 				var stride2 = data.Stride;
 
-				for (var i = 0; i < shp.Width; i++)
-					for (var j = 0; j < shp.Height; j++)
-						q[j * stride2 + i] = frame.Image[i + shp.Width * j];
+				for (var i = 0; i < frame.Size.Width; i++)
+					for (var j = 0; j < frame.Size.Height; j++)
+						q[j * stride2 + i] = frame.Data[i + frame.Size.Width * j];
 			}
 
 			bitmap.UnlockBits(data);
@@ -47,14 +51,14 @@ namespace OpenRA.Editor
 		{
 			var image = RenderSprites.GetImage(info);
 
-			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			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);
@@ -76,13 +80,14 @@ namespace OpenRA.Editor
 
 		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
 		{
-			var image = info.SpriteNames[0];
-			using (var s = FileSystem.OpenWithExts(image, exts))
+			var image = info.EditorSprite;
+			using (var s = GlobalFileSystem.OpenWithExts(image, exts))
 			{
-				var shp = new ShpReader(s);
-				var frame = shp[shp.ImageCount - 1];
+				// TODO: Do this properly
+				var shp = new ShpReader(s) as ISpriteSource;
+				var frame = shp.Frames.Last();
 
-				var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
+				var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
 				bitmap.Palette = p.AsSystemPalette();
 				var data = bitmap.LockBits(bitmap.Bounds(),
 					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
@@ -92,13 +97,13 @@ namespace OpenRA.Editor
 					byte* q = (byte*)data.Scan0.ToPointer();
 					var stride = data.Stride;
 
-					for (var i = 0; i < shp.Width; i++)
-						for (var j = 0; j < shp.Height; j++)
-							q[j * stride + i] = frame.Image[i + shp.Width * j];
+					for (var i = 0; i < frame.Size.Width; i++)
+						for (var j = 0; j < frame.Size.Height; j++)
+							q[j * stride + i] = frame.Data[i + frame.Size.Width * j];
 				}
 
 				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.Frames.Count() - 1 };
 			}
 		}
 	}

OpenRA.Editor/ResourceTool.cs

@@ -27,7 +27,7 @@ namespace OpenRA.Editor
 				= new TileReference<byte, byte>
 				{
 					Type = (byte)resourceTemplate.Info.ResourceType,
-					Index = (byte)random.Next(resourceTemplate.Info.SpriteNames.Length)
+					Index = (byte)random.Next(resourceTemplate.Info.MaxDensity)
 				};
 
 			var ch = new int2(surface.GetBrushLocation().X / 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,9 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
 using System.Windows.Forms;
-using OpenRA.FileFormats;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 using SGraphics = System.Drawing.Graphics;
@@ -107,7 +109,6 @@ namespace OpenRA.Editor
 		public Dictionary<int2, Bitmap> Chunks = new Dictionary<int2, Bitmap>();
 
 		public Surface()
-			: base()
 		{
 			BackColor = Color.Black;
 
@@ -258,7 +259,7 @@ namespace OpenRA.Editor
 
 		Bitmap RenderChunk(int u, int v)
 		{
-			var bitmap = new Bitmap(ChunkSize * TileSetRenderer.TileSize.Width, ChunkSize * TileSetRenderer.TileSize.Height);
+			var bitmap = new Bitmap(ChunkSize * TileSetRenderer.TileSize, ChunkSize * TileSetRenderer.TileSize);
 
 			var data = bitmap.LockBits(bitmap.Bounds(),
 				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
@@ -275,9 +276,9 @@ namespace OpenRA.Editor
 						var tile = TileSetRenderer.Data(tr.Type);
 						var index = (tr.Index < tile.Count) ? tr.Index : (byte)0;
 						var rawImage = tile[index];
-						for (var x = 0; x < TileSetRenderer.TileSize.Width; x++)
-							for (var y = 0; y < TileSetRenderer.TileSize.Height; y++)
-								p[(j * TileSetRenderer.TileSize.Width + y) * stride + i * TileSetRenderer.TileSize.Width + x] = Palette.GetColor(rawImage[x + TileSetRenderer.TileSize.Width * y]).ToArgb();
+						for (var x = 0; x < TileSetRenderer.TileSize; x++)
+							for (var y = 0; y < TileSetRenderer.TileSize; y++)
+								p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = Palette.GetColor(rawImage[x + TileSetRenderer.TileSize * y]).ToArgb();
 
 						if (Map.MapResources.Value[u * ChunkSize + i, v * ChunkSize + j].Type != 0)
 						{
@@ -288,12 +289,12 @@ namespace OpenRA.Editor
 							int* q = (int*)srcdata.Scan0.ToPointer();
 							var srcstride = srcdata.Stride >> 2;
 
-							for (var x = 0; x < TileSetRenderer.TileSize.Width; x++)
-								for (var y = 0; y < TileSetRenderer.TileSize.Height; y++)
+							for (var x = 0; x < TileSetRenderer.TileSize; x++)
+								for (var y = 0; y < TileSetRenderer.TileSize; y++)
 								{
 									var c = q[y * srcstride + x];
 									if ((c & 0xff000000) != 0)	/* quick & dirty, i cbf doing real alpha */
-										p[(j * TileSetRenderer.TileSize.Width + y) * stride + i * TileSetRenderer.TileSize.Width + x] = c;
+										p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = c;
 								}
 
 							resourceImage.UnlockBits(srcdata);
@@ -304,14 +305,16 @@ namespace OpenRA.Editor
 			bitmap.UnlockBits(data);
 
 			if (ShowGrid)
+			{
 				using (var g = SGraphics.FromImage(bitmap))
 				{
+					var ts = Game.modData.Manifest.TileSize;
 					var rect = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
-					ControlPaint.DrawGrid(g, rect,	new Size(2, Game.CellSize), Color.DarkRed);
-					ControlPaint.DrawGrid(g, rect,	new Size(Game.CellSize, 2), Color.DarkRed);
-					ControlPaint.DrawGrid(g, rect,	new Size(Game.CellSize, Game.CellSize), Color.Red);
+					ControlPaint.DrawGrid(g, rect, new Size(2, ts.Height), Color.DarkRed);
+					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, 2), Color.DarkRed);
+					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, ts.Height), Color.Red);
 				}
-
+			}
 			return bitmap;
 		}
 
@@ -319,15 +322,15 @@ namespace OpenRA.Editor
 		{
 			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
 			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
-			return new CPos(vX / TileSetRenderer.TileSize.Width, vY / TileSetRenderer.TileSize.Height);
+			return new CPos(vX / TileSetRenderer.TileSize, vY / TileSetRenderer.TileSize);
 		}
 
 		public CPos GetBrushLocationBR()
 		{
 			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
 			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
-			return new CPos((vX + TileSetRenderer.TileSize.Width - 1) / TileSetRenderer.TileSize.Width,
-			                (vY + TileSetRenderer.TileSize.Height - 1) / TileSetRenderer.TileSize.Height);
+			return new CPos((vX + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize,
+			                (vY + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize);
 		}
 
 		public void DrawActor(SGraphics g, CPos p, ActorTemplate t, ColorPalette cp)
@@ -341,11 +344,11 @@ namespace OpenRA.Editor
 
 		float2 GetDrawPosition(CPos location, Bitmap bmp, bool centered)
 		{
-			float offsetX = centered ? bmp.Width / 2 - TileSetRenderer.TileSize.Width / 2 : 0;
-			float drawX = TileSetRenderer.TileSize.Width * location.X * Zoom + Offset.X - offsetX;
+			float offsetX = centered ? bmp.Width / 2 - TileSetRenderer.TileSize / 2 : 0;
+			float drawX = TileSetRenderer.TileSize * location.X * Zoom + Offset.X - offsetX;
 
-			float offsetY = centered ? bmp.Height / 2 - TileSetRenderer.TileSize.Height / 2 : 0;
-			float drawY = TileSetRenderer.TileSize.Height * location.Y * Zoom + Offset.Y - offsetY;
+			float offsetY = centered ? bmp.Height / 2 - TileSetRenderer.TileSize / 2 : 0;
+			float drawY = TileSetRenderer.TileSize * location.Y * Zoom + Offset.Y - offsetY;
 
 			return new float2(drawX, drawY);
 		}
@@ -376,7 +379,7 @@ 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();
 		}
@@ -413,24 +416,24 @@ namespace OpenRA.Editor
 
 					var bmp = Chunks[x];
 
-					var drawX = TileSetRenderer.TileSize.Width * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
-					var drawY = TileSetRenderer.TileSize.Height * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
+					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);
 					e.Graphics.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
 				}
 
 			e.Graphics.DrawRectangle(CordonPen,
-				Map.Bounds.Left * TileSetRenderer.TileSize.Width * Zoom + Offset.X,
-				Map.Bounds.Top * TileSetRenderer.TileSize.Height * Zoom + Offset.Y,
-				Map.Bounds.Width * TileSetRenderer.TileSize.Width * Zoom,
-				Map.Bounds.Height * TileSetRenderer.TileSize.Height * Zoom);
+				Map.Bounds.Left * TileSetRenderer.TileSize * Zoom + Offset.X,
+				Map.Bounds.Top * TileSetRenderer.TileSize * Zoom + Offset.Y,
+				Map.Bounds.Width * TileSetRenderer.TileSize * Zoom,
+				Map.Bounds.Height * TileSetRenderer.TileSize * Zoom);
 
 			e.Graphics.DrawRectangle(SelectionPen,
-				(SelectionStart.X * TileSetRenderer.TileSize.Width * Zoom) + Offset.X,
-				(SelectionStart.Y * TileSetRenderer.TileSize.Height * Zoom) + Offset.Y,
-				(SelectionEnd - SelectionStart).X * TileSetRenderer.TileSize.Width * Zoom,
-				(SelectionEnd - SelectionStart).Y * TileSetRenderer.TileSize.Height * Zoom);
+				(SelectionStart.X * TileSetRenderer.TileSize * Zoom) + Offset.X,
+				(SelectionStart.Y * TileSetRenderer.TileSize * Zoom) + Offset.Y,
+				(SelectionEnd - SelectionStart).X * TileSetRenderer.TileSize * Zoom,
+				(SelectionEnd - SelectionStart).Y * TileSetRenderer.TileSize * Zoom);
 
 			if (IsPaste)
 			{
@@ -439,10 +442,10 @@ namespace OpenRA.Editor
 				var height = Math.Abs((SelectionStart - SelectionEnd).Y);
 
 				e.Graphics.DrawRectangle(PastePen,
-					(loc.X * TileSetRenderer.TileSize.Width * Zoom) + Offset.X,
-					(loc.Y * TileSetRenderer.TileSize.Height * Zoom) + Offset.Y,
-					width * (TileSetRenderer.TileSize.Width * Zoom),
-					height * (TileSetRenderer.TileSize.Height * Zoom));
+					(loc.X * TileSetRenderer.TileSize * Zoom) + Offset.X,
+					(loc.Y * TileSetRenderer.TileSize * Zoom) + Offset.Y,
+					width * (TileSetRenderer.TileSize * Zoom),
+					height * (TileSetRenderer.TileSize * Zoom));
 			}
 
 			foreach (var ar in Map.Actors.Value)
@@ -458,8 +461,8 @@ namespace OpenRA.Editor
 				foreach (var ar in Map.Actors.Value)
 					if (!ar.Key.StartsWith("Actor"))	// if it has a custom name
 						e.Graphics.DrawStringContrast(Font, ar.Key,
-							(int)(ar.Value.Location().X * TileSetRenderer.TileSize.Width * Zoom + Offset.X),
-							(int)(ar.Value.Location().Y * TileSetRenderer.TileSize.Height * Zoom + Offset.Y),
+							(int)(ar.Value.Location().X * TileSetRenderer.TileSize * Zoom + Offset.X),
+							(int)(ar.Value.Location().Y * TileSetRenderer.TileSize * Zoom + Offset.Y),
 							Brushes.White,
 							Brushes.Black);
 
@@ -469,7 +472,7 @@ namespace OpenRA.Editor
 				{
 					if (i % 8 == 0)
 					{
-						PointF point = new PointF(i * TileSetRenderer.TileSize.Width * Zoom + Offset.X, (Map.Bounds.Top - 8) * TileSetRenderer.TileSize.Height * Zoom + Offset.Y);
+						PointF 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);
 					}
 				}
@@ -478,7 +481,7 @@ namespace OpenRA.Editor
 				{
 					if (i % 8 == 0)
 					{
-						PointF point = new PointF((Map.Bounds.Left - 8) * TileSetRenderer.TileSize.Width * Zoom + Offset.X, i * TileSetRenderer.TileSize.Height * Zoom + Offset.Y);
+						PointF 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);
 					}
 				}
@@ -490,7 +493,7 @@ namespace OpenRA.Editor
 			if (currentTool == null)
 			{
 				var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
-				if (x.Key != null)
+				if (x.Key != null && actorTemplates.ContainsKey(x.Value.Type))
 					DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]);
 			}
 		}

OpenRA.Editor/TileSetRenderer.cs

@@ -0,0 +1,134 @@
+#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.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
+
+namespace OpenRA.Editor
+{
+	public class TileSetRenderer
+	{
+		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)
+		{
+			var data = new byte[TileSize * TileSize];
+
+			// Invalid tile size: return blank tile
+			if (frame.Size.Width < TileSize || frame.Size.Height < TileSize)
+				return new byte[0];
+
+			var frameData = frame.Data;
+			var xOffset = (frame.Size.Width - TileSize) / 2;
+			var yOffset = (frame.Size.Height - TileSize) / 2;
+
+			for (var y = 0; y < TileSize; y++)
+				for (var x = 0; x < TileSize; x++)
+					data[y * TileSize + x] = frameData[(yOffset + y) * frame.Size.Width + x + xOffset];
+
+			return data;
+		}
+
+		List<byte[]> LoadTemplate(string filename, string[] exts, Dictionary<string, ISpriteSource> sourceCache, int[] frames)
+		{
+			ISpriteSource source;
+			if (!sourceCache.ContainsKey(filename))
+			{
+				using (var s = GlobalFileSystem.OpenWithExts(filename, exts))
+					source = SpriteSource.LoadSpriteSource(s, filename);
+
+				if (source.CacheWhenLoadingTileset)
+					sourceCache.Add(filename, source);
+			}
+			else
+				source = sourceCache[filename];
+
+			if (frames != null)
+			{
+				var ret = new List<byte[]>();
+				var srcFrames = source.Frames.ToArray();
+				foreach (var i in frames)
+					ret.Add(ExtractSquareTile(srcFrames[i]));
+
+				return ret;
+			}
+
+			return source.Frames.Select(f => ExtractSquareTile(f)).ToList();
+		}
+
+		public TileSetRenderer(TileSet tileset, Size tileSize)
+		{
+			this.TileSet = tileset;
+			this.TileSize = Math.Min(tileSize.Width, tileSize.Height);
+
+			templates = new Dictionary<ushort, List<byte[]>>();
+			var sourceCache = new Dictionary<string, ISpriteSource>();
+			foreach (var t in TileSet.Templates)
+				templates.Add(t.Key, LoadTemplate(t.Value.Image, tileset.Extensions, sourceCache, t.Value.Frames));
+		}
+
+		public Bitmap RenderTemplate(ushort id, Palette p)
+		{
+			var template = TileSet.Templates[id];
+			var templateData = templates[id];
+
+			var bitmap = new Bitmap(TileSize * template.Size.X, TileSize * template.Size.Y,
+				PixelFormat.Format8bppIndexed);
+
+			bitmap.Palette = p.AsSystemPalette();
+
+			var data = bitmap.LockBits(bitmap.Bounds(),
+				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+			unsafe
+			{
+				var q = (byte*)data.Scan0.ToPointer();
+				var stride = data.Stride;
+
+				for (var u = 0; u < template.Size.X; u++)
+				{
+					for (var v = 0; v < template.Size.Y; v++)
+					{
+						var rawImage = templateData[u + v * template.Size.X];
+						if (rawImage != null && rawImage.Length > 0)
+						{
+							for (var i = 0; i < TileSize; i++)
+								for (var j = 0; j < TileSize; j++)
+									q[(v * TileSize + j) * stride + u * TileSize + i] = rawImage[i + TileSize * j];
+						}
+						else
+						{
+							for (var i = 0; i < TileSize; i++)
+								for (var j = 0; j < TileSize; j++)
+									q[(v * TileSize + j) * stride + u * TileSize + i] = 0;
+						}
+					}
+				}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		public List<byte[]> Data(ushort id)
+		{
+			return templates[id];
+		}
+	}
+}

OpenRA.FileFormats/Graphics/Dune2ShpReader.cs

@@ -1,144 +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;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public enum Dune2ImageFlags : int
-	{
-		F80_F2 = 0,
-		F2 = 2,
-		L16_F80_F2_1 = 1,
-		L16_F80_F2_2 = 3,
-		Ln_F80_F2 = 5
-	}
-
-	public class Dune2ImageHeader
-	{
-		public readonly Dune2ImageFlags Flags;
-		public readonly int Width;
-		public readonly int Height;
-		public readonly int Slices;
-		public readonly int FileSize;
-		public readonly int DataSize;
-
-		public readonly byte[] LookupTable;
-		public byte[] Image;
-
-		public Dune2ImageHeader(Stream s)
-		{
-			Flags = (Dune2ImageFlags)s.ReadUInt16();
-			Slices = s.ReadUInt8();
-			Width = s.ReadUInt16();
-			Height = s.ReadUInt8();
-			FileSize = s.ReadUInt16();
-			DataSize = s.ReadUInt16();
-
-			if (Flags == Dune2ImageFlags.L16_F80_F2_1 ||
-				Flags == Dune2ImageFlags.L16_F80_F2_2 ||
-				Flags == Dune2ImageFlags.Ln_F80_F2)
-			{
-				int n = Flags == Dune2ImageFlags.Ln_F80_F2 ? s.ReadUInt8() : (byte)16;
-				LookupTable = new byte[n];
-				for (int i = 0; i < n; i++)
-					LookupTable[i] = s.ReadUInt8();
-			}
-			else
-			{
-				LookupTable = new byte[256];
-				for (int i = 0; i < 256; i++)
-					LookupTable[i] = (byte)i;
-				LookupTable[1] = 0x7f;
-				LookupTable[2] = 0x7e;
-				LookupTable[3] = 0x7d;
-				LookupTable[4] = 0x7c;
-			}
-		}
-
-		public Size Size
-		{
-			get { return new Size(Width, Height); }
-		}
-	}
-
-	public class Dune2ShpReader : IEnumerable<Dune2ImageHeader>
-	{
-		public readonly int ImageCount;
-
-		List<Dune2ImageHeader> headers = new List<Dune2ImageHeader>();
-
-		public Dune2ShpReader(Stream s)
-		{
-			ImageCount = s.ReadUInt16();
-
-			//Last offset is pointer to end of file.
-			uint[] offsets = new uint[ImageCount + 1];
-
-			uint temp = s.ReadUInt32();
-
-			//If fourth byte in file is non-zero, the offsets are two bytes each.
-			bool twoByteOffsets = (temp & 0xFF0000) > 0;
-			if (twoByteOffsets)
-			{
-				offsets[0] = ((temp & 0xFFFF0000) >> 16) + 2; //Offset does not account for image count bytes
-				offsets[1] = (temp & 0xFFFF) + 2;
-			}
-			else
-				offsets[0] = temp + 2;
-
-			for (int i = twoByteOffsets ? 2 : 1; i < ImageCount + 1; i++)
-				offsets[i] = (twoByteOffsets ? s.ReadUInt16() : s.ReadUInt32()) + 2;
-
-			for (int i = 0; i < ImageCount; i++)
-			{
-				s.Seek(offsets[i], SeekOrigin.Begin);
-				Dune2ImageHeader header = new Dune2ImageHeader(s);
-				byte[] imgData = s.ReadBytes(header.FileSize);
-				header.Image = new byte[header.Height * header.Width];
-
-				//Decode image data
-				if (header.Flags != Dune2ImageFlags.F2)
-				{
-					byte[] tempData = new byte[header.DataSize];
-					Format80.DecodeInto(imgData, tempData);
-					Format2.DecodeInto(tempData, header.Image);
-				}
-				else
-					Format2.DecodeInto(imgData, header.Image);
-
-				//Lookup values in lookup table
-				if (header.LookupTable != null)
-					for (int j = 0; j < header.Image.Length; j++)
-						header.Image[j] = header.LookupTable[header.Image[j]];
-
-				headers.Add(header);
-			}
-		}
-
-		public Dune2ImageHeader this[int index]
-		{
-			get { return headers[index]; }
-		}
-
-		public IEnumerator<Dune2ImageHeader> GetEnumerator()
-		{
-			return headers.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-	}
-}

OpenRA.FileFormats/Graphics/ShpReader.cs

@@ -1,167 +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.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public class ImageHeader
-	{
-		public uint Offset;
-		public Format Format;
-
-		public uint RefOffset;
-		public Format RefFormat;
-		public ImageHeader RefImage;
-
-		public byte[] Image;
-
-		public ImageHeader() { }
-
-		public ImageHeader( BinaryReader reader )
-		{
-			var data = reader.ReadUInt32();
-			Offset = data & 0xffffff;
-			Format = (Format)(data >> 24);
-
-			RefOffset = reader.ReadUInt16();
-			RefFormat = (Format)reader.ReadUInt16();
-		}
-
-		public static readonly int SizeOnDisk = 8;
-
-		public void WriteTo(BinaryWriter writer)
-		{
-			writer.Write(Offset | ((uint)Format << 24));
-			writer.Write((ushort)RefOffset);
-			writer.Write((ushort)RefFormat);
-		}
-	}
-
-	public enum Format { Format20 = 0x20, Format40 = 0x40, Format80 = 0x80 }
-
-	public class ShpReader
-	{
-		public readonly int ImageCount;
-		public readonly ushort Width;
-		public readonly ushort Height;
-
-		public Size Size { get { return new Size(Width, Height); } }
-
-		readonly List<ImageHeader> headers = new List<ImageHeader>();
-
-		int recurseDepth = 0;
-
-		public ShpReader(Stream stream)
-		{
-			using (var reader = new BinaryReader(stream))
-			{
-				ImageCount = reader.ReadUInt16();
-				reader.ReadUInt16();
-				reader.ReadUInt16();
-				Width = reader.ReadUInt16();
-				Height = reader.ReadUInt16();
-				reader.ReadUInt32();
-
-				for (int i = 0 ; i < ImageCount ; i++)
-					headers.Add(new ImageHeader(reader));
-
-				new ImageHeader(reader); // end-of-file header
-				new ImageHeader(reader); // all-zeroes header
-
-				var offsets = headers.ToDictionary(h => h.Offset, h =>h);
-
-				for (int i = 0 ; i < ImageCount ; i++)
-				{
-					var h = headers[ i ];
-					if (h.Format == Format.Format20)
-						h.RefImage = headers[i - 1];
-
-					else if (h.Format == Format.Format40)
-						if (!offsets.TryGetValue(h.RefOffset, out h.RefImage))
-							throw new InvalidDataException("Reference doesnt point to image data {0}->{1}".F(h.Offset, h.RefOffset));
-				}
-
-				foreach (ImageHeader h in headers)
-					Decompress(stream, h);
-			}
-		}
-
-		public ImageHeader this[int index]
-		{
-			get { return headers[index]; }
-		}
-
-		void Decompress(Stream stream, ImageHeader h)
-		{
-			if (recurseDepth > ImageCount)
-				throw new InvalidDataException("Format20/40 headers contain infinite loop");
-
-			switch(h.Format)
-			{
-				case Format.Format20:
-				case Format.Format40:
-					{
-						if (h.RefImage.Image == null)
-						{
-							++recurseDepth;
-							Decompress(stream, h.RefImage);
-							--recurseDepth;
-						}
-
-						h.Image = CopyImageData(h.RefImage.Image);
-						Format40.DecodeInto(ReadCompressedData(stream, h), h.Image);
-						break;
-					}
-				case Format.Format80:
-					{
-						var imageBytes = new byte[Width * Height];
-						Format80.DecodeInto(ReadCompressedData(stream, h), imageBytes);
-						h.Image = imageBytes;
-						break;
-					}
-				default:
-					throw new InvalidDataException();
-			}
-		}
-
-		static byte[] ReadCompressedData(Stream stream, ImageHeader h)
-		{
-			stream.Position = h.Offset;
-			// TODO: 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;
-		}
-
-		byte[] CopyImageData(byte[] baseImage)
-		{
-			var imageData = new byte[Width * Height];
-			for (int i = 0 ; i < Width * Height ; i++)
-				imageData[i] = baseImage[i];
-
-			return imageData;
-		}
-
-		public IEnumerable<ImageHeader> Frames { get { return headers; } }
-
-		public static ShpReader Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return new ShpReader(s);
-		}
-	}
-}

OpenRA.FileFormats/Graphics/ShpTSReader.cs

@@ -1,615 +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 LICENSE.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-
-	public struct Header
-	{
-		public ushort A;
-		// Unknown
-		// Width and Height of the images
-		public ushort Width;
-		public ushort Height;
-		public ushort NumImages;
-	}
-
-	public class HeaderImage
-	{
-		public ushort x;
-		public ushort y;
-		public ushort cx;
-		public ushort cy;
-		// cx and cy are width n height of stored image
-		public byte compression;
-		public byte[] align;
-		public byte[] transparent;
-		public int zero;
-		public int offset;
-		public byte[] Image;
-	}
-
-	public struct SHPData
-	{
-		public HeaderImage HeaderImage;
-		public byte[] Databuffer;
-		public byte[] FrameImage;
-	}
-
-	public struct SHP
-	{
-		public Header Header;
-		public SHPData[] Data;
-	}
-
-
-	public class ShpTSReader : IEnumerable<HeaderImage>
-	{
-		public readonly int ImageCount;
-		public readonly ushort Width;
-		public readonly ushort Height;
-		public readonly ushort Width2;
-		public readonly ushort Height2;
-		public int arroff = 0;
-		public int erri = 0;
-		public int errj = 0;
-		public int errk = 0;
-		public int errl = 0;
-
-		public static int FindNextOffsetFrom(SHP SHP, int Init, int Last)
-		{
-			int result;
-			result = 0;
-			Last++;
-			while ((result == 0) && (Init < Last))
-			{
-				result = SHP.Data[Init].HeaderImage.offset;
-				Init++;
-			}
-			return result;
-		}
-
-		private readonly List<HeaderImage> headers = new List<HeaderImage>();
-
-		public ShpTSReader(Stream s)
-		{
-
-			SHP SHP = new SHP();
-				int FileSize;
-				int x;
-				int k = 0;
-				int l = 0;
-
-				int ImageSize;
-				int NextOffset;
-
-				byte[] FData;
-				byte cp;
-				byte[] Databuffer;
-
-				FileSize = (int)s.Length;
-				// Get Header
-				SHP.Header.A = s.ReadUInt16();
-				SHP.Header.Width = s.ReadUInt16();
-				SHP.Header.Height = s.ReadUInt16();
-				SHP.Header.NumImages = s.ReadUInt16();
-
-				SHP.Data = new SHPData[SHP.Header.NumImages + 1];
-
-				ImageCount = SHP.Header.NumImages;
-				
-				for (x = 1; x <= SHP.Header.NumImages; x++)
-				{
-					SHP.Data[x].HeaderImage = new HeaderImage();
- 
-					SHP.Data[x].HeaderImage.x = s.ReadUInt16();
-					SHP.Data[x].HeaderImage.y = s.ReadUInt16();
-					SHP.Data[x].HeaderImage.cx = s.ReadUInt16();
-					SHP.Data[x].HeaderImage.cy = s.ReadUInt16();
-
-					SHP.Data[x].HeaderImage.compression = s.ReadUInt8();
-					SHP.Data[x].HeaderImage.align = s.ReadBytes(3);
-					s.ReadInt32();
-					SHP.Data[x].HeaderImage.zero = s.ReadUInt8();
-					SHP.Data[x].HeaderImage.transparent = s.ReadBytes(3);
-
-					SHP.Data[x].HeaderImage.offset = s.ReadInt32();
-
-				}
-
-				Width = SHP.Header.Width;
-				Height = SHP.Header.Height;
-
-				for (int i = 0; i < ImageCount; i++)
-				{
-					headers.Add(SHP.Data[i+1].HeaderImage);
-				}
-
-				// Read and decode each image from the file
-				for (x = 1; x <= SHP.Header.NumImages; x++)
-				{
-					headers[x - 1].Image = new byte[(Width * Height)];
-					for (int i = 0; i < headers[x - 1].Image.Length; i++)
-						headers[x - 1].Image[i] = 0;
-
-					FData = new byte[(Width * Height)];
-
-					// Does it really reads the frame?
-					if (SHP.Data[x].HeaderImage.offset != 0)
-					{
-						try
-						{
-						// Now it checks the compression:
-						if ((SHP.Data[x].HeaderImage.compression == 3))
-						{
-							// decode it
-							// Compression 3
-							NextOffset = FindNextOffsetFrom(SHP, x + 1, SHP.Header.NumImages);
-							if (NextOffset != 0)
-							{
-								
-								ImageSize = NextOffset - SHP.Data[x].HeaderImage.offset;
-								Databuffer = new byte[ImageSize];
-								for (int i = 0; i < ImageSize; i++)
-								{
-									s.Seek(SHP.Data[x].HeaderImage.offset + i, SeekOrigin.Begin);
-									Databuffer[i] = s.ReadUInt8();
-								}
-								SHP.Data[x].Databuffer = new byte[(SHP.Data[x].HeaderImage.cx * SHP.Data[x].HeaderImage.cy)];
-								Decode3(Databuffer, ref SHP.Data[x].Databuffer, SHP.Data[x].HeaderImage.cx, SHP.Data[x].HeaderImage.cy, ref FileSize);
-
-								k = 0;
-								l = 0;
-								for (int i = 0; i < Height; i++)
-								{
-									erri = i;
-									for (int j = SHP.Data[x].HeaderImage.x; j < Width; j++)
-									{
-										errj = j;
-										errl = l;
-										errk = k;
-										arroff = i + j + l;
-
-										if (((j + 1) > (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x)) || ((i + 1) > (SHP.Data[x].HeaderImage.cy)))
-											cp = 0;
-										else
-											cp = SHP.Data[x].Databuffer[i + (j - SHP.Data[x].HeaderImage.x) + l];
-
-										FData[i + j + k] = cp;
-
-										if (j == (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x - 1))
-											l = l + (SHP.Data[x].HeaderImage.cx - 1);
-
-										if (j == (Width - 1))
-											k = k + (Width - 1);
-									} 
-								}
-								//FData = headers[x - 1].Image;
-								k = 0;
-								for (int i = 0; i < (Height - SHP.Data[x].HeaderImage.y); i++)
-								{
-									for (int j = 0; j < Width; j++)
-									{
-										headers[x - 1].Image[i + j + k + (Width * SHP.Data[x].HeaderImage.y)] = FData[i + j + k];
-										if (j == (Width - 1))
-										{
-											k = k + (Width - 1);
-										}
-									}
-								}
-
-							}
-							else
-							{
-								
-								ImageSize = 0;
-								ImageSize = FileSize - SHP.Data[x].HeaderImage.offset;
-								Databuffer = new byte[ImageSize];
-								for (int i = 0; i < ImageSize; i++)
-								{
-									s.Seek(SHP.Data[x].HeaderImage.offset + i, SeekOrigin.Begin);
-									Databuffer[i] = s.ReadUInt8();
-								}
-								SHP.Data[x].Databuffer = new byte[((SHP.Data[x].HeaderImage.cx * SHP.Data[x].HeaderImage.cy))];
-								
-								Decode3(Databuffer, ref SHP.Data[x].Databuffer, SHP.Data[x].HeaderImage.cx, SHP.Data[x].HeaderImage.cy, ref ImageSize);
-
-								k = 0;
-								l = 0;
-								for (int i = 0; i < Height; i++)
-								{
-									erri = i;
-									for (int j = SHP.Data[x].HeaderImage.x; j < Width; j++)
-									{
-										errj = j;
-										errl = l;
-										errk = k;
-										arroff = i + j + l;
-
-										if (((j + 1) > (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x)) || ((i + 1) > (SHP.Data[x].HeaderImage.cy)))
-											cp = 0;
-										else
-											cp = SHP.Data[x].Databuffer[i + (j - SHP.Data[x].HeaderImage.x) + l];
-
-										FData[i + j + k] = cp;
-
-										if (j == (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x - 1))
-											l = l + (SHP.Data[x].HeaderImage.cx - 1);
-
-										if (j == (Width - 1))
-											k = k + (Width - 1);
-									}
-								}
-								//FData = headers[x - 1].Image;
-								k = 0;
-								for (int i = 0; i < (Height - SHP.Data[x].HeaderImage.y); i++)
-								{
-									for (int j = 0; j < Width; j++)
-									{
-										headers[x - 1].Image[i + j + k + (Width * SHP.Data[x].HeaderImage.y)] = FData[i + j + k];
-										if (j == (Width - 1))
-										{
-											k = k + (Width - 1);
-										}
-									}
-								}
-							}
-						}
-						else if ((SHP.Data[x].HeaderImage.compression == 2))
-						{
-							NextOffset = FindNextOffsetFrom(SHP, x + 1, SHP.Header.NumImages);
-							if (NextOffset != 0)
-							{
-								ImageSize = NextOffset - SHP.Data[x].HeaderImage.offset;
-								SHP.Data[x].Databuffer = new byte[(SHP.Data[x].HeaderImage.cx * SHP.Data[x].HeaderImage.cy)];
-								Databuffer = new byte[ImageSize];
-								for (int i = 0; i < ImageSize; i++)
-								{
-									s.Seek(SHP.Data[x].HeaderImage.offset + i, SeekOrigin.Begin);
-									Databuffer[i] = s.ReadUInt8();
-								}
-
-								Decode2(Databuffer, ref SHP.Data[x].Databuffer, SHP.Data[x].HeaderImage.cx, SHP.Data[x].HeaderImage.cy, ref ImageSize);
-
-								k = 0;
-								l = 0;
-								for (int i = 0; i < Height; i++)
-								{
-									erri = i;
-									for (int j = SHP.Data[x].HeaderImage.x; j < Width; j++)
-									{
-										errj = j;
-										errl = l;
-										errk = k;
-										arroff = i + j + l;
-
-										if (((j + 1) > (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x)) || ((i + 1) > (SHP.Data[x].HeaderImage.cy)))
-											cp = 0;
-										else
-											cp = SHP.Data[x].Databuffer[i + (j - SHP.Data[x].HeaderImage.x) + l];
-
-										FData[i + j + k] = cp;
-
-										if (j == (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x - 1))
-											l = l + (SHP.Data[x].HeaderImage.cx - 1);
-
-										if (j == (Width - 1))
-											k = k + (Width - 1);
-									}
-								}
-								//FData = headers[x - 1].Image;
-								k = 0;
-								for (int i = 0; i < (Height - SHP.Data[x].HeaderImage.y); i++)
-								{
-									for (int j = 0; j < Width; j++)
-									{
-										headers[x - 1].Image[i + j + k + (Width * SHP.Data[x].HeaderImage.y)] = FData[i + j + k];
-										if (j == (Width - 1))
-										{
-											k = k + (Width - 1);
-										}
-									}
-								}
-
-								// Compression 2
-							}
-							else
-							{
-								ImageSize = 0;
-								ImageSize = FileSize - SHP.Data[x].HeaderImage.offset;
-								Databuffer = new byte[ImageSize];
-								for (int i = 0; i < ImageSize; i++)
-								{
-									s.Seek(SHP.Data[x].HeaderImage.offset + i, SeekOrigin.Begin);
-									Databuffer[i] = s.ReadUInt8();
-								}
-								SHP.Data[x].Databuffer = new byte[((SHP.Data[x].HeaderImage.cx * SHP.Data[x].HeaderImage.cy))];
-								Decode2(Databuffer, ref SHP.Data[x].Databuffer, SHP.Data[x].HeaderImage.cx, SHP.Data[x].HeaderImage.cy, ref ImageSize);
-
-								k = 0;
-								l = 0;
-								for (int i = 0; i < Height; i++)
-								{
-									erri = i;
-									for (int j = SHP.Data[x].HeaderImage.x; j < Width; j++)
-									{
-										errj = j;
-										errl = l;
-										errk = k;
-										arroff = i + j + l;
-
-										if (((j + 1) > (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x)) || ((i + 1) > (SHP.Data[x].HeaderImage.cy)))
-											cp = 0;
-										else
-											cp = SHP.Data[x].Databuffer[i + (j - SHP.Data[x].HeaderImage.x) + l];
-
-										FData[i + j + k] = cp;
-
-										if (j == (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x - 1))
-											l = l + (SHP.Data[x].HeaderImage.cx - 1);
-
-										if (j == (Width - 1))
-											k = k + (Width - 1);
-									}
-								}
-								//FData = headers[x - 1].Image;
-								k = 0;
-								for (int i = 0; i < (Height - SHP.Data[x].HeaderImage.y); i++)
-								{
-									for (int j = 0; j < Width; j++)
-									{
-										headers[x - 1].Image[i + j + k + (Width * SHP.Data[x].HeaderImage.y)] = FData[i + j + k];
-										if (j == (Width - 1))
-										{
-											k = k + (Width - 1);
-										}
-									}
-								}
-								// Compression 2
-							}
-						}
-						else
-						{
-							// Compression 1
-							ImageSize = (int)(SHP.Data[x].HeaderImage.cx * SHP.Data[x].HeaderImage.cy);
-							Databuffer = new byte[ImageSize];
-							for (int i = 0; i < ImageSize; i++)
-							{
-								s.Seek(SHP.Data[x].HeaderImage.offset + i, SeekOrigin.Begin);
-								Databuffer[i] = s.ReadUInt8();
-							}
-							SHP.Data[x].Databuffer = new byte[(SHP.Data[x].HeaderImage.cx * SHP.Data[x].HeaderImage.cy)];
-							SHP.Data[x].Databuffer = Databuffer;
-
-							k = 0;
-							l = 0;
-							for (int i = 0; i < Height; i++)
-							{
-								erri = i;
-								for (int j = SHP.Data[x].HeaderImage.x; j < Width; j++)
-								{
-									errj = j;
-									errl = l;
-									errk = k;
-									arroff = i + j + l;
-
-									if (((j + 1) > (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x)) || ((i + 1) > (SHP.Data[x].HeaderImage.cy)))
-										cp = 0;
-									else
-										cp = SHP.Data[x].Databuffer[i + (j - SHP.Data[x].HeaderImage.x) + l];
-
-									FData[i + j + k] = cp;
-
-									if (j == (SHP.Data[x].HeaderImage.cx + SHP.Data[x].HeaderImage.x - 1))
-										l = l + (SHP.Data[x].HeaderImage.cx - 1);
-
-									if (j == (Width - 1))
-										k = k + (Width - 1);
-								}
-							}
-							//FData = headers[x - 1].Image;
-							k = 0;
-							for (int i = 0; i < (Height - SHP.Data[x].HeaderImage.y); i++)
-							{
-								for (int j = 0; j < Width; j++)
-								{
-									headers[x - 1].Image[i + j + k + (Width * SHP.Data[x].HeaderImage.y)] = FData[i + j + k];
-									if (j == (Width - 1))
-									{
-										k = k + (Width - 1);
-									}
-								}
-							}
-						}
-					}
-					catch (Exception e)
-					{
-						Console.WriteLine(e.Message);
-					}
-				}
-				// Set the shp's databuffer to the result after decompression
-			}
-			//Width = Width2;
-			//Height = Height2;
-		}
-
-		public HeaderImage this[int index]
-		{
-			get { return headers[index]; }
-		}
-		
-		public static void ReInterpretWordFromBytes(byte Byte1, byte Byte2, ref ushort FullValue)
-		{
-			FullValue = (ushort)((Byte2 * 256) + Byte1);
-		}
-
-		public static void ReInterpretWordFromBytes(byte Byte1, byte Byte2, ref uint FullValue)
-		{
-			FullValue = (uint)((Byte2 * 256) + Byte1);
-		}
-
-		// Compression 3:
-		public static void Decode3(byte[] Source, ref byte[] Dest, int cx, int cy, ref int max)
-		{
-			int SP;
-			int DP;
-			int x;
-			int y;
-			int Count;
-			int v;
-			int maxdp;
-			ushort Pos;
-			maxdp = cx * cy;
-			SP = 0;
-			DP = 0;
-			Pos = 0;
-			try
-			{
-				for (y = 1; y <= cy; y++)
-				{
-					ReInterpretWordFromBytes(Source[SP], Source[SP + 1], ref Pos);
-
-					Count = Pos - 2;
-
-					SP = SP + 2;
-
-					x = 0;
-					while (Count > 0)
-					{
-						Count = Count - 1;
-						if ((SP > max) || (DP > maxdp))
-						{
-							break;
-						}
-						else
-						{
-							// SP has reached max value, exit
-							v = Source[SP];
-							SP++;
-							if (v != 0)
-							{
-								if ((SP > max) || (DP > maxdp))
-								{
-									break;
-								}
-								else
-								{
-									x++;
-									Dest[DP] += (byte)v;
-								}
-								DP++;
-							}
-							else
-							{
-								Count -= 1;
-								v = Source[SP];
-
-								SP++;
-								if ((x + v) > cx)
-								{
-									v = cx - x;
-								}
-								x = x + v;
-								while (v > 0)
-								{
-									if ((SP > max) || (DP > maxdp))
-									{
-										break;
-									}
-									else
-									{
-										v -= 1;
-										Dest[DP] = 0;
-
-									}
-									DP++;
-									// SP has reached max value, exit
-								}
-							}
-						}
-					}
-					if ((SP >= max) || (DP >= maxdp))
-					{
-						return;
-					}
-					// SP has reached max value, exit
-				}
-			}
-
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-			}
-
-		}
-
-		public static void Decode2(byte[] Source, ref byte[] Dest, int cx, int cy, ref int max)
-		{
-			int SP;
-			int DP;
-			int y;
-			int Count;
-			int maxdp;
-			ushort Pos;
-			maxdp = cx * cy;
-			SP = 0;
-			DP = 0;
-			Pos = 0;
-			try
-			{
-				for (y = 1; y <= cy; y++)
-				{
-					ReInterpretWordFromBytes(Source[SP], Source[SP + 1], ref Pos);
-					Count = Pos - 2;
-					SP += 2;
-					while (Count > 0)
-					{
-						Count -= 1;
-						if ((SP > max) || (DP > maxdp))
-						{
-							return;
-						}
-						// SP has reached max value, exit
-						Dest[DP] = Source[SP];
-						SP++;
-						DP++;
-					}
-					if ((SP >= max) || (DP >= maxdp))
-					{
-						return;
-					}
-					// SP has reached max value, exit
-				}
-			}
-			catch (Exception e)
-			{
-				Console.WriteLine(e.Message);
-			}
-		}
-
-		public IEnumerator<HeaderImage> GetEnumerator()
-		{
-			return headers.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-
-		public Size Size { get { return new Size(Width, Height); } }
-	}
-}

OpenRA.FileFormats/Graphics/ShpWriter.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.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	// format80-only SHP writer
-
-	public static class ShpWriter
-	{
-		public static void Write(Stream s, int width, int height, IEnumerable<byte[]> frames)
-		{
-			var compressedFrames = frames.Select(f => Format80.Encode(f)).ToArray();
-
-			// note: end-of-file and all-zeroes headers
-			var dataOffset = 14 + (compressedFrames.Length + 2) * ImageHeader.SizeOnDisk;
-
-			using (var bw = new BinaryWriter(s))
-			{
-				bw.Write((ushort)compressedFrames.Length);
-				bw.Write((ushort)0);	// unused
-				bw.Write((ushort)0);	// unused
-				bw.Write((ushort)width);
-				bw.Write((ushort)height);
-				bw.Write((uint)0);		// unused
-
-				foreach (var f in compressedFrames)
-				{
-					var ih = new ImageHeader { Format = Format.Format80, Offset = (uint)dataOffset };
-					dataOffset += f.Length;
-
-					ih.WriteTo(bw);
-				}
-
-				var eof = new ImageHeader { Offset = (uint)dataOffset };
-				eof.WriteTo(bw);
-
-				var allZeroes = new ImageHeader { };
-				allZeroes.WriteTo(bw);
-
-				foreach (var f in compressedFrames)
-					bw.Write(f);
-			}
-		}
-	}
-}

OpenRA.FileFormats/Graphics/TileSetRenderer.cs

@@ -1,97 +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.Drawing.Imaging;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace OpenRA.FileFormats
-{
-	public class TileSetRenderer
-	{
-		public TileSet TileSet;
-		Dictionary<ushort, List<byte[]>> templates;
-		public Size TileSize;
-
-		List<byte[]> LoadTemplate(string filename, string[] exts, Cache<string, R8Reader> r8cache, int[] frames)
-		{
-			if (exts.Contains(".R8") && FileSystem.Exists(filename + ".R8"))
-			{
-				var data = new List<byte[]>();
-
-				foreach (var f in frames)
-					data.Add(f >= 0 ? r8cache[filename][f].Image : null);
-
-				return data;
-			}
-
-			using (var s = FileSystem.OpenWithExts(filename, exts))
-				return new Terrain(s).TileBitmapBytes;
-		}
-
-		public TileSetRenderer(TileSet tileset, Size tileSize)
-		{
-			this.TileSet = tileset;
-			this.TileSize = tileSize;
-
-			templates = new Dictionary<ushort, List<byte[]>>();
-			var r8cache = new Cache<string, R8Reader>(s => new R8Reader(FileSystem.OpenWithExts(s, ".R8")));
-			foreach (var t in TileSet.Templates)
-				templates.Add(t.Key, LoadTemplate(t.Value.Image, tileset.Extensions, r8cache, t.Value.Frames));
-		}
-
-		public Bitmap RenderTemplate(ushort id, Palette p)
-		{
-			var template = TileSet.Templates[id];
-			var templateData = templates[id];
-
-			var bitmap = new Bitmap(TileSize.Width * template.Size.X, TileSize.Height * template.Size.Y,
-				PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				var q = (byte*)data.Scan0.ToPointer();
-				var stride = data.Stride;
-
-				for (var u = 0; u < template.Size.X; u++)
-					for (var v = 0; v < template.Size.Y; v++)
-						if (templateData[u + v * template.Size.X] != null)
-						{
-							var rawImage = templateData[u + v * template.Size.X];
-							for (var i = 0; i < TileSize.Width; i++)
-								for (var j = 0; j < TileSize.Height; j++)
-									q[(v * TileSize.Width + j) * stride + u * TileSize.Width + i] = rawImage[i + TileSize.Width * j];
-						}
-						else
-						{
-							for (var i = 0; i < TileSize.Width; i++)
-								for (var j = 0; j < TileSize.Height; j++)
-									q[(v * TileSize.Width + j) * stride + u * TileSize.Width + i] = 0;
-						}
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		public List<byte[]> Data(ushort id)
-		{
-			return templates[id];
-		}
-	}
-}

OpenRA.FileFormats/Manifest.cs

@@ -1,80 +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.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	/* describes what is to be loaded in order to run a set of mods */
-
-	public class Manifest
-	{
-		public readonly string[]
-			Mods, Folders, MapFolders, Rules, ServerTraits,
-			Sequences, VoxelSequences, Cursors, Chrome, Assemblies, ChromeLayout,
-			Weapons, Voices, Notifications, Music, Movies, Translations, TileSets,
-			ChromeMetrics, PackageContents;
-
-		public readonly Dictionary<string, string> Packages;
-		public readonly MiniYaml LoadScreen;
-		public readonly MiniYaml LobbyDefaults;
-		public readonly Dictionary<string, Pair<string,int>> Fonts;
-		public readonly int TileSize = 24;
-
-		public Manifest(string[] mods)
-		{
-			Mods = mods;
-			var yaml = new MiniYaml(null, mods
-				.Select(m => MiniYaml.FromFile("mods{0}{1}{0}mod.yaml".F(Path.DirectorySeparatorChar, m)))
-				.Aggregate(MiniYaml.MergeLiberal)).NodesDict;
-
-			// 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");
-
-			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 = int.Parse(yaml["TileSize"].Value);
-		}
-
-		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/Terrain.cs

@@ -1,77 +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.IO;
-
-namespace OpenRA.FileFormats
-{
-	public class Terrain
-	{
-		public readonly List<byte[]> TileBitmapBytes = new List<byte[]>();
-		public readonly int Width;
-		public readonly int Height;
-
-		public Terrain(Stream s)
-		{
-			// Try loading as a cnc .tem
-			Width = s.ReadUInt16();
-			Height = s.ReadUInt16();
-
-			/*NumTiles = */s.ReadUInt16();
-			/*Zero1 = */s.ReadUInt16();
-			/*uint Size = */s.ReadUInt32();
-			var imgStart = s.ReadUInt32();
-			/*Zero2 = */s.ReadUInt32();
-
-			int indexEnd, indexStart;
-
-			// ID1 = FFFFh for cnc
-			if (s.ReadUInt16() == 65535) 
-			{
-				/*ID2 = */s.ReadUInt16();
-				indexEnd = s.ReadInt32();
-				indexStart = s.ReadInt32();
-			}
-			else
-			{
-				// Load as a ra .tem
-				s.Position = 0;
-				Width = s.ReadUInt16();
-				Height = s.ReadUInt16();
-
-				/*NumTiles = */s.ReadUInt16();
-				s.ReadUInt16();
-				/*XDim = */s.ReadUInt16();
-				/*YDim = */s.ReadUInt16();
-				/*uint FileSize = */s.ReadUInt32();
-				imgStart = s.ReadUInt32();
-				s.ReadUInt32();
-				s.ReadUInt32();
-				indexEnd = s.ReadInt32();
-				s.ReadUInt32();
-				indexStart = s.ReadInt32();
-			}
-
-			s.Position = indexStart;
-
-			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
-			{
-				if (b != 255)
-				{
-					s.Position = imgStart + b * Width * Height;
-					TileBitmapBytes.Add(s.ReadBytes(Width * Height));
-				}
-				else
-					TileBitmapBytes.Add(null);
-			}
-		}
-	}
-}

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -1,182 +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\Dune2ShpReader.cs" />
-    <Compile Include="Graphics\IGraphicsDevice.cs" />
-    <Compile Include="Graphics\IInputHandler.cs" />
-    <Compile Include="Graphics\PngLoader.cs" />
-    <Compile Include="Graphics\ShpReader.cs" />
-    <Compile Include="Graphics\ShpWriter.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\Terrain.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="Graphics\TileSetRenderer.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" />
-  </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/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.Game/Actor.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,
@@ -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
 	{
 		public readonly ActorInfo Info;
 
@@ -28,8 +31,11 @@ namespace OpenRA
 
 		Lazy<IOccupySpace> occupySpace;
 		Lazy<IFacing> facing;
+		Lazy<Health> health;
+		Lazy<IEffectiveOwner> effectiveOwner;
 
 		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
+		public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } }
 
 		public CPos Location { get { return occupySpace.Value.TopLeft; } }
 		public WPos CenterPosition { get { return occupySpace.Value.CenterPosition; } }
@@ -59,28 +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>());
+			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)
@@ -92,7 +97,11 @@ namespace OpenRA
 
 		public void Tick()
 		{
+			var wasIdle = IsIdle;
 			currentActivity = Traits.Util.RunActivity(this, currentActivity);
+			if (!wasIdle && IsIdle)
+				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
+					n.OnBecomingIdle(this);
 		}
 
 		public bool IsIdle
@@ -100,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; }
@@ -210,5 +224,61 @@ namespace OpenRA
 					t.OnOwnerChanged(this, oldOwner, newOwner);
 			});
 		}
+
+		public bool IsDead()
+		{
+			if (Destroyed)
+				return true;
+
+			return (health.Value == null) ? false : health.Value.IsDead;
+		}
+
+		public bool IsDisguised()
+		{
+			return effectiveOwner.Value != null && effectiveOwner.Value.Disguised;
+		}
+
+		public void Kill(Actor attacker)
+		{
+			if (health.Value == null)
+				return;
+
+			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

@@ -10,13 +10,13 @@
 
 using System;
 using System.Drawing;
+using Eluant;
+using Eluant.ObjectBinding;
+using OpenRA.Scripting;
 
 namespace OpenRA
 {
-	/// <summary>
-	/// Cell coordinate position in the world (coarse).
-	/// </summary>
-	public struct CPos
+	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding
 	{
 		public readonly int X, Y;
 
@@ -54,15 +54,62 @@ namespace OpenRA
 
 		public override bool Equals(object obj)
 		{
-			if (obj == null)
-				return false;
-
-			CPos o = (CPos)obj;
-			return o == this;
+			var o = obj as CPos?;
+			return o != null && o == this;
 		}
 
 		public override string ToString() { return "{0},{1}".F(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
 	}
 
 	public static class RectangleExtensions

OpenRA.Game/CVec.cs

@@ -10,13 +10,13 @@
 
 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
 	{
 		public readonly int X, Y;
 
@@ -65,11 +65,8 @@ namespace OpenRA
 
 		public override bool Equals(object obj)
 		{
-			if (obj == null)
-				return false;
-
-			CVec o = (CVec)obj;
-			return o == this;
+			var o = obj as CVec?;
+			return o != null && o == this;
 		}
 
 		public override string ToString() { return "{0},{1}".F(X, Y); }
@@ -85,5 +82,60 @@ 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;
+					case "Facing": return Traits.Util.GetFacing(this, 0);
+					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

@@ -21,7 +21,7 @@ namespace OpenRA
 
 		public static string FormatErrorMessage(Exception e)
 		{
-			var ex = e as System.Net.WebException;
+			var ex = e as WebException;
 			if (ex == null)
 				return e.Message;
 
@@ -46,15 +46,29 @@ namespace OpenRA
 			wc.DownloadProgressChanged += (_, a) => onProgress(a);
 			wc.DownloadFileCompleted += (_, a) => onComplete(a, cancelled);
 
-			Game.OnQuit += () => Cancel();
-			wc.DownloadFileCompleted += (_, a) => { Game.OnQuit -= () => Cancel(); };
+			Game.OnQuit += Cancel;
+			wc.DownloadFileCompleted += (_, a) => { Game.OnQuit -= Cancel; };
 
 			wc.DownloadFileAsync(new Uri(url), path);
 		}
 
+		public Download(string url, Action<DownloadProgressChangedEventArgs> onProgress, Action<DownloadDataCompletedEventArgs, bool> onComplete)
+		{
+			wc = new WebClient();
+			wc.Proxy = null;
+
+			wc.DownloadProgressChanged += (_, a) => onProgress(a);
+			wc.DownloadDataCompleted += (_, a) => onComplete(a, cancelled);
+
+			Game.OnQuit += Cancel;
+			wc.DownloadDataCompleted += (_, a) => { Game.OnQuit -= Cancel; };
+
+			wc.DownloadDataAsync(new Uri(url));
+		}
+
 		public void Cancel()
 		{
-			Game.OnQuit -= () => Cancel();
+			Game.OnQuit -= Cancel;
 			wc.CancelAsync();
 			cancelled = true;
 		}

OpenRA.Game/Effects/DelayedAction.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Effects
 {

OpenRA.Game/Effects/IEffect.cs

@@ -10,7 +10,6 @@
 
 using System.Collections.Generic;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Effects
 {

OpenRA.Game/Effects/MoveFlash.cs

@@ -9,10 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRA.Effects;
-using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Effects
 {
@@ -24,7 +21,7 @@ namespace OpenRA.Effects
 		public MoveFlash(WPos pos, World world)
 		{
 			this.pos = pos;
-			anim = new Animation("moveflsh");
+			anim = new Animation(world, "moveflsh");
 			anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
 		}
 

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,9 +11,10 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using OpenRA.Support;
 
 namespace OpenRA
 {
@@ -36,6 +37,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);
@@ -83,12 +86,6 @@ namespace OpenRA
 			return (k & mod) == mod;
 		}
 
-		public static bool IsValidInput(this KeyInput key)
-		{
-			return char.IsLetter(key.UnicodeChar) || char.IsDigit(key.UnicodeChar) ||
-					char.IsSymbol(key.UnicodeChar) || char.IsSeparator(key.UnicodeChar) ||
-					char.IsPunctuation(key.UnicodeChar);
-		}
 
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
 			where V : new()
@@ -104,13 +101,13 @@ 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)];
 		}
 
-		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);
@@ -154,7 +151,7 @@ namespace OpenRA
 
 		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)
@@ -256,6 +253,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,
@@ -15,8 +15,10 @@ 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
 	{
@@ -114,7 +116,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 +124,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 +132,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 +140,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 +148,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 +164,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 +184,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);
 			}
@@ -229,7 +238,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,18 +249,41 @@ 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);
 			}
 
+			else if (fieldType == typeof(CPos))
+			{
+				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				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(
+					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))
@@ -270,10 +302,20 @@ namespace OpenRA.FileFormats
 				return ret;
 			}
 
+			else if (fieldType == typeof(Size))
+			{
+				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				return new Size(
+					Exts.ParseIntegerInvariant(parts[0]),
+					Exts.ParseIntegerInvariant(parts[1]));
+			}
+
 			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))
@@ -282,9 +324,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);
 			}
@@ -292,7 +334,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<>))
@@ -310,11 +356,19 @@ 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);
+			}
+
 			UnknownFieldAction("[Type] {0}".F(value), fieldType);
 			return null;
 		}
 
-		static object ParseYesNo(string p, System.Type fieldType, string field)
+		static object ParseYesNo(string p, Type fieldType, string field)
 		{
 			p = p.ToLowerInvariant();
 			if (p == "yes") return true;
@@ -348,10 +402,10 @@ namespace OpenRA.FileFormats
 		}
 
 		[AttributeUsage(AttributeTargets.Field)]
-		public class IgnoreAttribute : Attribute { }
+		public sealed class IgnoreAttribute : Attribute { }
 
 		[AttributeUsage(AttributeTargets.Field)]
-		public class LoadUsingAttribute : Attribute
+		public sealed class LoadUsingAttribute : Attribute
 		{
 			Func<MiniYaml, object> loaderFuncCache;
 			public readonly string Loader;
@@ -386,12 +440,12 @@ namespace OpenRA.FileFormats
 	}
 
 	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-	public class TranslateAttribute : Attribute { }
+	public sealed class TranslateAttribute : Attribute { }
 
-	public class FieldFromYamlKeyAttribute : Attribute { }
+	public sealed class FieldFromYamlKeyAttribute : Attribute { }
 
 	// 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

@@ -15,7 +15,7 @@ using System.Globalization;
 using System.Linq;
 using System.Reflection;
 
-namespace OpenRA.FileFormats
+namespace OpenRA
 {
 	public static class FieldSaver
 	{
@@ -48,7 +48,7 @@ namespace OpenRA.FileFormats
 
 		public static MiniYamlNode SaveField(object o, string field)
 		{
-			return new MiniYamlNode(field, FieldSaver.FormatValue(o, o.GetType().GetField(field)));
+			return new MiniYamlNode(field, FormatValue(o, o.GetType().GetField(field)));
 		}
 
 		public static string FormatValue(object v, Type t)
@@ -82,6 +82,9 @@ namespace OpenRA.FileFormats
 				return elems.JoinWith(",");
 			}
 
+			if (t == typeof(DateTime))
+				return ((DateTime)v).ToString("yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture);
+
 			return v.ToString();
 		}
 

OpenRA.Game/FileFormats/Blowfish.cs

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

@@ -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;
 			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;
 
@@ -60,7 +60,7 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		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;
@@ -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);
@@ -122,7 +122,7 @@ namespace OpenRA.FileFormats
 			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,12 +134,12 @@ 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;
 
@@ -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;
 
@@ -199,7 +199,7 @@ 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;
 
@@ -220,7 +220,7 @@ 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];
 			uint n2_bytelen, bit;
@@ -255,7 +255,7 @@ 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;
 			while ((++n[i] == 0) && (--len > 0)) i++;
@@ -282,7 +282,7 @@ 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
@@ -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;
 
@@ -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);
@@ -348,7 +348,7 @@ namespace OpenRA.FileFormats
 			return i & 0xffff;
 		}
 
-		void dec_bignum(uint[] n, uint len)
+		static void dec_bignum(uint[] n, uint len)
 		{
 			int i = 0;
 			while ((--n[i] == 0xffffffff) && (--len > 0))
@@ -450,7 +450,7 @@ 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++;
 		}

OpenRA.Game/FileFormats/CRC32.cs

@@ -92,7 +92,7 @@ namespace OpenRA.FileFormats
 		/// A fast (native) CRC32 implementation that can be used on a regular byte arrays.
 		/// </summary>
 		/// <param name="data">The data from which to calculate the checksum.</param>
-		/// <param name="polynomal">The polynomal.</param>
+		/// <param name="polynomial">The polynomial.</param>
 		/// <returns>
 		/// The calculated checksum.
 		/// </returns>
@@ -115,7 +115,7 @@ namespace OpenRA.FileFormats
 		/// </summary>
 		/// <param name="data">		[in,out] If non-null, the.</param>
 		/// <param name="len">		The length of the data data.</param>
-		/// <param name="polynomal">The polynomal to xor with.</param>
+		/// <param name="polynomial">The polynomal to xor with.</param>
 		/// <returns>The calculated checksum.</returns>
 		public static unsafe uint Calculate(byte* data, uint len, uint polynomial)
 		{

OpenRA.Game/FileFormats/Format2.cs

@@ -12,25 +12,22 @@ namespace OpenRA.FileFormats
 {
 	public static class Format2
 	{
-		public static int DecodeInto(byte[] src, byte[] dest)
+		public static void DecodeInto(byte[] src, byte[] dest, int destIndex)
 		{
-			FastByteReader r = new FastByteReader(src);
+			var r = new FastByteReader(src);
 
-			int i = 0;
 			while (!r.Done())
 			{
-				byte cmd = r.ReadByte();
+				var cmd = r.ReadByte();
 				if (cmd == 0)
 				{
-					byte count = r.ReadByte();
+					var count = r.ReadByte();
 					while (count-- > 0)
-						dest[i++] = 0;
+						dest[destIndex++] = 0;
 				}
 				else
-					dest[i++] = cmd;
+					dest[destIndex++] = cmd;
 			}
-
-			return i;
 		}
 	}
 }

OpenRA.Game/FileFormats/Format80.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * 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,
@@ -27,7 +27,7 @@ namespace OpenRA.FileFormats
 		public byte ReadByte() { return src[offset++]; }
 		public int ReadWord()
 		{
-			int x = ReadByte();
+			var x = ReadByte();
 			return x | (ReadByte() << 8);
 		}
 
@@ -42,84 +42,84 @@ namespace OpenRA.FileFormats
 
 	public static class Format80
 	{
-		static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count )
+		static void ReplicatePrevious(byte[] dest, int destIndex, int srcIndex, int count)
 		{
-			if( srcIndex > destIndex )
+			if (srcIndex > destIndex)
 				throw new NotImplementedException("srcIndex > destIndex {0} {1}".F(srcIndex, destIndex));
 
-			if( destIndex - srcIndex == 1 )
+			if (destIndex - srcIndex == 1)
 			{
-				for( int i = 0 ; i < count ; i++ )
-					dest[ destIndex + i ] = dest[ destIndex - 1 ];
+				for (var i = 0; i < count; i++)
+					dest[destIndex + i] = dest[destIndex - 1];
 			}
 			else
 			{
-				for( int i = 0 ; i < count ; i++ )
-					dest[ destIndex + i ] = dest[ srcIndex + i ];
+				for (var i = 0; i < count; i++)
+					dest[destIndex + i] = dest[srcIndex + i];
 			}
 		}
 
-		public static int DecodeInto( byte[] src, byte[] dest )
+		public static int DecodeInto(byte[] src, byte[] dest)
 		{
 			var ctx = new FastByteReader(src);
-			int destIndex = 0;
+			var destIndex = 0;
 
-			while( true )
+			while (true)
 			{
-				byte i = ctx.ReadByte();
-				if( ( i & 0x80 ) == 0 )
+				var i = ctx.ReadByte();
+				if ((i & 0x80) == 0)
 				{
 					// case 2
-					byte secondByte = ctx.ReadByte();
-					int count = ( ( i & 0x70 ) >> 4 ) + 3;
-					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
+					var secondByte = ctx.ReadByte();
+					var count = ((i & 0x70) >> 4) + 3;
+					var rpos = ((i & 0xf) << 8) + secondByte;
 
-					ReplicatePrevious( dest, destIndex, destIndex - rpos, count );
+					ReplicatePrevious(dest, destIndex, destIndex - rpos, count);
 					destIndex += count;
 				}
-				else if( ( i & 0x40 ) == 0 )
+				else if ((i & 0x40) == 0)
 				{
 					// case 1
-					int count = i & 0x3F;
-					if( count == 0 )
+					var count = i & 0x3F;
+					if (count == 0)
 						return destIndex;
 
-					ctx.CopyTo( dest, destIndex, count );
+					ctx.CopyTo(dest, destIndex, count);
 					destIndex += count;
 				}
 				else
 				{
-					int count3 = i & 0x3F;
-					if( count3 == 0x3E )
+					var count3 = i & 0x3F;
+					if (count3 == 0x3E)
 					{
 						// case 4
-						int count = ctx.ReadWord();
-						byte color = ctx.ReadByte();
+						var count = ctx.ReadWord();
+						var color = ctx.ReadByte();
 
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] = color;
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] = color;
 					}
-					else if( count3 == 0x3F )
+					else if (count3 == 0x3F)
 					{
 						// case 5
-						int count = ctx.ReadWord();
-						int srcIndex = ctx.ReadWord();
-						if( srcIndex >= destIndex )
+						var count = ctx.ReadWord();
+						var srcIndex = ctx.ReadWord();
+						if (srcIndex >= destIndex)
 							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
 
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] = dest[ srcIndex++ ];
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] = dest[srcIndex++];
 					}
 					else
 					{
 						// case 3
-						int count = count3 + 3;
-						int srcIndex = ctx.ReadWord();
-						if( srcIndex >= destIndex )
+						var count = count3 + 3;
+						var srcIndex = ctx.ReadWord();
+						if (srcIndex >= destIndex)
 							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
 
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] = dest[ srcIndex++ ];
+						for (var end = destIndex + count; destIndex < end; destIndex++)
+							dest[destIndex] = dest[srcIndex++];
 					}
 				}
 			}

OpenRA.Game/FileFormats/HvaReader.cs

@@ -9,9 +9,7 @@
 
 #endregion
 
-using System;
 using System.IO;
-using System.Linq;
 
 namespace OpenRA.FileFormats
 {

OpenRA.Game/FileFormats/IniFile.cs

@@ -56,7 +56,7 @@ namespace OpenRA.FileFormats
 		IniSection ProcessSection(string line)
 		{
 			Match m = sectionPattern.Match(line);
-			if (m == null || !m.Success)
+			if (!m.Success)
 				return null;
 			string sectionName = m.Groups[1].Value.ToLowerInvariant();
 
@@ -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)

OpenRA.Game/FileFormats/PngLoader.cs

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

OpenRA.Game/FileFormats/R8Reader.cs

@@ -8,22 +8,21 @@
  */
 #endregion
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Linq;
+using OpenRA.Graphics;
 
 namespace OpenRA.FileFormats
 {
-	public class R8Image
+	class R8Image : ISpriteFrame
 	{
-		public readonly Size Size;
-		public readonly int2 Offset;
-		public readonly byte[] Image;
-
-		// Legacy variable. Can be removed when the utility command is made sensible.
-		public readonly Size FrameSize;
+		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)
 		{
@@ -53,7 +52,7 @@ namespace OpenRA.FileFormats
 			// Skip alignment byte
 			s.ReadUInt8();
 
-			Image = s.ReadBytes(width*height);
+			Data = s.ReadBytes(width*height);
 
 			// Ignore palette
 			if (type == 1 && paletteOffset != 0)
@@ -61,33 +60,20 @@ namespace OpenRA.FileFormats
 		}
 	}
 
-	public class R8Reader : IEnumerable<R8Image>
+	public class R8Reader : ISpriteSource
 	{
-		readonly List<R8Image> headers = new List<R8Image>();
+		readonly List<ISpriteFrame> frames = new List<ISpriteFrame>();
+		public IEnumerable<ISpriteFrame> Frames { get { return frames; } }
+		public bool CacheWhenLoadingTileset { get { return true; } }
 
-		public readonly int Frames;
+		public readonly int ImageCount;
 		public R8Reader(Stream stream)
 		{
 			while (stream.Position < stream.Length)
 			{
-				headers.Add(new R8Image(stream));
-				Frames++;
+				frames.Add(new R8Image(stream));
+				ImageCount++;
 			}
 		}
-
-		public R8Image this[int index]
-		{
-			get { return headers[index]; }
-		}
-
-		public IEnumerator<R8Image> GetEnumerator()
-		{
-			return headers.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
 	}
 }

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -0,0 +1,124 @@
+#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;
+using OpenRA.Network;
+
+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)
+			string 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
+			int 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,115 @@
+#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;
+using OpenRA.Graphics;
+
+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
+	{
+		readonly List<ISpriteFrame> frames = new List<ISpriteFrame>();
+		public IEnumerable<ISpriteFrame> Frames { get { return frames; } }
+		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];
+				frames.Add(new Frame(s));
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/ShpReader.cs

@@ -0,0 +1,203 @@
+#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.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>();
+		Lazy<IEnumerable<ISpriteFrame>> spriteFrames;
+		public IEnumerable<ISpriteFrame> Frames { get { return spriteFrames.Value; } }
+		public bool CacheWhenLoadingTileset { get { return false; } }
+		public readonly Size Size;
+
+		int recurseDepth = 0;
+		readonly int imageCount;
+
+		public ShpReader(Stream stream)
+		{
+			imageCount = stream.ReadUInt16();
+			stream.Position += 4;
+			var width = stream.ReadUInt16();
+			var height = stream.ReadUInt16();
+			Size = new Size(width, height);
+
+			stream.Position += 4;
+			for (var i = 0; i < imageCount; i++)
+				headers.Add(new ImageHeader(stream, this));
+
+			// Skip eof and zero headers
+			stream.Position += 16;
+
+			var offsets = headers.ToDictionary(h => h.FileOffset, h => h);
+			for (var i = 0; i < imageCount; i++)
+			{
+				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));
+			}
+
+			foreach (var h in headers)
+				Decompress(stream, h);
+
+			spriteFrames = Exts.Lazy(() => headers.Cast<ISpriteFrame>());
+		}
+
+		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)
+		{
+			// No extra work is required for empty frames
+			if (h.Size.Width == 0 || h.Size.Height == 0)
+				return;
+
+			if (recurseDepth > imageCount)
+				throw new InvalidDataException("Format20/40 headers contain infinite loop");
+
+			switch (h.Format)
+			{
+				case Format.Format20:
+				case Format.Format40:
+				{
+					if (h.RefImage.Data == null)
+					{
+						++recurseDepth;
+						Decompress(stream, h.RefImage);
+						--recurseDepth;
+					}
+
+					h.Data = CopyImageData(h.RefImage.Data);
+					Format40.DecodeInto(ReadCompressedData(stream, h), h.Data);
+					break;
+				}
+
+				case Format.Format80:
+				{
+					var imageBytes = new byte[Size.Width * Size.Height];
+					Format80.DecodeInto(ReadCompressedData(stream, h), imageBytes);
+					h.Data = imageBytes;
+					break;
+				}
+
+				default:
+					throw new InvalidDataException();
+			}
+		}
+
+		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];
+
+			return imageData;
+		}
+
+		public static ShpReader Load(string filename)
+		{
+			using (var s = File.OpenRead(filename))
+				return new ShpReader(s);
+		}
+
+		public static void Write(Stream s, Size size, IEnumerable<byte[]> frames)
+		{
+			var compressedFrames = frames.Select(f => Format80.Encode(f)).ToArray();
+
+			// note: end-of-file and all-zeroes headers
+			var dataOffset = 14 + (compressedFrames.Length + 2) * 8;
+
+			using (var bw = new BinaryWriter(s))
+			{
+				bw.Write((ushort)compressedFrames.Length);
+				bw.Write((ushort)0);
+				bw.Write((ushort)0);
+				bw.Write((ushort)size.Width);
+				bw.Write((ushort)size.Height);
+				bw.Write((uint)0);
+
+				foreach (var f in compressedFrames)
+				{
+					var ih = new ImageHeader { Format = Format.Format80, FileOffset = (uint)dataOffset };
+					dataOffset += f.Length;
+
+					ih.WriteTo(bw);
+				}
+
+				var eof = new ImageHeader { FileOffset = (uint)dataOffset };
+				eof.WriteTo(bw);
+
+				var allZeroes = new ImageHeader { };
+				allZeroes.WriteTo(bw);
+
+				foreach (var f in compressedFrames)
+					bw.Write(f);
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/ShpTSReader.cs

@@ -0,0 +1,104 @@
+#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.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using OpenRA.Graphics;
+
+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>();
+		Lazy<IEnumerable<ISpriteFrame>> spriteFrames;
+		public IEnumerable<ISpriteFrame> Frames { get { return spriteFrames.Value; } }
+		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);
+					}
+				}
+			}
+
+			spriteFrames = Exts.Lazy(() => frames.Cast<ISpriteFrame>());
+		}
+	}
+}

OpenRA.Game/FileFormats/TmpRAReader.cs

@@ -0,0 +1,51 @@
+#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;
+using OpenRA.Graphics;
+
+namespace OpenRA.FileFormats
+{
+	public class TmpRAReader : ISpriteSource
+	{
+		readonly List<ISpriteFrame> tiles = new List<ISpriteFrame>();
+		public IEnumerable<ISpriteFrame> Frames { get { return tiles; } }
+		public bool CacheWhenLoadingTileset { get { return false; } }
+
+		public TmpRAReader(Stream s)
+		{
+			var width = s.ReadUInt16();
+			var height = s.ReadUInt16();
+			var size = new Size(width, height);
+
+			s.Position += 12;
+			var imgStart = s.ReadUInt32();
+			s.Position += 8;
+			var indexEnd = s.ReadInt32();
+			s.Position += 4;
+			var indexStart = s.ReadInt32();
+
+			s.Position = indexStart;
+			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
+			{
+				if (b != 255)
+				{
+					s.Position = imgStart + b * width * height;
+					tiles.Add(new TmpTile(s.ReadBytes(width * height), size));
+				}
+				else
+					tiles.Add(new TmpTile(null, size));
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/TmpTDReader.cs

@@ -0,0 +1,69 @@
+#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.Linq;
+using System.IO;
+using OpenRA.Graphics;
+
+namespace OpenRA.FileFormats
+{
+	public class TmpTile : ISpriteFrame
+	{
+		public Size Size { get; private set; }
+		public Size FrameSize { get; private set; }
+		public float2 Offset { get { return float2.Zero; } }
+		public byte[] Data { get; set; }
+
+		public TmpTile(byte[] data, Size size)
+		{
+			FrameSize = size;
+			Data = data;
+
+			if (data == null)
+				Data = new byte[0];
+			else
+				Size = size;
+		}
+	}
+
+	public class TmpTDReader : ISpriteSource
+	{
+		readonly List<ISpriteFrame> tiles = new List<ISpriteFrame>();
+		public IEnumerable<ISpriteFrame> Frames { get { return tiles; } }
+		public bool CacheWhenLoadingTileset { get { return false; } }
+
+		public TmpTDReader(Stream s)
+		{
+			var width = s.ReadUInt16();
+			var height = s.ReadUInt16();
+			var size = new Size(width, height);
+
+			s.Position += 8;
+			var imgStart = s.ReadUInt32();
+			s.Position += 8;
+			var indexEnd = s.ReadInt32();
+			var indexStart = s.ReadInt32();
+
+			s.Position = indexStart;
+			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
+			{
+				if (b != 255)
+				{
+					s.Position = imgStart + b * width * height;
+					tiles.Add(new TmpTile(s.ReadBytes(width * height), size));
+				}
+				else
+					tiles.Add(new TmpTile(null, size));
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/TmpTSReader.cs

@@ -0,0 +1,76 @@
+#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.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using OpenRA.Graphics;
+
+namespace OpenRA.FileFormats
+{
+	public class TmpTSTile : 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 TmpTSTile(Stream s, Size size)
+		{
+			Size = size;
+
+			// Ignore tile header for now
+			s.Position += 52;
+
+			Data = new byte[size.Width * size.Height];
+
+			// Unpack tile data
+			var width = 4;
+			for (var i = 0; i < size.Height; i++)
+			{
+				var start = i * size.Width + (size.Width - width) / 2;
+				for (var j = 0; j < width; j++)
+					Data[start + j] = s.ReadUInt8();
+
+				width += (i < size.Height / 2 - 1? 1 : -1) * 4;
+			}
+
+			// Ignore Z-data for now
+			// Ignore extra data for now
+		}
+	}
+
+	public class TmpTSReader : ISpriteSource
+	{
+		readonly List<ISpriteFrame> tiles = new List<ISpriteFrame>();
+		public IEnumerable<ISpriteFrame> Frames { get { return tiles; } }
+		public bool CacheWhenLoadingTileset { get { return false; } }
+
+		public TmpTSReader(Stream s)
+		{
+			var templateWidth = s.ReadUInt32();
+			var templateHeight = s.ReadUInt32();
+			var tileWidth = s.ReadInt32();
+			var tileHeight = s.ReadInt32();
+			var size = new Size(tileWidth, tileHeight);
+			var offsets = new uint[templateWidth * templateHeight];
+			for (var i = 0; i < offsets.Length; i++)
+				offsets[i] = s.ReadUInt32();
+
+			for (var i = 0; i < offsets.Length; i++)
+			{
+				s.Position = offsets[i];
+				tiles.Add(new TmpTSTile(s, size));
+			}
+		}
+	}
+}

OpenRA.Game/FileFormats/VqaReader.cs

@@ -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++)
@@ -280,7 +280,7 @@ namespace OpenRA.FileFormats
 			get
 			{
 				if (cachedFrame != currentFrame)
-					DecodeFrameData(currentFrame);
+					DecodeFrameData();
 
 				return frameData;
 			}

OpenRA.Game/FileFormats/VxlReader.cs

@@ -9,7 +9,6 @@
 
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 
@@ -41,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];

OpenRA.Game/FileFormats/WavLoader.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.IO;
-using System.Text;
 
 namespace OpenRA.FileFormats
 {

OpenRA.Game/FileSystem/D2kSoundResources.cs

@@ -9,13 +9,10 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Linq;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.FileSystem
 {
 	public class D2kSoundResources : IFolder
 	{
@@ -32,7 +29,7 @@ namespace OpenRA.FileFormats
 			this.filename = filename;
 			this.priority = priority;
 
-			s = FileSystem.Open(filename);
+			s = GlobalFileSystem.Open(filename);
 			s.Seek(0, SeekOrigin.Begin);
 
 			filenames = new List<string>();

OpenRA.Game/FileSystem/Folder.cs

@@ -10,9 +10,8 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.FileSystem
 {
 	public class Folder : IFolder
 	{

OpenRA.Game/FileSystem/GlobalFileSystem.cs

@@ -13,10 +13,23 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using OpenRA.Primitives;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.FileSystem
 {
-	public static class FileSystem
+	public interface IFolder
+	{
+		Stream GetContent(string filename);
+		bool Exists(string filename);
+		IEnumerable<uint> ClassicHashes();
+		IEnumerable<uint> CrcHashes();
+		IEnumerable<string> AllFileNames();
+		void Write(Dictionary<string, byte[]> contents);
+		int Priority { get; }
+		string Name { get; }
+	}
+
+	public static class GlobalFileSystem
 	{
 		public static List<IFolder> MountedFolders = new List<IFolder>();
 		static Cache<uint, List<IFolder>> classicHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
@@ -57,6 +70,8 @@ namespace OpenRA.FileFormats
 				throw new NotImplementedException("Creating .RS archives is unsupported");
 			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
 				throw new NotImplementedException("Creating .Z archives is unsupported");
+			else if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("Creating .PAK archives is unsupported");
 			else
 				return new Folder(filename, order, content);
 		}
@@ -77,6 +92,8 @@ namespace OpenRA.FileFormats
 				return new D2kSoundResources(filename, order);
 			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
 				return new InstallShieldPackage(filename, order);
+			else if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
+				return new PakFile(filename, order);
 			else
 				return new Folder(filename, order);
 		}
@@ -97,7 +114,7 @@ namespace OpenRA.FileFormats
 				name = Platform.SupportDir + name.Substring(1);
 
 			FolderPaths.Add(name);
-			Action a = () => FileSystem.MountInner(OpenPackage(name, annotation, order++));
+			Action a = () => MountInner(OpenPackage(name, annotation, order++));
 
 			if (optional)
 				try { a(); }
@@ -151,18 +168,27 @@ namespace OpenRA.FileFormats
 		public static Stream Open(string filename) { return OpenWithExts(filename, ""); }
 
 		public static Stream OpenWithExts(string filename, params string[] exts)
+		{
+			Stream s;
+			if (!TryOpenWithExts(filename, exts, out s))
+				throw new FileNotFoundException("File not found: {0}".F(filename), filename);
+
+			return s;
+		}
+
+		public static bool TryOpenWithExts(string filename, string[] exts, out Stream s)
 		{
 			if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1)
 			{
 				foreach (var ext in exts)
 				{
-					var s = GetFromCache(PackageHashType.Classic, filename + ext);
+					s = GetFromCache(PackageHashType.Classic, filename + ext);
 					if (s != null)
-						return s;
+						return true;
 
 					s = GetFromCache(PackageHashType.CRC32, filename + ext);
 					if (s != null)
-						return s;
+						return true;
 				}
 			}
 
@@ -174,10 +200,14 @@ namespace OpenRA.FileFormats
 					.FirstOrDefault();
 
 				if (folder != null)
-					return folder.GetContent(filename + ext);
+				{
+					s = folder.GetContent(filename + ext);
+					return true;
+				}
 			}
 
-			throw new FileNotFoundException("File not found: {0}".F(filename), filename);
+			s = null;
+			return false;
 		}
 
 		public static bool Exists(string filename) { return MountedFolders.Any(f => f.Exists(filename)); }
@@ -197,8 +227,8 @@ namespace OpenRA.FileFormats
 			if (assemblyCache.TryGetValue(filename, out a))
 				return a;
 
-			if (FileSystem.Exists(filename))
-				using (var s = FileSystem.Open(filename))
+			if (Exists(filename))
+				using (var s = Open(filename))
 				{
 					var buf = new byte[s.Length];
 					s.Read(buf, 0, buf.Length);

OpenRA.Game/FileSystem/InstallShieldPackage.cs

@@ -11,9 +11,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
+using OpenRA.FileFormats;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.FileSystem
 {
 	public class InstallShieldPackage : IFolder
 	{
@@ -29,7 +29,7 @@ namespace OpenRA.FileFormats
 			this.filename = filename;
 			this.priority = priority;
 			filenames = new List<string>();
-			s = FileSystem.Open(filename);
+			s = GlobalFileSystem.Open(filename);
 
 			// Parse package header
 			BinaryReader reader = new BinaryReader(s);
@@ -62,7 +62,7 @@ namespace OpenRA.FileFormats
 
 		}
 
-		uint ParseDirectory(BinaryReader reader)
+		static uint ParseDirectory(BinaryReader reader)
 		{
 			// Parse directory header
 			var FileCount = reader.ReadUInt16();

OpenRA.Game/FileSystem/MixFile.cs

@@ -13,21 +13,10 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using OpenRA.FileFormats;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.FileSystem
 {
-	public interface IFolder
-	{
-		Stream GetContent(string filename);
-		bool Exists(string filename);
-		IEnumerable<uint> ClassicHashes();
-		IEnumerable<uint> CrcHashes();
-		IEnumerable<string> AllFileNames();
-		void Write(Dictionary<string, byte[]> contents);
-		int Priority { get; }
-		string Name { get; }
-	}
-
 	public class MixFile : IFolder
 	{
 		readonly Dictionary<uint, PackageEntry> index;
@@ -58,7 +47,7 @@ namespace OpenRA.FileFormats
 			this.filename = filename;
 			this.priority = priority;
 			this.type = type;
-			s = FileSystem.Open(filename);
+			s = GlobalFileSystem.Open(filename);
 
 			// Detect format type
 			s.Seek(0, SeekOrigin.Begin);
@@ -80,11 +69,11 @@ namespace OpenRA.FileFormats
 
 			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
 				"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, (isCncMix ? "C&C" : "RA/TS/RA2"), isEncrypted, dataStart),
-			    null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
+				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
 			);
 		}
 
-		List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
+		static List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
 		{
 			s.Seek(offset, SeekOrigin.Begin);
 			var numFiles = s.ReadUInt16();
@@ -98,7 +87,7 @@ namespace OpenRA.FileFormats
 			return items;
 		}
 
-		MemoryStream DecryptHeader(Stream s, long offset, out long headerEnd)
+		static MemoryStream DecryptHeader(Stream s, long offset, out long headerEnd)
 		{
 			s.Seek(offset, SeekOrigin.Begin);
 
@@ -132,7 +121,7 @@ namespace OpenRA.FileFormats
 			return ms;
 		}
 
-		uint[] ReadBlocks(Stream s, long offset, int count)
+		static uint[] ReadBlocks(Stream s, long offset, int count)
 		{
 			s.Seek(offset, SeekOrigin.Begin);
 
@@ -153,7 +142,7 @@ namespace OpenRA.FileFormats
 			// Maybe we were given a raw hash?
 			uint raw;
 			if (!uint.TryParse(filename, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out raw))
-			    return null;
+				return null;
 
 			if ("{0:X}".F(raw) == filename && index.ContainsKey(raw))
 				return raw;
@@ -210,9 +199,9 @@ namespace OpenRA.FileFormats
 				}
 			}
 
-			if (FileSystem.Exists("global mix database.dat"))
+			if (GlobalFileSystem.Exists("global mix database.dat"))
 			{
-				var db = new XccGlobalDatabase(FileSystem.Open("global mix database.dat"));
+				var db = new XccGlobalDatabase(GlobalFileSystem.Open("global mix database.dat"));
 				foreach (var e in db.Entries)
 				{
 					var hash = PackageEntry.HashFilename(e, type);
@@ -236,7 +225,7 @@ namespace OpenRA.FileFormats
 		{
 			// Cannot modify existing mixfile - rename existing file and
 			// create a new one with original content plus modifications
-			FileSystem.Unmount(this);
+			GlobalFileSystem.Unmount(this);
 
 			// TODO: Add existing data to the contents list
 			if (index.Count > 0)

OpenRA.Game/FileSystem/PackageEntry.cs

@@ -12,8 +12,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using OpenRA.FileFormats;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.FileSystem
 {
 	public enum PackageHashType { Classic, CRC32 }
 

OpenRA.Game/FileSystem/Pak.cs

@@ -0,0 +1,97 @@
+#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.Generic;
+using System.IO;
+
+namespace OpenRA.FileSystem
+{
+	struct Entry
+	{
+		public uint Offset;
+		public uint Length;
+		public string Filename;
+	}
+
+	public class PakFile : IFolder
+	{
+		string filename;
+		int priority;
+		Dictionary<string, Entry> index;
+		Stream stream;
+
+		public PakFile(string filename, int priority)
+		{
+			this.filename = filename;
+			this.priority = priority;
+			index = new Dictionary<string, Entry>();
+			stream = GlobalFileSystem.Open(filename);
+
+			index = new Dictionary<string, Entry>();
+			var offset = stream.ReadUInt32();
+			while (offset != 0)
+			{
+				var file = stream.ReadASCIIZ();
+				var next = stream.ReadUInt32();
+				var length = (next == 0 ? (uint)stream.Length : next) - offset;
+
+				// Ignore duplicate files
+				if (index.ContainsKey(file))
+					continue;
+
+				index.Add(file, new Entry { Offset = offset, Length = length, Filename = file });
+				offset = next;
+			}
+		}
+
+		public Stream GetContent(string filename)
+		{
+			Entry entry;
+			if (!index.TryGetValue(filename, out entry))
+				return null;
+
+			stream.Seek(entry.Offset, SeekOrigin.Begin);
+			var data = new byte[entry.Length];
+			stream.Read(data, 0, (int)entry.Length);
+			return new MemoryStream(data);
+		}
+
+		public IEnumerable<uint> ClassicHashes()
+		{
+			foreach (var filename in index.Keys)
+				yield return PackageEntry.HashFilename(filename, PackageHashType.Classic);
+		}
+
+		public IEnumerable<uint> CrcHashes()
+		{
+			yield break;
+		}
+
+		public IEnumerable<string> AllFileNames()
+		{
+			foreach (var filename in index.Keys)
+				yield return filename;
+		}
+
+		public bool Exists(string filename)
+		{
+			return index.ContainsKey(filename);
+		}
+
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			throw new NotImplementedException("Cannot save Pak archives.");
+		}
+
+		public int Priority { get { return 1000 + priority; } }
+		public string Name { get { return filename; } }
+	}
+}

OpenRA.Game/FileSystem/ZipFile.cs

@@ -10,10 +10,11 @@
 
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using ICSharpCode.SharpZipLib.Zip;
 using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.FileSystem
 {
 	public class ZipFile : IFolder
 	{
@@ -21,6 +22,11 @@ namespace OpenRA.FileFormats
 		SZipFile pkg;
 		int priority;
 
+		static ZipFile()
+		{
+			ZipConstants.DefaultCodePage = Encoding.Default.CodePage;
+		}
+
 		public ZipFile(string filename, int priority)
 		{
 			this.filename = filename;

OpenRA.Game/Game.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,25 +10,24 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
-using OpenRA.FileFormats;
+using OpenRA.FileSystem;
+using MaxMind.GeoIP2;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Network;
+using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Widgets;
 
-using XRandom = OpenRA.Thirdparty.Random;
-
 namespace OpenRA
 {
 	public static class Game
 	{
-		public static int CellSize { get { return modData.Manifest.TileSize; } }
-
 		public static MouseButtonPreference mouseButtonPreference = new MouseButtonPreference();
 
 		public static ModData modData;
@@ -38,15 +37,19 @@ namespace OpenRA
 		internal static OrderManager orderManager;
 		static Server.Server server;
 
-		public static XRandom CosmeticRandom = new XRandom();	// not synced
+		public static MersenneTwister CosmeticRandom = new MersenneTwister(); // not synced
 
 		public static Renderer Renderer;
 		public static bool HasInputFocus = false;
 
-		public static void JoinServer(string host, int port, string password)
+		public static DatabaseReader GeoIpDatabase;
+
+		public static OrderManager JoinServer(string host, int port, string password)
 		{
-			JoinInner(new OrderManager(host, port, password,
-				new ReplayRecorderConnection(new NetworkConnection(host, port), ChooseReplayFilename)));
+			var om = new OrderManager(host, port, password,
+				new ReplayRecorderConnection(new NetworkConnection(host, port), ChooseReplayFilename));
+			JoinInner(om);
+			return om;
 		}
 
 		static string ChooseReplayFilename()
@@ -75,17 +78,18 @@ namespace OpenRA
 		public static int RenderFrame = 0;
 		public static int NetFrameNumber { get { return orderManager.NetFrameNumber; } }
 		public static int LocalTick { get { return orderManager.LocalFrameNumber; } }
-		public const int NetTickScale = 3;		// 120ms net tick for 40ms local tick
+		public const int NetTickScale = 3; // 120 ms net tick for 40 ms local tick
+		public const int Timestep = 40;
+		public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
 
 		public static event Action<OrderManager> ConnectionStateChanged = _ => { };
 		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
 		public static int LocalClientId { get { return orderManager.Connection.LocalClientId; } }
 
-
 		// Hacky workaround for orderManager visibility
 		public static Widget OpenWindow(World world, string widget)
 		{
-			return Ui.OpenWindow(widget, new WidgetArgs() {{ "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer }});
+			return Ui.OpenWindow(widget, new WidgetArgs() { { "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer } });
 		}
 
 		// Who came up with the great idea of making these things
@@ -103,7 +107,7 @@ namespace OpenRA
 		// Load a widget with world, orderManager, worldRenderer args, without adding it to the widget tree
 		public static Widget LoadWidget(World world, string id, Widget parent, WidgetArgs args)
 		{
-			return Game.modData.WidgetLoader.LoadWidget(new WidgetArgs(args)
+			return modData.WidgetLoader.LoadWidget(new WidgetArgs(args)
 			{
 				{ "world", world },
 				{ "orderManager", orderManager },
@@ -111,6 +115,8 @@ namespace OpenRA
 			}, parent, id);
 		}
 
+		// Note: These delayed actions should only be used by widgets or disposing objects
+		// - things that depend on a particular world should be queuing them on the worldactor.
 		static ActionQueue delayedActions = new ActionQueue();
 		public static void RunAfterTick(Action a) { delayedActions.Add(a); }
 		public static void RunAfterDelay(int delay, Action a) { delayedActions.Add(a, delay); }
@@ -135,23 +141,26 @@ namespace OpenRA
 				// worldRenderer is null during the initial install/download screen
 				if (worldRenderer != null)
 				{
-					Game.Renderer.BeginFrame(worldRenderer.Viewport.TopLeft.ToFloat2(), worldRenderer.Viewport.Zoom);
+					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft.ToFloat2(), worldRenderer.Viewport.Zoom);
 					Sound.SetListenerPosition(worldRenderer.Position(worldRenderer.Viewport.CenterLocation));
 					worldRenderer.Draw();
 				}
 				else
-					Game.Renderer.BeginFrame(float2.Zero, 1f);
+					Renderer.BeginFrame(float2.Zero, 1f);
 
 				using (new PerfSample("render_widgets"))
 				{
 					Ui.Draw();
-					var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-					CursorProvider.DrawCursor(Game.Renderer, cursorName, Viewport.LastMousePos, (int)cursorFrame);
+					if (modData != null && modData.CursorProvider != null)
+					{
+						var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
+						modData.CursorProvider.DrawCursor(Renderer, cursorName, Viewport.LastMousePos, (int)cursorFrame);
+					}
 				}
 
 				using (new PerfSample("render_flip"))
 				{
-					Game.Renderer.EndFrame(new DefaultInputHandler(orderManager.world));
+					Renderer.EndFrame(new DefaultInputHandler(orderManager.world));
 				}
 			}
 
@@ -165,16 +174,34 @@ namespace OpenRA
 
 		static void TickInner(OrderManager orderManager)
 		{
-			int t = Environment.TickCount;
-			int dt = t - orderManager.LastTickTime;
-			if (dt >= Settings.Game.Timestep)
+			var tick = Environment.TickCount;
+
+			var world = orderManager.world;
+			var uiTickDelta = tick - Ui.LastTickTime;
+			if (uiTickDelta >= Timestep)
+			{
+				// Explained below for the world tick calculation
+				var integralTickTimestep = (uiTickDelta / Timestep) * Timestep;
+				Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Timestep;
+
+				Viewport.TicksSinceLastMove += uiTickDelta / Timestep;
+
+				Sync.CheckSyncUnchanged(world, Ui.Tick);
+				cursorFrame += 0.5f;
+			}
+
+			var worldTimestep = world == null ? Timestep : world.Timestep;
+			var worldTickDelta = (tick - orderManager.LastTickTime);
+			if (worldTimestep != 0 && worldTickDelta >= worldTimestep)
 				using (new PerfSample("tick_time"))
 				{
-					orderManager.LastTickTime += Settings.Game.Timestep;
-					Ui.Tick();
-					var world = orderManager.world;
-					if (orderManager.GameStarted)
-						++Viewport.TicksSinceLastMove;
+					// Tick the world to advance the world time to match real time:
+					//    If dt < TickJankThreshold then we should try and catch up by repeatedly ticking
+					//    If dt >= TickJankThreshold then we should accept the jank and progress at the normal rate
+					// dt is rounded down to an integer tick count in order to preserve fractional tick components.
+
+					var integralTickTimestep = (worldTickDelta / worldTimestep) * worldTimestep;
+					orderManager.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : worldTimestep;
 
 					Sound.Tick();
 					Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);
@@ -207,8 +234,6 @@ namespace OpenRA
 								orderManager.LastTickTime = Environment.TickCount;
 
 						Sync.CheckSyncUnchanged(world, () => world.TickRender(worldRenderer));
-
-						cursorFrame += 0.5f;
 					}
 				}
 		}
@@ -220,15 +245,23 @@ namespace OpenRA
 			LobbyInfoChanged();
 		}
 
-		public static event Action BeforeGameStart = () => {};
+		public static event Action BeforeGameStart = () => { };
 		internal static void StartGame(string mapUID, bool isShellmap)
 		{
 			BeforeGameStart();
 
-			var map = modData.PrepareMap(mapUID);
-			orderManager.world = new World(modData.Manifest, map, orderManager, isShellmap);
+			Map map;
+
+			using (new PerfTimer("PrepareMap"))
+				map = modData.PrepareMap(mapUID);
+			using (new PerfTimer("NewWorld"))
+			{
+				orderManager.world = new World(map, orderManager, isShellmap);
+				orderManager.world.Timestep = Timestep;
+			}
 			worldRenderer = new WorldRenderer(orderManager.world);
-			orderManager.world.LoadComplete(worldRenderer);
+			using (new PerfTimer("LoadComplete"))
+				orderManager.world.LoadComplete(worldRenderer);
 
 			if (orderManager.GameStarted)
 				return;
@@ -240,30 +273,15 @@ namespace OpenRA
 			orderManager.LastTickTime = Environment.TickCount;
 			orderManager.StartGame();
 			worldRenderer.RefreshPalette();
-
-			if (!isShellmap)
-				Sound.PlayNotification(null, "Speech", "StartGame", null);
 		}
 
 		public static bool IsHost
 		{
 			get
 			{
-				var client= orderManager.LobbyInfo.ClientWithIndex(
-					orderManager.Connection.LocalClientId);
-				return ((client!=null) && client.IsAdmin);
-			}
-		}
-
-		public static Dictionary<String, Mod> CurrentMods
-		{
-			get
-			{
-				// Initialization hasn't completed yet
-				if (Mod.AllMods == null || modData == null)
-					return null;
-
-				return Mod.AllMods.Where(k => modData.Manifest.Mods.Contains(k.Key)).ToDictionary(k => k.Key, k => k.Value);
+				var id = orderManager.Connection.LocalClientId;
+				var client = orderManager.LobbyInfo.ClientWithIndex(id);
+				return client != null && client.IsAdmin;
 			}
 		}
 
@@ -275,7 +293,7 @@ namespace OpenRA
 		{
 			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
 
-			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
+			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
 
 			Settings = new Settings(Platform.SupportDir + "settings.yaml", args);
 
@@ -286,6 +304,7 @@ namespace OpenRA
 			Log.AddChannel("server", "server.log");
 			Log.AddChannel("sound", "sound.log");
 			Log.AddChannel("graphics", "graphics.log");
+			Log.AddChannel("geoip", "geoip.log");
 
 			if (Settings.Server.DiscoverNatDevices)
 				UPnP.TryNatDiscovery();
@@ -295,10 +314,22 @@ namespace OpenRA
 				Settings.Server.AllowPortForward = false;
 			}
 
-			FileSystem.Mount("."); // Needed to access shaders
-			var renderers = new [] { Settings.Graphics.Renderer, "Sdl2", "Gl", "Cg" };
+			try
+			{
+				GeoIpDatabase = new DatabaseReader("GeoLite2-Country.mmdb");
+			}
+			catch (Exception e)
+			{
+				Log.Write("geoip", "DatabaseReader failed: {0}", e);
+			}
+
+			GlobalFileSystem.Mount("."); // Needed to access shaders
+			var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", null };
 			foreach (var r in renderers)
 			{
+				if (r == null)
+					throw new InvalidOperationException("No suitable renderers were found. Check graphics.log for details.");
+
 				Settings.Graphics.Renderer = r;
 				try
 				{
@@ -311,6 +342,7 @@ namespace OpenRA
 					Console.WriteLine("Renderer initialization failed. Fallback in place. Check graphics.log for details.");
 				}
 			}
+
 			Renderer = new Renderer();
 
 			try
@@ -326,25 +358,22 @@ namespace OpenRA
 			}
 
 			Console.WriteLine("Available mods:");
-			foreach(var mod in Mod.AllMods)
+			foreach (var mod in ModMetadata.AllMods)
 				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
-			InitializeWithMods(Settings.Game.Mods);
+
+			InitializeWithMod(Settings.Game.Mod, args.GetValue("Launch.Replay", null));
 
 			if (Settings.Server.DiscoverNatDevices)
-			{
-				RunAfterDelay(Settings.Server.NatDiscoveryTimeout, () =>
-				              UPnP.TryStoppingNatDiscovery()
-				              );
-			}
+				RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.TryStoppingNatDiscovery);
 		}
 
-		public static void InitializeWithMods(string[] mods)
+		public static void InitializeWithMod(string mod, string replay)
 		{
 			// Clear static state if we have switched mods
-			LobbyInfoChanged = () => {};
-			AddChatLine = (a,b,c) => {};
-			ConnectionStateChanged = om => {};
-			BeforeGameStart = () => {};
+			LobbyInfoChanged = () => { };
+			AddChatLine = (a, b, c) => { };
+			ConnectionStateChanged = om => { };
+			BeforeGameStart = () => { };
 			Ui.ResetAll();
 
 			worldRenderer = null;
@@ -353,19 +382,22 @@ namespace OpenRA
 			if (orderManager != null)
 				orderManager.Dispose();
 
-			// Discard any invalid mods, set RA as default
-			var mm = mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
-			if (mm.Length == 0) mm = new[] { "ra" };
-			Console.WriteLine("Loading mods: {0}", mm.JoinWith(","));
-			Settings.Game.Mods = mm;
+			// Fall back to default if the mod doesn't exist
+			if (!ModMetadata.AllMods.ContainsKey(mod))
+				mod = new GameSettings().Mod;
+
+			Console.WriteLine("Loading mod: {0}", mod);
+			Settings.Game.Mod = mod;
 
 			Sound.StopMusic();
 			Sound.StopVideo();
 			Sound.Initialize();
 
-			modData = new ModData(mm);
+			modData = new ModData(mod);
 			Renderer.InitializeFonts(modData.Manifest);
 			modData.InitializeLoaders();
+			using (new PerfTimer("LoadMaps"))
+				modData.MapCache.LoadMaps();
 
 			PerfHistory.items["render"].hasNormalTick = false;
 			PerfHistory.items["batches"].hasNormalTick = false;
@@ -374,88 +406,115 @@ namespace OpenRA
 
 			JoinLocal();
 
-			if (Game.Settings.Server.Dedicated)
+			if (Settings.Server.Dedicated)
 			{
 				while (true)
 				{
-					Game.Settings.Server.Map = WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map);
-					Game.Settings.Save();
-					Game.CreateServer(new ServerSettings(Game.Settings.Server));
+					Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
+					Settings.Save();
+					CreateServer(new ServerSettings(Settings.Server));
 					while (true)
 					{
 						System.Threading.Thread.Sleep(100);
 
-						if ((server.State == Server.ServerState.GameStarted)
-						    && (server.Conns.Count<=1))
+						if (server.State == Server.ServerState.GameStarted && server.Conns.Count < 1)
 						{
 							Console.WriteLine("No one is playing, shutting down...");
 							server.Shutdown();
 							break;
 						}
 					}
-					if (Game.Settings.Server.DedicatedLoop)
+
+					if (Settings.Server.DedicatedLoop)
 					{
 						Console.WriteLine("Starting a new server instance...");
+						modData.MapCache.LoadMaps();
 						continue;
 					}
-					else
-						break;
+
+					break;
 				}
-				System.Environment.Exit(0);
+
+				Environment.Exit(0);
 			}
 			else
 			{
 				modData.LoadScreen.StartGame();
 				Settings.Save();
+				if (!string.IsNullOrEmpty(replay))
+					Game.JoinReplay(replay);
 			}
 		}
 
 		public static void LoadShellMap()
 		{
-			StartGame(ChooseShellmap(), true);
+			var shellmap = ChooseShellmap();
+
+			using (new PerfTimer("StartGame"))
+				StartGame(shellmap, true);
 		}
 
 		static string ChooseShellmap()
 		{
-			var shellmaps =  modData.AvailableMaps
-				.Where(m => m.Value.UseAsShellmap);
+			var shellmaps = modData.MapCache
+				.Where(m => m.Status == MapStatus.Available && m.Map.UseAsShellmap)
+				.Select(m => m.Uid);
 
-			if (shellmaps.Count() == 0)
+			if (!shellmaps.Any())
 				throw new InvalidDataException("No valid shellmaps available");
 
-			return shellmaps.Random(CosmeticRandom).Key;
+			return shellmaps.Random(CosmeticRandom);
 		}
 
 		static bool quit;
-		public static event Action OnQuit = () => {};
+		public static event Action OnQuit = () => { };
+
+		static double idealFrameTime;
+		public static void SetIdealFrameTime(int fps)
+		{ 
+			idealFrameTime = 1.0 / fps;
+		}
 
 		internal static void Run()
 		{
+			if (Settings.Graphics.MaxFramerate < 1)
+			{
+				Settings.Graphics.MaxFramerate = new GraphicSettings().MaxFramerate;
+				Settings.Graphics.CapFramerate = false;
+			}
+
+			SetIdealFrameTime(Settings.Graphics.MaxFramerate);
+
 			while (!quit)
 			{
-				var idealFrameTime = 1.0 / Settings.Graphics.MaxFramerate;
-				var sw = new Stopwatch();
-
-				Tick(orderManager);
-
 				if (Settings.Graphics.CapFramerate)
 				{
-					var waitTime = idealFrameTime - sw.ElapsedTime();
+					var sw = Stopwatch.StartNew();
+
+					Tick(orderManager);
+
+					var waitTime = Math.Min(idealFrameTime - sw.Elapsed.TotalSeconds, 1);
 					if (waitTime > 0)
-						System.Threading.Thread.Sleep( TimeSpan.FromSeconds(waitTime) );
+						System.Threading.Thread.Sleep(TimeSpan.FromSeconds(waitTime));
 				}
+				else
+					Tick(orderManager);
 			}
 
+			// Ensure that the active replay is properly saved
+			if (orderManager != null)
+				orderManager.Dispose();
+
 			OnQuit();
 		}
 
 		public static void Exit() { quit = true; }
 
-		public static Action<Color,string,string> AddChatLine = (c,n,s) => {};
+		public static Action<Color, string, string> AddChatLine = (c, n, s) => { };
 
 		public static void Debug(string s, params object[] args)
 		{
-			AddChatLine(Color.White, "Debug", String.Format(s,args));
+			AddChatLine(Color.White, "Debug", string.Format(s, args));
 		}
 
 		public static void Disconnect()
@@ -474,15 +533,14 @@ namespace OpenRA
 				server.Shutdown();
 		}
 
-		public static T CreateObject<T>( string name )
+		public static T CreateObject<T>(string name)
 		{
 			return modData.ObjectCreator.CreateObject<T>(name);
 		}
 
 		public static void CreateServer(ServerSettings settings)
 		{
-			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort),
-			                           Game.Settings.Game.Mods, settings, modData);
+			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, modData);
 		}
 
 		public static int CreateLocalServer(string map)
@@ -492,11 +550,10 @@ namespace OpenRA
 				Name = "Skirmish Game",
 				Map = map,
 				AdvertiseOnline = false,
-				AllowPortForward =  false
+				AllowPortForward = false
 			};
 
-			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0),
-			                           Game.Settings.Game.Mods, settings, modData);
+			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, modData);
 
 			return server.Port;
 		}
@@ -505,29 +562,5 @@ namespace OpenRA
 		{
 			return orderManager != null && orderManager.world == world;
 		}
-
-		public static bool DownloadMap(string mapHash)
-		{
-			try
-			{
-				var mod = Game.CurrentMods.FirstOrDefault().Value.Id;
-				var dirPath = "{1}maps{0}{2}".F(Path.DirectorySeparatorChar, Platform.SupportDir, mod);
-				if(!Directory.Exists(dirPath))
-					Directory.CreateDirectory(dirPath);
-				var mapPath = "{1}{0}{2}".F(Path.DirectorySeparatorChar, dirPath, mapHash+".oramap");
-				Console.Write("Trying to download map to {0} ... ".F(mapPath));
-				WebClient webClient = new WebClient();
-				webClient.DownloadFile(Game.Settings.Game.MapRepository + mapHash, mapPath);
-				Game.modData.AvailableMaps.Add(mapHash, new Map(mapPath));
-				Console.WriteLine("done");
-				return true;
-			}
-			catch (WebException e)
-			{
-				Log.Write("debug", "Could not download map '{0}'", mapHash);
-				Log.Write("debug", e.ToString());
-				return false;
-			}
-		}
 	}
 }

OpenRA.Game/GameInformation.cs

@@ -0,0 +1,168 @@
+#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.Linq;
+using OpenRA.Graphics;
+using OpenRA.Network;
+
+namespace OpenRA
+{
+	public class GameInformation
+	{
+		public string MapUid;
+		public string MapTitle;
+		public DateTime StartTimeUtc;
+		// Game end timestamp (when the recoding stopped).
+		public DateTime EndTimeUtc;
+
+		// Gets the game's duration, from the time the game started until the
+		// replay recording stopped.
+		public TimeSpan Duration { get { return EndTimeUtc > StartTimeUtc ? EndTimeUtc - StartTimeUtc : TimeSpan.Zero; } }
+		public IList<Player> Players { get; private set; }
+		public MapPreview MapPreview { get { return Game.modData.MapCache[MapUid]; } }
+		public IEnumerable<Player> HumanPlayers { get { return Players.Where(p => p.IsHuman); } }
+		public bool IsSinglePlayer { get { return HumanPlayers.Count() == 1; } }
+
+		Dictionary<OpenRA.Player, Player> playersByRuntime;
+
+		public GameInformation()
+		{
+			Players = new List<Player>();
+			playersByRuntime = new Dictionary<OpenRA.Player, Player>();
+		}
+
+		public static GameInformation Deserialize(string data)
+		{
+			try
+			{
+				var info = new GameInformation();
+
+				var nodes = MiniYaml.FromString(data);
+				foreach (var node in nodes)
+				{
+					var keyParts = node.Key.Split('@');
+
+					switch (keyParts[0])
+					{
+						case "Root":
+							FieldLoader.Load(info, node.Value);
+							break;
+
+						case "Player":
+							info.Players.Add(FieldLoader.Load<Player>(node.Value));
+							break;
+					}
+				}
+
+				return info;
+			}
+			catch (InvalidOperationException)
+			{
+				Log.Write("debug", "GameInformation deserialized invalid MiniYaml:\n{0}".F(data));
+				throw;
+			}
+		}
+
+		public string Serialize()
+		{
+			var nodes = new List<MiniYamlNode>();
+
+			nodes.Add(new MiniYamlNode("Root", FieldSaver.Save(this)));
+
+			for (var i=0; i<Players.Count; i++)
+				nodes.Add(new MiniYamlNode("Player@{0}".F(i), FieldSaver.Save(Players[i])));
+
+			return nodes.WriteToString();
+		}
+
+		// Adds the player information at start-up.
+		public void AddPlayer(OpenRA.Player runtimePlayer, Session lobbyInfo)
+		{
+			if (runtimePlayer == null)
+				throw new ArgumentNullException("runtimePlayer");
+
+			if (lobbyInfo == null)
+				throw new ArgumentNullException("lobbyInfo");
+
+			// We don't care about spectators and map players
+			if (runtimePlayer.NonCombatant || !runtimePlayer.Playable)
+				return;
+
+			// Find the lobby client that created the runtime player
+			var client = lobbyInfo.ClientWithIndex(runtimePlayer.ClientIndex);
+			if (client == null)
+				return;
+
+			var player = new Player
+			{
+				ClientIndex = runtimePlayer.ClientIndex,
+				Name = runtimePlayer.PlayerName,
+				IsHuman = !runtimePlayer.IsBot,
+				IsBot = runtimePlayer.IsBot,
+				FactionName = runtimePlayer.Country.Name,
+				FactionId = runtimePlayer.Country.Race,
+				Color = runtimePlayer.Color,
+				Team = client.Team,
+				SpawnPoint = runtimePlayer.SpawnPoint,
+				IsRandomFaction = runtimePlayer.Country.Race != client.Country,
+				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint
+			};
+
+			playersByRuntime.Add(runtimePlayer, player);
+			Players.Add(player);
+		}
+
+		// Gets the player information for the specified runtime player instance.
+		public Player GetPlayer(OpenRA.Player runtimePlayer)
+		{
+			Player player;
+
+			playersByRuntime.TryGetValue(runtimePlayer, out player);
+
+			return player;
+		}
+
+		public class Player
+		{
+			//
+			// Start-up information 
+			//
+
+			public int ClientIndex;
+			// The player name, not guaranteed to be unique.
+			public string Name;
+			public bool IsHuman;
+			public bool IsBot;
+			// The faction name (aka Country)
+			public string FactionName;
+			// The faction id (aka Country, aka Race)
+			public string FactionId;
+			public HSLColor Color;
+			// The team id on start-up, or 0 if the player is not part of the team.
+			public int Team;
+			public int SpawnPoint;
+			// True if the faction was chosen at random; otherwise, false
+			public bool IsRandomFaction;
+			// True if the spawn point was chosen at random; otherwise, false.</summary>
+			public bool IsRandomSpawnPoint;
+
+			//
+			// Information gathered at a later stage
+			//
+
+			// The game outcome for this player
+			public WinState Outcome;
+			// The time when this player won or lost the game
+			public DateTime OutcomeTimestampUtc;
+		}
+	}
+}

OpenRA.Game/GameRules/ActorInfo.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA

OpenRA.Game/GameRules/MusicInfo.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.FileFormats;
+using OpenRA.FileSystem;
 
 namespace OpenRA.GameRules
 {
@@ -26,20 +27,20 @@ namespace OpenRA.GameRules
 			var nd = value.NodesDict;
 			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
 			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key)+"."+ext;
-			if (!FileSystem.Exists(Filename))
+			if (!GlobalFileSystem.Exists(Filename))
 				return;
 
 			Exists = true;
-			Length = (int)AudLoader.SoundLength(FileSystem.Open(Filename));
+			Length = (int)AudLoader.SoundLength(GlobalFileSystem.Open(Filename));
 		}
 
 		public void Reload()
 		{
-			if (!FileSystem.Exists(Filename))
+			if (!GlobalFileSystem.Exists(Filename))
 				return;
 
 			Exists = true;
-			Length = (int)AudLoader.SoundLength(FileSystem.Open(Filename));
+			Length = (int)AudLoader.SoundLength(GlobalFileSystem.Open(Filename));
 		}
 	}
 }

OpenRA.Game/GameRules/Rules.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.Generic;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.GameRules;
-
-namespace OpenRA
-{
-	public static class Rules
-	{
-		public static Dictionary<string, ActorInfo> Info;
-		public static Dictionary<string, WeaponInfo> Weapons;
-		public static Dictionary<string, SoundInfo> Voices;
-		public static Dictionary<string, SoundInfo> Notifications;
-		public static Dictionary<string, MusicInfo> Music;
-		public static Dictionary<string, string> Movies;
-		public static Dictionary<string, TileSet> TileSets;
-
-		public static void LoadRules(Manifest m, Map map)
-		{
-			// Added support to extend the list of rules (add it to m.LocalRules)
-			Info = LoadYamlRules(m.Rules, map.Rules, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
-			Weapons = LoadYamlRules(m.Weapons, map.Weapons, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
-			Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new SoundInfo(k.Value));
-			Notifications = LoadYamlRules(m.Notifications, map.Notifications, (k, _) => new SoundInfo(k.Value));
-			Music = LoadYamlRules(m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
-			Movies = LoadYamlRules(m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
-
-			TileSets = new Dictionary<string, TileSet>();
-			foreach (var file in m.TileSets)
-			{
-				var t = new TileSet(file);
-				TileSets.Add(t.Id,t);
-			}
-		}
-
-		static Dictionary<string, T> LoadYamlRules<T>(string[] files, List<MiniYamlNode> dict, Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> f)
-		{
-			var y = files.Select(MiniYaml.FromFile).Aggregate(dict, MiniYaml.MergeLiberal);
-			var yy = y.ToDictionary(x => x.Key, x => x.Value);
-			return y.ToDictionaryWithConflictLog(kv => kv.Key.ToLowerInvariant(), kv => f(kv, yy), "LoadYamlRules", null, null);
-		}
-
-		public static IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }
-	}
-}

OpenRA.Game/GameRules/Ruleset.cs

@@ -0,0 +1,52 @@
+#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.Linq;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+
+namespace OpenRA
+{
+	public class Ruleset
+	{
+		public readonly IReadOnlyDictionary<string, ActorInfo> Actors;
+		public readonly IReadOnlyDictionary<string, WeaponInfo> Weapons;
+		public readonly IReadOnlyDictionary<string, SoundInfo> Voices;
+		public readonly IReadOnlyDictionary<string, SoundInfo> Notifications;
+		public readonly IReadOnlyDictionary<string, MusicInfo> Music;
+		public readonly IReadOnlyDictionary<string, string> Movies;
+		public readonly IReadOnlyDictionary<string, TileSet> TileSets;
+		public readonly IReadOnlyDictionary<string, SequenceProvider> Sequences;
+
+		public Ruleset(
+			IDictionary<string, ActorInfo> actors,
+			IDictionary<string, WeaponInfo> weapons,
+			IDictionary<string, SoundInfo> voices,
+			IDictionary<string, SoundInfo> notifications,
+			IDictionary<string, MusicInfo> music,
+			IDictionary<string, string> movies,
+			IDictionary<string, TileSet> tileSets,
+			IDictionary<string, SequenceProvider> sequences)
+		{
+			Actors = new ReadOnlyDictionary<string, ActorInfo>(actors);
+			Weapons = new ReadOnlyDictionary<string, WeaponInfo>(weapons);
+			Voices = new ReadOnlyDictionary<string, SoundInfo>(voices);
+			Notifications = new ReadOnlyDictionary<string, SoundInfo>(notifications);
+			Music = new ReadOnlyDictionary<string, MusicInfo>(music);
+			Movies = new ReadOnlyDictionary<string, string>(movies);
+			TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
+			Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
+		}
+
+		public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }
+	}
+}

OpenRA.Game/GameRules/RulesetCache.cs

@@ -0,0 +1,142 @@
+#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.Linq;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Support;
+
+namespace OpenRA
+{
+	public class RulesetCache
+	{
+		readonly ModData modData;
+
+		readonly Dictionary<string, ActorInfo> actorCache = new Dictionary<string, ActorInfo>();
+		readonly Dictionary<string, WeaponInfo> weaponCache = new Dictionary<string, WeaponInfo>();
+		readonly Dictionary<string, SoundInfo> voiceCache = new Dictionary<string, SoundInfo>();
+		readonly Dictionary<string, SoundInfo> notificationCache = new Dictionary<string, SoundInfo>();
+		readonly Dictionary<string, MusicInfo> musicCache = new Dictionary<string, MusicInfo>();
+		readonly Dictionary<string, string> movieCache = new Dictionary<string, string>();
+		readonly Dictionary<string, TileSet> tileSetCache = new Dictionary<string, TileSet>();
+		readonly Dictionary<string, SequenceCache> sequenceCaches = new Dictionary<string, SequenceCache>();
+
+		public event EventHandler LoadingProgress;
+		void RaiseProgress()
+		{
+			if (LoadingProgress != null)
+				LoadingProgress(this, new EventArgs());
+		}
+
+		public RulesetCache(ModData modData)
+		{
+			this.modData = modData;
+		}
+
+		public Ruleset LoadDefaultRules()
+		{
+			return LoadMapRules(new Map());
+		}
+
+		public Ruleset LoadMapRules(Map map)
+		{
+			var m = modData.Manifest;
+
+			Dictionary<string, ActorInfo> actors;
+			Dictionary<string, WeaponInfo> weapons;
+			Dictionary<string, SoundInfo> voices;
+			Dictionary<string, SoundInfo> notifications;
+			Dictionary<string, MusicInfo> music;
+			Dictionary<string, string> movies;
+			Dictionary<string, TileSet> tileSets;
+
+			using (new PerfTimer("Actors"))
+				actors = LoadYamlRules(actorCache, m.Rules, map.RuleDefinitions, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
+			using (new PerfTimer("Weapons"))
+				weapons = LoadYamlRules(weaponCache, m.Weapons, map.WeaponDefinitions, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+			using (new PerfTimer("Voices"))
+				voices = LoadYamlRules(voiceCache, m.Voices, map.VoiceDefinitions, (k, _) => new SoundInfo(k.Value));
+			using (new PerfTimer("Notifications"))
+				notifications = LoadYamlRules(notificationCache, m.Notifications, map.NotificationDefinitions, (k, _) => new SoundInfo(k.Value));
+			using (new PerfTimer("Music"))
+				music = LoadYamlRules(musicCache, m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
+			using (new PerfTimer("Movies"))
+				movies = LoadYamlRules(movieCache, m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
+			using (new PerfTimer("TileSets"))
+				tileSets = LoadTileSets(tileSetCache, sequenceCaches, m.TileSets);
+
+			var sequences = sequenceCaches.ToDictionary(kvp => kvp.Key, kvp => new SequenceProvider(kvp.Value, map));
+
+			return new Ruleset(actors, weapons, voices, notifications, music, movies, tileSets, sequences);
+		}
+
+		Dictionary<string, T> LoadYamlRules<T>(
+			Dictionary<string, T> itemCache,
+			string[] files, List<MiniYamlNode> nodes,
+			Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> f)
+		{
+			RaiseProgress();
+
+			var inputKey = string.Concat(string.Join("|", files), "|", nodes.WriteToString());
+
+			var mergedNodes = files
+				.Select(s => MiniYaml.FromFile(s))
+				.Aggregate(nodes, MiniYaml.MergeLiberal);
+
+			Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> wrap = (wkv, wyy) =>
+			{
+				var key = inputKey + wkv.Value.ToLines(wkv.Key).JoinWith("|");
+				T t;
+				if (itemCache.TryGetValue(key, out t))
+					return t;
+
+				t = f(wkv, wyy);
+				itemCache.Add(key, t);
+
+				RaiseProgress();
+				return t;
+			};
+
+			var yy = mergedNodes.ToDictionary(x => x.Key, x => x.Value);
+			var itemSet = mergedNodes.ToDictionaryWithConflictLog(kv => kv.Key.ToLowerInvariant(), kv => wrap(kv, yy), "LoadYamlRules", null, null);
+
+			RaiseProgress();
+			return itemSet;
+		}
+
+		Dictionary<string, TileSet> LoadTileSets(Dictionary<string, TileSet> itemCache, Dictionary<string, SequenceCache> sequenceCaches, string[] files)
+		{
+			var items = new Dictionary<string, TileSet>();
+
+			foreach (var file in files)
+			{
+				TileSet t;
+				if (itemCache.TryGetValue(file, out t))
+					items.Add(t.Id, t);
+				else
+				{
+					t = new TileSet(modData, file);
+					itemCache.Add(file, t);
+
+					// every time we load a tile set, we create a sequence cache for it
+					var sc = new SequenceCache(modData, t);
+					sequenceCaches.Add(t.Id, sc);
+
+					items.Add(t.Id, t);
+				}
+			}
+
+			return items;
+		}
+	}
+}

OpenRA.Game/GameRules/SoundInfo.cs

@@ -26,17 +26,17 @@ namespace OpenRA.GameRules
 		public readonly string[] DisableVariants = { };
 		public readonly string[] DisablePrefixes = { };
 
-		static Dictionary<string, string[]> Load( MiniYaml y, string name )
+		static Dictionary<string, string[]> Load(MiniYaml y, string name)
 		{
-			return y.NodesDict.ContainsKey( name )
-				? y.NodesDict[ name ].NodesDict.ToDictionary(
+			return y.NodesDict.ContainsKey(name)
+				? y.NodesDict[name].NodesDict.ToDictionary(
 					a => a.Key,
-					a => FieldLoader.GetValue<string[]>( "(value)", a.Value.Value ) )
+					a => FieldLoader.GetValue<string[]>("(value)", a.Value.Value))
 				: new Dictionary<string, string[]>();
 		}
 
-		public readonly OpenRA.FileFormats.Lazy<Dictionary<string, SoundPool>> VoicePools;
-		public readonly OpenRA.FileFormats.Lazy<Dictionary<string, SoundPool>> NotificationsPools;
+		public readonly Lazy<Dictionary<string, SoundPool>> VoicePools;
+		public readonly Lazy<Dictionary<string, SoundPool>> NotificationsPools;
 
 		public SoundInfo( MiniYaml y )
 		{
@@ -46,8 +46,8 @@ namespace OpenRA.GameRules
 			Voices = Load(y, "Voices");
 			Notifications = Load(y, "Notifications");
 
-			VoicePools = Lazy.New(() => Voices.ToDictionary( a => a.Key, a => new SoundPool(a.Value) ));
-			NotificationsPools = Lazy.New(() => Notifications.ToDictionary( a => a.Key, a => new SoundPool(a.Value) ));
+			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
+			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary( a => a.Key, a => new SoundPool(a.Value) ));
 		}
 	}
 

OpenRA.Game/GameRules/WeaponInfo.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,8 +18,8 @@ namespace OpenRA.GameRules
 {
 	public class WarheadInfo
 	{
-		[Desc("Distance (in pixels) from the explosion center at which damage is 1/2.")]
-		public readonly int Spread = 1;
+		[Desc("Distance from the explosion center at which damage is 1/2.")]
+		public readonly WRange Spread = new WRange(43);
 		[FieldLoader.LoadUsing("LoadVersus")]
 		[Desc("Damage vs each armortype. 0% = can't target.")]
 		public readonly Dictionary<string, float> Versus;
@@ -27,14 +27,18 @@ namespace OpenRA.GameRules
 		public readonly bool Ore = false;
 		[Desc("Explosion effect to use.")]
 		public readonly string Explosion = null;
+		[Desc("Palette to use for explosion effect.")]
+		public readonly string ExplosionPalette = "effect";
 		[Desc("Explosion effect on hitting water (usually a splash).")]
 		public readonly string WaterExplosion = null;
+		[Desc("Palette to use for effect on hitting water (usually a splash).")]
+		public readonly string WaterExplosionPalette = "effect";
 		[Desc("Type of smudge to apply to terrain.")]
 		public readonly string[] SmudgeType = { };
 		[Desc("Size of the explosion. provide 2 values for a ring effect (outer/inner).")]
 		public readonly int[] Size = { 0, 0 };
 		[Desc("Infantry death animation to use")]
-		public readonly int InfDeath = 1;
+		public readonly string InfDeath = "1";
 		[Desc("Sound to play on impact.")]
 		public readonly string ImpactSound = null;
 		[Desc("Sound to play on impact with water")]
@@ -99,17 +103,17 @@ namespace OpenRA.GameRules
 
 	public class WeaponInfo
 	{
-		public readonly float Range = 0;
+		public readonly WRange Range = WRange.Zero;
 		public readonly string[] Report = null;
 		[Desc("Rate of Fire")]
 		public readonly int ROF = 1;
 		public readonly int Burst = 1;
 		public readonly bool Charges = false;
-		public readonly bool Underwater = false;
+		public readonly string Palette = "effect";
 		public readonly string[] ValidTargets = { "Ground", "Water" };
 		public readonly string[] InvalidTargets = { };
 		public readonly int BurstDelay = 5;
-		public readonly float MinRange = 0;
+		public readonly WRange MinRange = WRange.Zero;
 
 		[FieldLoader.LoadUsing("LoadProjectile")] public IProjectileInfo Projectile;
 		[FieldLoader.LoadUsing("LoadWarheads")] public List<WarheadInfo> Warheads;
@@ -179,13 +183,12 @@ namespace OpenRA.GameRules
 				if (!world.Map.IsInMap(cell))
 					return false;
 
-				if (ValidTargets.Contains("Ground") && world.GetTerrainType(cell) != "Water")
-					return true;
+				var cellInfo = world.GetTerrainInfo(cell);
+				if (!ValidTargets.Intersect(cellInfo.TargetTypes).Any()
+					|| InvalidTargets.Intersect(cellInfo.TargetTypes).Any())
+					return false;
 
-				if (ValidTargets.Contains("Water") && world.GetTerrainType(cell) == "Water")
-					return true;
-
-				return false;
+				return true;
 			}
 
 			return false;

OpenRA.Game/Graphics/Animation.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,
@@ -15,22 +15,30 @@ namespace OpenRA.Graphics
 {
 	public class Animation
 	{
-		string name;
 		public Sequence CurrentSequence { get; private set; }
 		public bool IsDecoration = false;
+		public Func<bool> Paused;
+
+		readonly Func<int> facingFunc;
+
 		int frame = 0;
 		bool backwards = false;
 		bool tickAlways;
-
-		Func<int> facingFunc;
+		string name;
 
 		public string Name { get { return name; } }
 
-		public Animation(string name)
-			: this(name, () => 0)	{}
+		readonly SequenceProvider sequenceProvider;
 
-		public Animation(string name, Func<int> facingFunc)
+		public Animation(World world, string name)
+			: this(world, name, () => 0) { }
+
+		public Animation(World world, string name, Func<int> facingFunc)
+			: this(world.Map.SequenceProvider, name, facingFunc) { }
+
+		public Animation(SequenceProvider sequenceProvider, string name, Func<int> facingFunc)
 		{
+			this.sequenceProvider = sequenceProvider;
 			this.name = name.ToLowerInvariant();
 			this.tickFunc = () => {};
 			this.facingFunc = facingFunc;
@@ -41,13 +49,16 @@ namespace OpenRA.Graphics
 
 		public IEnumerable<IRenderable> Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
 		{
+			var imageRenderable = new SpriteRenderable(Image, pos, offset, CurrentSequence.ZOffset + zOffset, palette, scale, IsDecoration);
+
 			if (CurrentSequence.ShadowStart >= 0)
 			{
 				var shadow = CurrentSequence.GetShadow(CurrentFrame, facingFunc());
-				yield return new SpriteRenderable(shadow, pos, offset, CurrentSequence.ShadowZOffset + zOffset, palette, scale, true);
+				var shadowRenderable = new SpriteRenderable(shadow, pos, offset, CurrentSequence.ShadowZOffset + zOffset, palette, scale, true);
+				return new IRenderable[] { shadowRenderable, imageRenderable };
 			}
 
-			yield return new SpriteRenderable(Image, pos, offset, CurrentSequence.ZOffset + zOffset, palette, scale, IsDecoration);
+			return new IRenderable[] { imageRenderable };
 		}
 
 		public IEnumerable<IRenderable> Render(WPos pos, PaletteReference palette)
@@ -64,7 +75,7 @@ namespace OpenRA.Graphics
 		{
 			backwards = false;
 			tickAlways = false;
-			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
+			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
 			frame = 0;
 			tickFunc = () =>
 			{
@@ -79,7 +90,7 @@ namespace OpenRA.Graphics
 			if (!HasSequence(sequenceName))
 				return false;
 
-			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
+			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
 			frame %= CurrentSequence.Length;
 			return true;
 		}
@@ -88,7 +99,7 @@ namespace OpenRA.Graphics
 		{
 			backwards = false;
 			tickAlways = false;
-			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
+			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
 			frame = 0;
 			tickFunc = () =>
 			{
@@ -112,7 +123,7 @@ namespace OpenRA.Graphics
 		{
 			backwards = false;
 			tickAlways = true;
-			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
+			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
 			frame = func();
 			tickFunc = () => frame = func();
 		}
@@ -122,10 +133,11 @@ namespace OpenRA.Graphics
 
 		public void Tick()
 		{
-			Tick(40); // tick one frame
+			if (Paused == null || !Paused())
+				Tick(40); // tick one frame
 		}
 
-		public bool HasSequence(string seq) { return SequenceProvider.HasSequence(name, seq); }
+		public bool HasSequence(string seq) { return sequenceProvider.HasSequence(name, seq); }
 
 		public void Tick(int t)
 		{
@@ -156,7 +168,7 @@ namespace OpenRA.Graphics
 
 		public Sequence GetSequence(string sequenceName)
 		{
-			return SequenceProvider.GetSequence(name, sequenceName);
+			return sequenceProvider.GetSequence(name, sequenceName);
 		}
 	}
 }

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
@@ -19,17 +18,19 @@ namespace OpenRA.Graphics
 		public readonly Animation Animation;
 		public readonly Func<WVec> OffsetFunc;
 		public readonly Func<bool> DisableFunc;
+		public readonly Func<bool> Paused;
 		public readonly Func<WPos, int> ZOffset;
 
 		public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable)
-			: this(a, offset, disable, null) { }
+			: this(a, offset, disable, () => false, null) { }
 
 		public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable, int zOffset)
-			: this(a, offset, disable, _ => zOffset) { }
+			: this(a, offset, disable, () => false, _ => zOffset) { }
 
-		public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable, Func<WPos, int> zOffset)
+		public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable, Func<bool> pause, Func<WPos, int> zOffset)
 		{
 			this.Animation = a;
+			this.Animation.Paused = pause;
 			this.OffsetFunc = offset;
 			this.DisableFunc = disable;
 			this.ZOffset = zOffset;
@@ -46,7 +47,7 @@ namespace OpenRA.Graphics
 
 		public static implicit operator AnimationWithOffset(Animation a)
 		{
-			return new AnimationWithOffset(a, null, null, null);
+			return new AnimationWithOffset(a, null, null, null, null);
 		}
 	}
 }