fix bogus target lines being drawn to 0,0

.editorconfig

@@ -1,16 +0,0 @@
-; Top-most http://editorconfig.org/ file
-root = true
-
-; Unix-style newlines
-[*]
-end_of_line = LF
-
-; 4-column tab indentation
-[*.cs]
-indent_style = tab
-indent_size = 4
-
-; 4-column tab indentation
-[*.yaml]
-indent_style = tab
-indent_size = 4

.gitattributes

@@ -1,10 +0,0 @@
-# Enforce LF normalization on Windows
-* text=lf
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union

.gitignore

@@ -1,4 +1,4 @@
-# Visual Studio
+# Visual Studio crap
 Release
 bin
 obj
@@ -7,15 +7,13 @@ obj
 *.suo
 *.user
 *.sln.cache
-*.manifest
-*.CodeAnalysisLog.xml
-*.lastcodeanalysissucceeded
-_ReSharper.*/
-
-# binaries
 mods/*/*.dll
+
+# Red Alert binary files
+mods/*/packages/*.[mM][iI][xX]
+
+#binary stuff
 /*.dll
-/*.dll.config
 *.pdb
 *.mdb
 *.exe
@@ -23,17 +21,22 @@ mods/*/*.dll
 # backup files by various editors
 *~
 *.orig
-\#*
-.*.sw?
+# dependency DLLs (different for every platform!)
+cg.dll
+cgGL.dll
 
-# Monodevelop
+/OpenRa.Gl.dll
+
+#monodevelop
 *.pidb
 *.userprefs
 
-# Mac OS X
+packaging/windows/*.exe
+
+# osx crap
 .DS_Store
 
-# XCode
+# osx build crap
 packaging/osx/launcher/build/
 packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
 packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
@@ -41,19 +44,6 @@ packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
 temp.c
 temp.o
 temp.s
-OpenRA.Launcher.Mac/build/
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
+
+*.config
 *.resources
-
-# KDE
-*.kate-swp
-*.directory
-
-# auto-generated documentation
-DOCUMENTATION.md
-*.html
-
-# StyleCop
-*.Cache

.travis.yml

@@ -1,32 +0,0 @@
-# Travis-CI Build for OpenRA
-# see travis-ci.org for details
-
-# Mono/.NET are not officially supported. The following is a workaround.
-language: c
-
-# Make sure build dependencies are installed.
-before_install:
- - sudo apt-get update
-install:
- - sudo apt-get install mono-gmcs cli-common-dev libsdl1.2debian libgl1-mesa-glx libopenal1 libfreetype6
-
-# Run the build script which will automatically call RALint and ensure that the IDE project files are still valid.
-script:
- - make all
- - make test
- - xbuild
-
-# Only watch the development branch.
-branches:
- only:
-   - bleed
-
-# Notify developers when build passed/failed.
-notifications:
-  irc:
-    template:
-      - "%{repository}#%{build_number} %{commit} %{author}: %{message} %{build_url}"
-    channels:
-      - "irc.freenode.net#openra"
-    use_notice: true
-    skip_join: true

AUTHORS

@@ -1,75 +1,9 @@
-OpenRA wouldn't be where it is today without the
-hard work of many contributors.
-
-The OpenRA developers are:
-    * Chris Forbes (chrisf)
-    * Curtis Shmyr (hamb)
-    * Matthias Mailänder (Mailaender)
-    * Paul Chote (pchote)
-    * ScottNZ
-
-Previous developers included:
-    * Alli Witheford (alzeih)
-    * Caleb Anderson (RobotCaleb)
-    * Daniel Hernandez (Mancano)
-    * Megan Bowra-Dean (beedee)
-    * Mike Bundy (kehaar)
-    * Robert Pepperell (ytinasni)
-
-Also thanks to:
-    * Akseli Virtanen (RAGEQUIT)
-    * Andrew Aldridge (i80and)
-    * Andrew Perkins
-    * Andrew Riedi
-    * Andreas Beck (baxtor)
-    * Barnaby Smith (mvi)
-    * Bellator
-    * Braxton Williams (Buddytex)
-    * Bugra Cuhadaroglu (BugraC)
-    * Christer Ulfsparre (Holloweye)
-    * Cody Brittain (Generalcamo)
-    * D2k Sardaukar
-    * Daniel Derejvanik (Harisson)
-    * Danny Keary (Dan9550)
-    * Erasmus Schroder (rasco)
-    * Fahrradkette
-    * Frank Razenberg (zzattack)
-    * Igor Popov (ihptru)
-    * Iran
-    * James Dunne (jsd)
-    * Jeff Harris (jeff_1amstudios)
-    * Jes
-    * Joakim Lindberg (booom3)
-    * JOo
-    * Kenny Hoxworth (hoxworth)
-    * Krishnakanth Mallik
-    * Kyrre Soerensen (zypres)
-    * Lawrence Wang
-    * Lesueur Benjamin (Valkirie)
-    * Maarten Meuris (Nyerguds)
-    * Mark Olson (markolson)
-    * Matthew Gatland (mgatland)
-    * Max621
-    * Max Ugrumov (katzsmile)
-    * Nukem
-    * Olaf van der Spek
-    * Paolo Chiodi (paolochiodi)
-    * Paul Dovydaitis (pdovy)
-    * Psydev
-    * Raymond Martineau (mart0258)
-    * Reaperrr
-    * Riderr3
-    * Sascha Biedermann (bidifx)
-    * Tim Mylemans (gecko)
-    * Tirili
-    * Tristan Keating (Kilkakon)
-    * Vladimir Komarov (VrKomarov)
-    * Wuschel
-
-Using GeoLite data created by MaxMind and
-distributed under the CC BY-SA 3.0 license.
-
-Finally, special thanks goes to the original teams
-at Westwood Studios and EA for creating the classic
-games which OpenRA aims to reimagine.
-
+AUTHORS
+
+The OpenRA developers are:
+	* Chris Forbes
+	* Robert Pepperell
+	* Matthew Bowra-Dean
+	* Paul Chote
+	* Alli Witheford
+	* Joakim Lindberg

CONTRIBUTING.md

@@ -1,19 +0,0 @@
-# OpenRA Contributing Guidelines
-
-## Bug reports
-
-* Have you read the [FAQ](https://github.com/OpenRA/OpenRA/wiki/FAQ)?
-* Add the appropriate log files on crashes.
-* Please be specific on how to reproduce the problem.
-
-## Patches
-
-* [Coding standard](https://github.com/OpenRA/OpenRA/wiki/Coding-Standard)
-* [Branches and Releases](https://github.com/OpenRA/OpenRA/wiki/Branches-and-Releases)
-* [Licensing](http://www.gnu.org/licenses/quick-guide-gplv3.html)
-
-Please `git rebase` to the latest revision of the bleed branch.
-
-Don't forget to add youself to [AUTHORS](https://github.com/OpenRA/OpenRA/blob/bleed/AUTHORS).
-
-While your pull-request is in review it will be helpful if you join [IRC](irc://chat.freenode.net/openra) to discuss the changes.

FileExtractor/FileExtractor.cs

@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using OpenRA.FileFormats;
+
+namespace FileExtractor
+{
+	public class FileExtractor
+	{
+		int Length = 256;
+		
+		public FileExtractor (string[] args)
+		{
+			if (args.Length != 2)
+			{
+				Console.WriteLine("usage: FileExtractor mod[,mod]* filename");
+				return;
+			}
+
+			var mods = args[0].Split(',');
+			var manifest = new Manifest(mods);
+			FileSystem.LoadFromManifest( manifest );
+			
+			try
+			{
+				var readStream = FileSystem.Open(args[1]);
+				var writeStream = new FileStream(args[1], FileMode.OpenOrCreate, FileAccess.Write);
+				
+				WriteOutFile(readStream, writeStream);
+				
+			} 
+			catch (FileNotFoundException) 
+			{
+				Console.WriteLine(String.Format("No Such File {0}", args[1]));
+			}
+		}
+		
+		void WriteOutFile (Stream readStream, Stream writeStream)
+		{
+   			Byte[] buffer = new Byte[Length];
+   			int bytesRead = readStream.Read(buffer,0,Length);
+
+ 			while( bytesRead > 0 ) 
+    		{
+        		writeStream.Write(buffer,0,bytesRead);
+        		bytesRead = readStream.Read(buffer,0,Length);
+    		}
+    		readStream.Close();
+    		writeStream.Close();
+		}
+	}
+}
+

FileExtractor/FileExtractor.csproj

@@ -1,44 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{021DDD6A-A608-424C-9A9A-252D8A9989E0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>GeoIP</RootNamespace>
-    <AssemblyName>GeoIP</AssemblyName>
+    <ProjectGuid>{210645C7-E99E-46B6-863E-E211AE6C7D70}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>FileExtractor</RootNamespace>
+    <AssemblyName>FileExtractor</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>
+    <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>
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
+    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRA.FileFormats</Name>
+    </ProjectReference>
   </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" />
+    <Compile Include="Main.cs" />
+    <Compile Include="FileExtractor.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

FileExtractor/Main.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace FileExtractor
+{
+	public class MainClass
+	{
+		public static void Main (string[] args)
+		{
+			new FileExtractor(args);
+		}
+	}
+}
+

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/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;
-	}
-}

HACKING

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

INSTALL

@@ -1,76 +1,99 @@
-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)
+Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+This file is part of OpenRA, which is free software. It is made 
+available to you under the terms of the GNU General Public License
+as published by the Free Software Foundation. For more information,
+see LICENSE.
+
+To run OpenRA, several files are needed from the original game disks.
+
+The required files for the Red Alert mod are:
+EITHER:
+	* conquer.mix
+	* temperat.mix
+	* interior.mix
+	* snow.mix
+	* sounds.mix
+	* allies.mix
+	* russian.mix
+OR:
+	* main.mix
+AND:
+	* redalert.mix
+
+These need to be copied into the mods/ra/packages/ directory.
+
+
+The required files for the Command and Conquer mod are:
+	* cclocal.mix
+	* speech.mix
+	* conquer.mix
+	* sounds.mix
+	* tempicnh.mix
+	* temperat.mix
+	* winter.mix
+	* desert.mix
+
+These need to be copied into the mods/cnc/packages/ directory.
+If you have a case-sensitive filesystem you must change the filenames to
+lower case.
+
+
+Red Alert and C&C have been released by EA Games as freeware. They can be
+downloaded from http://www.commandandconquer.com/classic
+Unfortunately the installer is 16-bit and so won’t run on 64-bit operating
+systems. This can be worked around by using the Red Alert Setup Manager 
+	(http://ra.afraid.org/html/downloads/utilities-3.html). 
+Make sure you apply the no-CD protection fix so all the files needed 
+are installed to the hard drive.
+
+Dependencies - Make sure you have these installed, or you'll 
+have very strange errors.
+
+
+WINDOWS:
+
+* .NET Framework >= 3.5-SP1
+	(http://www.microsoft.com/downloads/details.aspx?FamilyID=AB99342F-5D1A-413D-8319-81DA479AB0D7&displaylang=en)
+* Tao Framework >= 2.1.0
+	(http://sourceforge.net/projects/taoframework/)
+	(required libs: Tao.OpenGL, Tao.Cg, Tao.Platform.Windows)
+* OpenAL >= 1.1
+	(http://connect.creativelabs.com/openal/Downloads/oalinst.zip)
+* Cg Toolkit >= 2.2
+	(http://developer.download.nvidia.com/cg/Cg_2.2/Cg-2.2_October2009_Setup.exe)
+
+To compile OpenRA, open the OpenRA.sln solution in the main folder, 
+or build it from the command-line with MSBuild.
+
+Run the game with `OpenRA.Game.exe Game.Mods=ra` for Red Alert
+or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
+
+
+UBUNTU (substitute comparable packages for other linux distros):
+
+* mono-gmcs
+* freetype
+* libmono-corlib1.0-cil
+* libmono-winforms2.0-cil
+* libopenal1
+* libsdl1.2-dev
+* nvidia-cg-toolkit (download the latest version from
+  http://developer.nvidia.com/object/cg_download.html)
+
+OpenRA is incompatible with Compiz, please disable desktop effects when trying
+to run OpenRA or the game will crash.
+
+You will need to copy the Tao dependencies (.dll and .config) from the
+thirdparty/Tao directory into the game root, or install them permanently into
+your GAC with the following script
+
+#!/bin/sh
+gacutil -i thirdparty/Tao/Tao.Cg.dll
+gacutil -i thirdparty/Tao/Tao.OpenGl.dll
+gacutil -i thirdparty/Tao/Tao.OpenAl.dll
+gacutil -i thirdparty/Tao/Tao.Sdl.dll
+gacutil -i thirdparty/Tao/Tao.FreeType.dll
+
+To compile OpenRA, run `make' from the command line.
+Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert
+or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer

Makefile

@@ -1,261 +1,178 @@
-############################# INSTRUCTIONS #############################
-#
-# to compile, run:
-#   make
-#
-# to compile with development tools, run:
-#   make all
-#
-# to check the official mods for erroneous yaml files, run:
-#   make test
-#
-# to generate documentation aimed at modders, run:
-#   make docs
-#
-# to install, run:
-#   make [prefix=/foo] [bindir=/bar/bin] install
-#
-# 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 uninstall, run:
-#   make uninstall
-#
-# for help, run:
-#   make help
-#
-# to start the game, run:
-#   openra
-
-
-
-############################## TOOLCHAIN ###############################
-#
-CSC         = gmcs
-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
-
-
-
-######################### UTILITIES/SETTINGS ###########################
-#
-# install locations
-prefix ?= /usr/local
-datarootdir ?= $(prefix)/share
-datadir ?= $(datarootdir)
-bindir ?= $(prefix)/bin
+CSC     = gmcs
+CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
+DEFINE  = DEBUG;TRACE
+PROGRAMS	=fileformats gl game ra cnc seqed editor ralint filex tsbuild
+prefix = /usr/local
+datarootdir = $(prefix)/share
+datadir = $(datarootdir)
+bindir = $(prefix)/bin
 BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
-DATA_INSTALL_DIR = $(DESTDIR)$(datadir)/openra
-
-# install tools
-RM = rm
-RM_R = $(RM) -r
-RM_F = $(RM) -f
-CP = cp
-CP_R = $(CP) -r
+INSTALL_DIR = $(DESTDIR)$(datadir)/openra
 INSTALL = install
-INSTALL_DIR = $(INSTALL) -d
-INSTALL_PROGRAM = $(INSTALL) -m755
-INSTALL_DATA = $(INSTALL) -m644
+INSTALL_PROGRAM = $(INSTALL)
 
-# program targets
-CORE = fileformats rcg rgl rsdl rnull game utility geoip irc
-TOOLS = editor tsbuild ralint
+COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
 
-VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
+fileformats_SRCS	=	$(shell find OpenRA.FileFormats/ -iname '*.cs')
+fileformats_TARGET	=	OpenRA.FileFormats.dll
+fileformats_KIND	=	library
+fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll thirdparty/WindowsBase.dll
 
+gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
+gl_TARGET			= OpenRA.Gl.dll
+gl_KIND				= library
+gl_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+gl_LIBS				= $(COMMON_LIBS) System.Windows.Forms.dll \
+						thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+						$(gl_DEPS) $(game_TARGET)
 
-
-######################## 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_SRCS			=	$(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET			= OpenRA.Game.exe
 game_KIND			= winexe
-game_DEPS			= $(fileformats_TARGET)
+game_DEPS			= $(fileformats_TARGET) 
 game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
-					thirdparty/Tao/Tao.OpenAl.dll thirdparty/SharpFont.dll
+						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.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: $(irc_TARGET)
+ra_SRCS				=	$(shell find OpenRA.Mods.RA/ -iname '*.cs')
+ra_TARGET			=	mods/ra/OpenRA.Mods.RA.dll
+ra_KIND				=	library
+ra_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+ra_LIBS				= $(COMMON_LIBS) $(ra_DEPS)
 
-# 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) System.Windows.Forms.dll \
-					thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-					$(rsdl_DEPS)
+cnc_SRCS			=	$(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
+cnc_TARGET			=	mods/cnc/OpenRA.Mods.Cnc.dll
+cnc_KIND			=	library
+cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
+cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)
 
-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) System.Windows.Forms.dll \
-					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-					$(rcg_DEPS)
+seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
+seqed_TARGET		= SequenceEditor.exe
+seqed_KIND			= winexe
+seqed_DEPS			= $(fileformats_TARGET)
+seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
+seqed_EXTRA			= -resource:SequenceEditor.Form1.resources
 
-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) System.Windows.Forms.dll \
-					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-					$(rgl_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) System.Windows.Forms.dll \
-					$(rnull_DEPS)
-PROGRAMS 			+= rcg rgl rnull rsdl
-renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(rsdl_TARGET)
-
-
-##### Official Mods #####
-
-STD_MOD_LIBS	= $(fileformats_TARGET) $(game_TARGET)
-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: $(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: $(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: $(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: $(mod_ts_TARGET)
-
-##### Tools #####
-
-# Map Editor
-editor_SRCS			:= $(shell find OpenRA.Editor/ -iname '*.cs')
-editor_TARGET			= OpenRA.Editor.exe
+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
 
-PROGRAMS 			+= editor
-OpenRA.Editor.MapSelect.resources:
-	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
-OpenRA.Editor.Form1.resources:
-	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
-editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
+ralint_SRCS		= $(shell find RALint/ -iname '*.cs')
+ralint_TARGET	= RALint.exe
+ralint_KIND		= winexe
+ralint_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+ralint_LIBS		= $(COMMON_LIBS) $(ralint_DEPS)
 
-# 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: $(ralint_TARGET)
+filex_SRCS		= $(shell find FileExtractor/ -iname '*.cs')
+filex_TARGET	= FileExtractor.exe
+filex_KIND		= winexe
+filex_DEPS		= $(fileformats_TARGET)
+filex_LIBS		= $(COMMON_LIBS) $(filex_DEPS)
 
-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."
-
-# Builds and exports tilesets from a bitmap
-tsbuild_SRCS		:= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET		= OpenRA.TilesetBuilder.exe
+tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_TARGET		= TilesetBuilder.exe
 tsbuild_KIND		= winexe
 tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
 tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
-tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.FormBuilder.resources -resource:OpenRA.TilesetBuilder.FormNew.resources -resource:OpenRA.TilesetBuilder.Surface.resources
-PROGRAMS 			+= tsbuild
-OpenRA.TilesetBuilder.FormBuilder.resources:
-	resgen2 OpenRA.TilesetBuilder/FormBuilder.resx OpenRA.TilesetBuilder.FormBuilder.resources 1> /dev/null
-OpenRA.TilesetBuilder.FormNew.resources:
-	resgen2 OpenRA.TilesetBuilder/frmNew.resx OpenRA.TilesetBuilder.FormNew.resources 1> /dev/null
-OpenRA.TilesetBuilder.Surface.resources:
-	resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null
-tsbuild: OpenRA.TilesetBuilder.FormBuilder.resources OpenRA.TilesetBuilder.FormNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET)
+tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
 
+# -platform:x86
 
-##### Launchers / Utilities #####
+.SUFFIXES:
+.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex
 
-# 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: $(utility_TARGET)
+game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
 
+clean: 
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 
-# Patches binary headers to work around a mono bug
-fixheader.exe: packaging/fixheader.cs
-	@echo CSC fixheader.exe
+distclean: clean
+
+CORE = fileformats gl game editor
+
+install: all
+	@-echo "Installing OpenRA to $(INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
+		
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
+	@$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc
+	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/chrome $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/bits $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/rules $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/sequences $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/tilesets $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/uibits $(INSTALL_DIR)/mods/cnc
+	
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
+	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/bits $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/chrome $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/rules $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/tilesets $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/uibits $(INSTALL_DIR)/mods/ra
+	
+	@cp -r shaders $(INSTALL_DIR)
+	@cp *.ttf $(INSTALL_DIR)
+	@cp --parents -r thirdparty/Tao $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) thirdparty/WindowsBase.dll $(INSTALL_DIR)
+	@-$(INSTALL_PROGRAM) VERSION $(INSTALL_DIR)
+	
+	@echo "#!/bin/sh" > openra
+	@echo "cd "$(datadir)"/openra" >> openra
+	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=~/.openra \"$$""@\"" >> openra
+	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
+	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
+		
+	@echo "OpenRA is now installed. You will now want to download"
+	@echo "http://open-ra.org/get-dependency.php?ra-packages and"
+	@echo "http://open-ra.org/get-dependency.php?cnc-packages"
+	@echo "and extract their contents to"
+	@echo "$(INSTALL_DIR)/mods/ra/packages and "
+	@echo "$(INSTALL_DIR)/mods/cnc/packages respectively."
+	@echo "It is also advised to install the contents of $(INSTALL_DIR)/thirdparty to the Mono Global Assembly Cache \
+	with gacutil."
+
+uninstall:
+	@-rm -r $(INSTALL_DIR)
+	@-rm $(DESTDIR)$(bindir)/openra
+
+mod_ra: $(ra_TARGET) $(ralint_TARGET)
+	mono RALint.exe ra
+mod_cnc: $(cnc_TARGET) $(ralint_TARGET)
+	mono RALint.exe cnc
+mods: mod_ra mod_cnc
+
+OpenRA.Editor.MapSelect.resources:
+	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
+
+OpenRA.Editor.Form1.resources:
+	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
+editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
+ralint: $(ralint_TARGET)
+seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
+SequenceEditor.Form1.resources:
+	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
+filex: $(filex_TARGET)
+tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
+OpenRA.TilesetBuilder.Form1.resources:
+	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
+tools: editor ralint seqed filex tsbuild
+all: game tools
+
+fixheader: packaging/fixheader.cs
 	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
 
-# Generate build rules for each target defined above in PROGRAMS
 define BUILD_ASSEMBLY
 
-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader
 	@echo CSC $$(@)
 	@$(CSC) $$($(1)_LIBS:%=-r:%) \
 		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
@@ -263,164 +180,7 @@ $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
 		-t:"$$($(1)_KIND)" \
 		$$($(1)_EXTRA) \
 		$$($(1)_SRCS)
-	@mono fixheader.exe $$(@) > /dev/null
-	@test `echo $$(@) | sed 's/^.*\.//'` = "dll" && chmod a-x $$(@) || ``
-	@$$($(1)_EXTRA_CMDS)
+	@mono fixheader.exe $$(@)
 endef
 
 $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
-
-
-
-########################## MAKE/INSTALL RULES ##########################
-#
-default: dependencies core
-
-core: game renderers mods utility
-
-tools: editor tsbuild ralint
-
-package: dependencies core editor docs version
-
-mods: mod_ra mod_cnc mod_d2k mod_ts
-
-all: dependencies core tools
-
-clean:
-	@-$(RM_F) *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
-
-distclean: clean
-
-dependencies:
-	@ $(CP_R) thirdparty/*.dl* .
-	@ $(CP_R) thirdparty/Tao/* .
-
-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml
-	@for i in $? ; do \
-		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
-		mv -f $${i}.tmp $${i} ; \
-	done
-
-# Documentation (d2k depends on all mod libraries)
-docs: utility
-	@mono --debug OpenRA.Utility.exe --docs d2k > DOCUMENTATION.md
-
-install: install-core
-
-install-all: install-core install-tools
-
-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/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"
-
-	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
-	@$(INSTALL_DATA) "GeoIP.dat" "$(DATA_INSTALL_DIR)/GeoIP.dat"
-	@$(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) *.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)"
-
-	@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
-
-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_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
-
-uninstall:
-	@-$(RM_R) "$(DATA_INSTALL_DIR)"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-editor"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-editor.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-editor.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-editor.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra.png"
-
-help:
-	@echo to compile, run:
-	@echo \ \ make
-	@echo
-	@echo to compile with development tools, run:
-	@echo \ \ make all
-	@echo
-	@echo to check the official mods for erroneous yaml files, run:
-	@echo \ \ make test
-	@echo
-	@echo to generate documentation aimed at modders, run:
-	@echo \ \ make docs
-	@echo
-	@echo to install, run:
-	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install
-	@echo
-	@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
-	@echo to uninstall, run:
-	@echo \ \ make uninstall
-	@echo
-	@echo to start the game, run:
-	@echo \ \ openra
-
-
-
-
-########################### MAKEFILE SETTINGS ##########################
-#
-.DEFAULT_GOAL := default
-
-.SUFFIXES:
-
-.PHONY: core tools package all mods clean distclean dependencies version $(PROGRAMS)

OpenRA.Editor/ActorPropertiesDialog.cs

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

OpenRA.Editor/ActorTemplate.cs

@@ -1,36 +1,40 @@
-#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.Drawing;
-using OpenRA.GameRules;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	class ActorTemplate
-	{
-		public Bitmap Bitmap;
-		public ActorInfo Info;
-		public EditorAppearanceInfo Appearance;
-	}
-
-	class BrushTemplate
-	{
-		public Bitmap Bitmap;
-		public ushort N;
-	}
-
-	class ResourceTemplate
-	{
-		public Bitmap Bitmap;
-		public ResourceTypeInfo Info;
-		public int Value;
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	class ActorTemplate
+	{
+		public Bitmap Bitmap;
+		public ActorInfo Info;
+		public bool Centered;
+	}
+
+	class BrushTemplate
+	{
+		public Bitmap Bitmap;
+		public ushort N;
+	}
+
+	class ResourceTemplate
+	{
+		public Bitmap Bitmap;
+		public ResourceTypeInfo Info;
+		public int Value;
+	}
+
+	class WaypointTemplate
+	{
+	}
+}

OpenRA.Editor/ActorTool.cs

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

OpenRA.Editor/BrushTool.cs

@@ -1,123 +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.Windows.Forms;
-using OpenRA.FileFormats;
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class BrushTool : ITool
-	{
-		BrushTemplate brushTemplate;
-
-		public BrushTool(BrushTemplate brush) { this.brushTemplate = brush; }
-
-		public void Apply(Surface surface)
-		{
-			// change the bits in the map
-			var template = surface.TileSet.Templates[brushTemplate.N];
-			var tile = surface.TileSetRenderer.Data(brushTemplate.N);
-			var pos = surface.GetBrushLocation();
-
-			if (surface.GetModifiers() == Keys.Shift)
-			{
-				FloodFillWithBrush(surface, pos);
-				return;
-			}
-
-			for (var u = 0; u < template.Size.X; u++)
-				for (var v = 0; v < template.Size.Y; v++)
-				{
-					if (surface.Map.IsInMap(new CVec(u, v) + pos))
-					{
-						var z = u + v * template.Size.X;
-						if (tile[z] != null)
-							surface.Map.MapTiles.Value[u + pos.X, v + pos.Y] =
-								new TileReference<ushort, byte>
-								{
-									Type = brushTemplate.N,
-									Index = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z,
-								};
-
-						var ch = new int2((pos.X + u) / Surface.ChunkSize, (pos.Y + v) / Surface.ChunkSize);
-						if (surface.Chunks.ContainsKey(ch))
-						{
-							surface.Chunks[ch].Dispose();
-							surface.Chunks.Remove(ch);
-						}
-					}
-				}
-		}
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			g.DrawImage(brushTemplate.Bitmap,
-					surface.TileSetRenderer.TileSize.Width * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X,
-			        surface.TileSetRenderer.TileSize.Height * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
-					brushTemplate.Bitmap.Width * surface.Zoom,
-					brushTemplate.Bitmap.Height * surface.Zoom);
-		}
-
-		void FloodFillWithBrush(Surface s, CPos pos)
-		{
-			var queue = new Queue<CPos>();
-			var replace = s.Map.MapTiles.Value[pos.X, pos.Y];
-			var touched = new bool[s.Map.MapSize.X, s.Map.MapSize.Y];
-
-			Action<int, int> maybeEnqueue = (x, y) =>
-			{
-				if (s.Map.IsInMap(x, y) && !touched[x, y])
-				{
-					queue.Enqueue(new CPos(x, y));
-					touched[x, y] = true;
-				}
-			};
-
-			queue.Enqueue(pos);
-			while (queue.Count > 0)
-			{
-				var p = queue.Dequeue();
-				if (!s.Map.MapTiles.Value[p.X, p.Y].Equals(replace))
-					continue;
-
-				var a = FindEdge(s, p, new CVec(-1, 0), replace);
-				var b = FindEdge(s, p, new CVec(1, 0), replace);
-
-				for (var x = a.X; x <= b.X; x++)
-				{
-					s.Map.MapTiles.Value[x, p.Y] = new TileReference<ushort, byte> { Type = brushTemplate.N, Index = (byte)0 };
-					if (s.Map.MapTiles.Value[x, p.Y - 1].Equals(replace))
-						maybeEnqueue(x, p.Y - 1);
-					if (s.Map.MapTiles.Value[x, p.Y + 1].Equals(replace))
-						maybeEnqueue(x, p.Y + 1);
-				}
-			}
-
-			/* TODO: optimize */
-			foreach (var ch in s.Chunks.Values) ch.Dispose();
-			s.Chunks.Clear();
-		}
-
-		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;
-				p = q;
-			}
-		}
-	}
-}

OpenRA.Editor/ErrorListDialog.Designer.cs

@@ -1,98 +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.Editor
-{
-	partial class ErrorListDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.label1 = new System.Windows.Forms.Label();
-			this.listBox1 = new System.Windows.Forms.ListBox();
-			this.button1 = new System.Windows.Forms.Button();
-			this.SuspendLayout();
-			//
-			// label1
-			//
-			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.label1.Location = new System.Drawing.Point(10, 9);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(610, 23);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Your map import completed, but with errors:";
-			//
-			// listBox1
-			//
-			this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.listBox1.FormattingEnabled = true;
-			this.listBox1.Location = new System.Drawing.Point(13, 30);
-			this.listBox1.Name = "listBox1";
-			this.listBox1.Size = new System.Drawing.Size(607, 316);
-			this.listBox1.TabIndex = 1;
-			//
-			// button1
-			//
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(545, 359);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Close";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// ErrorListDialog
-			//
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(632, 394);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.listBox1);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ErrorListDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Import Errors";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.ListBox listBox1;
-		private System.Windows.Forms.Button button1;
-	}
-}

OpenRA.Editor/ErrorListDialog.cs

@@ -1,25 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-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.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class ErrorListDialog : Form
-	{
-		public ErrorListDialog(IEnumerable<string> errors)
-		{
-			InitializeComponent();
-			foreach (var e in errors)
-				listBox1.Items.Add(e);
-		}
-	}
-}

OpenRA.Editor/LegacyMapImporter.cs

@@ -1,478 +1,470 @@
-#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.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	public class LegacyMapImporter
-	{
-		// Mapping from ra overlay index to type string
-		static string[] redAlertOverlayNames =
-		{
-			"sbag", "cycl", "brik", "fenc", "wood",
-			"gold01", "gold02", "gold03", "gold04",
-			"gem01", "gem02", "gem03", "gem04",
-			"v12", "v13", "v14", "v15", "v16", "v17", "v18",
-			"fpls", "wcrate", "scrate", "barb", "sbag",
-		};
-
-		static Dictionary<string, Pair<byte, byte>> overlayResourceMapping = new Dictionary<string, Pair<byte, byte>>()
-		{
-			// RA Gold & Gems
-			{ "gold01", new Pair<byte, byte>(1, 0) },
-			{ "gold02", new Pair<byte, byte>(1, 1) },
-			{ "gold03", new Pair<byte, byte>(1, 2) },
-			{ "gold04", new Pair<byte, byte>(1, 3) },
-			{ "gem01", new Pair<byte, byte>(2, 0) },
-			{ "gem02", new Pair<byte, byte>(2, 1) },
-			{ "gem03", new Pair<byte, byte>(2, 2) },
-			{ "gem04", new Pair<byte, byte>(2, 3) },
-
-			// CnC Tiberium
-			{ "ti1", new Pair<byte, byte>(1, 0) },
-			{ "ti2", new Pair<byte, byte>(1, 1) },
-			{ "ti3", new Pair<byte, byte>(1, 2) },
-			{ "ti4", new Pair<byte, byte>(1, 3) },
-			{ "ti5", new Pair<byte, byte>(1, 4) },
-			{ "ti6", new Pair<byte, byte>(1, 5) },
-			{ "ti7", new Pair<byte, byte>(1, 6) },
-			{ "ti8", new Pair<byte, byte>(1, 7) },
-			{ "ti9", new Pair<byte, byte>(1, 8) },
-			{ "ti10", new Pair<byte, byte>(1, 9) },
-			{ "ti11", new Pair<byte, byte>(1, 10) },
-			{ "ti12", new Pair<byte, byte>(1, 11) },
-		};
-
-		static Dictionary<string, string> overlayActorMapping = new Dictionary<string, string>() {
-			// Fences
-			{ "sbag", "sbag" },
-			{ "cycl", "cycl" },
-			{ "brik", "brik" },
-			{ "fenc", "fenc" },
-			{ "wood", "wood" },
-
-			// Fields
-			{ "v12", "v12" },
-			{ "v13", "v13" },
-			{ "v14", "v14" },
-			{ "v15", "v15" },
-			{ "v16", "v16" },
-			{ "v17", "v17" },
-			{ "v18", "v18" },
-
-			// Crates
-//			{ "wcrate", "crate" },
-//			{ "scrate", "crate" },
-		};
-
-		// TODO: fix this -- will have bitrotted pretty badly.
-		static Dictionary<string, HSLColor> namedColorMapping = new Dictionary<string, HSLColor>()
-		{
-			{ "gold", HSLColor.FromRGB(246, 214, 121) },
-			{ "blue", HSLColor.FromRGB(226, 230, 246) },
-			{ "red", HSLColor.FromRGB(255, 20, 0) },
-			{ "neutral", HSLColor.FromRGB(238, 238, 238) },
-			{ "orange", HSLColor.FromRGB(255, 230, 149) },
-			{ "teal", HSLColor.FromRGB(93, 194, 165) },
-			{ "salmon", HSLColor.FromRGB(210, 153, 125) },
-			{ "green", HSLColor.FromRGB(160, 240, 140) },
-			{ "white", HSLColor.FromRGB(255, 255, 255) },
-			{ "black", HSLColor.FromRGB(80, 80, 80) },
-		};
-
-		static string Truncate(string s, int maxLength)
-		{
-			return s.Length <= maxLength ? s : s.Substring(0, maxLength);
-		}
-
-		int mapSize;
-		int actorCount = 0;
-		Map map = new Map();
-		List<string> players = new List<string>();
-		Action<string> errorHandler;
-
-		LegacyMapImporter(string filename, Action<string> errorHandler)
-		{
-			this.errorHandler = errorHandler;
-			ConvertIniMap(filename);
-		}
-
-		public static Map Import(string filename, Action<string> errorHandler)
-		{
-			var converter = new LegacyMapImporter(filename, errorHandler);
-			return converter.map;
-		}
-
-		enum IniMapFormat { RedAlert = 3 } // otherwise, cnc (2 variants exist, we don't care to differentiate)
-
-		public void ConvertIniMap(string iniFile)
-		{
-			var file = new IniFile(FileSystem.Open(iniFile));
-			var basic = file.GetSection("Basic");
-			var mapSection = file.GetSection("Map");
-			var legacyMapFormat = (IniMapFormat)int.Parse(basic.GetValue("NewINIFormat", "0"));
-			var offsetX = int.Parse(mapSection.GetValue("X", "0"));
-			var offsetY = int.Parse(mapSection.GetValue("Y", "0"));
-			var width = int.Parse(mapSection.GetValue("Width", "0"));
-			var height = int.Parse(mapSection.GetValue("Height", "0"));
-			mapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64;
-
-			map.Title = basic.GetValue("Name", "(null)");
-			map.Author = "Westwood Studios";
-			map.Tileset = Truncate(mapSection.GetValue("Theater", "TEMPERAT"), 8);
-			map.MapSize.X = mapSize;
-			map.MapSize.Y = mapSize;
-			map.Bounds = Rectangle.FromLTRB(offsetX, offsetY, offsetX + width, offsetY + height);
-			map.Selectable = true;
-
-			map.Smudges = Lazy.New(() => new List<SmudgeReference>());
-			map.Actors = Lazy.New(() => new Dictionary<string, ActorReference>());
-			map.MapResources = Lazy.New(() => new TileReference<byte, byte>[mapSize, mapSize]);
-			map.MapTiles = Lazy.New(() => new TileReference<ushort, byte>[mapSize, mapSize]);
-
-			if (legacyMapFormat == IniMapFormat.RedAlert)
-			{
-				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
-				UnpackRAOverlayData(ReadPackedSection(file.GetSection("OverlayPack")));
-				ReadRATrees(file);
-			}
-			else
-			{
-				// CnC
-				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"));
-				ReadCncOverlay(file);
-				ReadCncTrees(file);
-			}
-
-			LoadActors(file, "STRUCTURES");
-			LoadActors(file, "UNITS");
-			LoadActors(file, "INFANTRY");
-			LoadSmudges(file, "SMUDGE");
-
-			foreach (var p in players)
-				LoadPlayer(file, p, legacyMapFormat == IniMapFormat.RedAlert);
-
-			var wps = file.GetSection("Waypoints")
-					.Where(kv => int.Parse(kv.Value) > 0)
-					.Select(kv => Pair.New(int.Parse(kv.Key),
-						LocationFromMapOffset(int.Parse(kv.Value), mapSize)))
-					.ToArray();
-
-			// Add waypoint actors
-			foreach (var kv in wps)
-			{
-				var a = new ActorReference("waypoint");
-				a.Add(new LocationInit((CPos)kv.Second));
-				a.Add(new OwnerInit("Neutral"));
-				map.Actors.Value.Add("waypoint" + kv.First, a);
-			}
-		}
-
-		static int2 LocationFromMapOffset(int offset, int mapSize)
-		{
-			return new int2(offset % mapSize, offset / mapSize);
-		}
-
-		static MemoryStream ReadPackedSection(IniSection mapPackSection)
-		{
-			var sb = new StringBuilder();
-			for (int i = 1;; i++)
-			{
-				var line = mapPackSection.GetValue(i.ToString(), null);
-				if (line == null)
-					break;
-
-				sb.Append(line.Trim());
-			}
-
-			var data = Convert.FromBase64String(sb.ToString());
-			var chunks = new List<byte[]>();
-			var reader = new BinaryReader(new MemoryStream(data));
-
-			try
-			{
-				while (true)
-				{
-					var length = reader.ReadUInt32() & 0xdfffffff;
-					var dest = new byte[8192];
-					var src = reader.ReadBytes((int)length);
-
-					/*int actualLength =*/
-					Format80.DecodeInto(src, dest);
-
-					chunks.Add(dest);
-				}
-			}
-			catch (EndOfStreamException) { }
-
-			var ms = new MemoryStream();
-			foreach (var chunk in chunks)
-				ms.Write(chunk, 0, chunk.Length);
-
-			ms.Position = 0;
-
-			return ms;
-		}
-
-		void UnpackRATileData(MemoryStream ms)
-		{
-			for (int i = 0; i < mapSize; i++)
-				for (int j = 0; j < mapSize; j++)
-					map.MapTiles.Value[i, j] = new TileReference<ushort, byte>();
-
-			for (int j = 0; j < mapSize; j++)
-				for (int i = 0; i < mapSize; i++)
-					map.MapTiles.Value[i, j].Type = ms.ReadUInt16();
-
-			for (int j = 0; j < mapSize; j++)
-				for (int i = 0; i < mapSize; i++)
-					map.MapTiles.Value[i, j].Index = ms.ReadUInt8();
-		}
-
-		void UnpackRAOverlayData(MemoryStream ms)
-		{
-			for (int j = 0; j < mapSize; j++)
-			{
-				for (int i = 0; i < mapSize; i++)
-				{
-					var o = ms.ReadUInt8();
-					var res = Pair.New((byte)0, (byte)0);
-
-					if (o != 255 && overlayResourceMapping.ContainsKey(redAlertOverlayNames[o]))
-						res = overlayResourceMapping[redAlertOverlayNames[o]];
-
-					map.MapResources.Value[i, j] = new TileReference<byte, byte>(res.First, res.Second);
-
-					if (o != 255 && overlayActorMapping.ContainsKey(redAlertOverlayNames[o]))
-					{
-						map.Actors.Value.Add("Actor" + actorCount++,
-							new ActorReference(overlayActorMapping[redAlertOverlayNames[o]])
-							{
-								new LocationInit(new CPos(i, j)),
-								new OwnerInit("Neutral")
-							});
-					}
-				}
-			}
-		}
-
-		void ReadRATrees(IniFile file)
-		{
-			var terrain = file.GetSection("TERRAIN", true);
-			if (terrain == null)
-				return;
-
-			foreach (KeyValuePair<string, string> kv in terrain)
-			{
-				var loc = int.Parse(kv.Key);
-				map.Actors.Value.Add("Actor" + actorCount++,
-					new ActorReference(kv.Value.ToLowerInvariant())
-					{
-						new LocationInit(new CPos(loc % mapSize, loc / mapSize)),
-						new OwnerInit("Neutral")
-					});
-			}
-		}
-
-		void UnpackCncTileData(Stream ms)
-		{
-			for (int i = 0; i < mapSize; i++)
-				for (int j = 0; j < mapSize; j++)
-					map.MapTiles.Value[i, j] = new TileReference<ushort, byte>();
-
-			for (int j = 0; j < mapSize; j++)
-			{
-				for (int i = 0; i < mapSize; i++)
-				{
-					map.MapTiles.Value[i, j].Type = ms.ReadUInt8();
-					map.MapTiles.Value[i, j].Index = ms.ReadUInt8();
-				}
-			}
-		}
-
-		void ReadCncOverlay(IniFile file)
-		{
-			var overlay = file.GetSection("OVERLAY", true);
-			if (overlay == null)
-				return;
-
-			foreach (KeyValuePair<string, string> kv in overlay)
-			{
-				var loc = int.Parse(kv.Key);
-				var cell = new CPos(loc % mapSize, loc / mapSize);
-
-				var res = Pair.New((byte)0, (byte)0);
-				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
-					res = overlayResourceMapping[kv.Value.ToLower()];
-
-				map.MapResources.Value[cell.X, cell.Y] = new TileReference<byte, byte>(res.First, res.Second);
-
-				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
-					map.Actors.Value.Add("Actor" + actorCount++,
-						new ActorReference(overlayActorMapping[kv.Value.ToLower()])
-						{
-							new LocationInit(cell),
-							new OwnerInit("Neutral")
-						});
-			}
-		}
-
-		void ReadCncTrees(IniFile file)
-		{
-			var terrain = file.GetSection("TERRAIN", true);
-			if (terrain == null)
-				return;
-
-			foreach (KeyValuePair<string, string> kv in terrain)
-			{
-				var loc = int.Parse(kv.Key);
-				map.Actors.Value.Add("Actor" + actorCount++,
-					new ActorReference(kv.Value.Split(',')[0].ToLowerInvariant())
-					{
-						new LocationInit(new CPos(loc % mapSize, loc / mapSize)),
-						new OwnerInit("Neutral")
-					});
-			}
-		}
-
-		void LoadActors(IniFile file, string section)
-		{
-			foreach (var s in file.GetSection(section, true))
-			{
-				// Structures: num=owner,type,health,location,turret-facing,trigger
-				// Units: num=owner,type,health,location,facing,action,trigger
-				// Infantry: num=owner,type,health,location,subcell,action,facing,trigger
-				try
-				{
-					var parts = s.Value.Split(',');
-					var loc = int.Parse(parts[3]);
-					if (parts[0] == "")
-						parts[0] = "Neutral";
-
-					if (!players.Contains(parts[0]))
-						players.Add(parts[0]);
-
-					var actor = new ActorReference(parts[1].ToLowerInvariant())
-					{
-						new LocationInit(new CPos(loc % mapSize, loc / mapSize)),
-						new OwnerInit(parts[0]),
-						new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo) / 256),
-						new FacingInit((section == "INFANTRY") ? int.Parse(parts[6]) : int.Parse(parts[4])),
-					};
-
-					if (section == "INFANTRY")
-						actor.Add(new SubCellInit(int.Parse(parts[4])));
-
-					if (!Rules.Info.ContainsKey(parts[1].ToLowerInvariant()))
-						errorHandler("Ignoring unknown actor type: `{0}`".F(parts[1].ToLowerInvariant()));
-					else
-						map.Actors.Value.Add("Actor" + actorCount++, actor);
-				}
-				catch (Exception)
-				{
-					errorHandler("Malformed actor definition: `{0}`".F(s));
-				}
-			}
-		}
-
-		void LoadSmudges(IniFile file, string section)
-		{
-			foreach (var s in file.GetSection(section, true))
-			{
-				// loc=type,loc,depth
-				var parts = s.Value.Split(',');
-				var loc = int.Parse(parts[1]);
-				map.Smudges.Value.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % mapSize, loc / mapSize), int.Parse(parts[2])));
-			}
-		}
-
-		void LoadPlayer(IniFile file, string section, bool isRA)
-		{
-			string c;
-			string race;
-			switch (section)
-			{
-				case "Spain":
-					c = "gold";
-					race = "allies";
-					break;
-				case "England":
-					c = "green";
-					race = "allies";
-					break;
-				case "Ukraine":
-					c = "orange";
-					race = "soviet";
-					break;
-				case "Germany":
-					c = "black";
-					race = "allies";
-					break;
-				case "France":
-					c = "teal";
-					race = "allies";
-					break;
-				case "Turkey":
-					c = "salmon";
-					race = "allies";
-					break;
-				case "Greece":
-				case "GoodGuy":
-					c = isRA ? "blue" : "gold";
-					race = isRA ? "allies" : "gdi";
-					break;
-				case "USSR":
-				case "BadGuy":
-					c = "red";
-					race = isRA ? "soviet" : "nod";
-					break;
-				case "Special":
-				case "Neutral":
-				default:
-					c = "neutral";
-					race = isRA ? "allies" : "gdi";
-					break;
-			}
-
-			var pr = new PlayerReference
-			{
-				Name = section,
-				OwnsWorld = section == "Neutral",
-				NonCombatant = section == "Neutral",
-				Race = race,
-				Color = namedColorMapping[c]
-			};
-
-			var neutral = new[] { "Neutral" };
-			foreach (var s in file.GetSection(section, true))
-			{
-				Console.WriteLine(s.Key);
-				switch (s.Key)
-				{
-					case "Allies":
-						pr.Allies = s.Value.Split(',').Intersect(players).Except(neutral).ToArray();
-						pr.Enemies = s.Value.Split(',').SymmetricDifference(players).Except(neutral).ToArray();
-					break;
-				}
-			}
-
-			map.Players.Add(section, pr);
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using OpenRA;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
+using System.Drawing;
+using System.Globalization;
+
+namespace OpenRA.Editor
+{
+	public class LegacyMapImporter
+	{
+		// Mapping from ra overlay index to type string
+		static string[] raOverlayNames =
+		{
+			"sbag", "cycl", "brik", "fenc", "wood",
+			"gold01", "gold02", "gold03", "gold04",
+			"gem01", "gem02", "gem03", "gem04",
+			"v12", "v13", "v14", "v15", "v16", "v17", "v18",
+			"fpls", "wcrate", "scrate", "barb", "sbag",
+		};
+
+		static Dictionary<string, Pair<byte, byte>> overlayResourceMapping = new Dictionary<string, Pair<byte, byte>>()
+		{
+			// RA Gems, Gold
+			{ "gold01", new Pair<byte,byte>(1,0) },
+			{ "gold02", new Pair<byte,byte>(1,1) },
+			{ "gold03", new Pair<byte,byte>(1,2) },
+			{ "gold04", new Pair<byte,byte>(1,3) },
+			
+			{ "gem01", new Pair<byte,byte>(2,0) },
+			{ "gem02", new Pair<byte,byte>(2,1) },
+			{ "gem03", new Pair<byte,byte>(2,2) },
+			{ "gem04", new Pair<byte,byte>(2,3) },
+			
+			// cnc tiberium
+			{ "ti1", new Pair<byte,byte>(1,0) },
+			{ "ti2", new Pair<byte,byte>(1,1) },
+			{ "ti3", new Pair<byte,byte>(1,2) },
+			{ "ti4", new Pair<byte,byte>(1,3) },
+			{ "ti5", new Pair<byte,byte>(1,4) },
+			{ "ti6", new Pair<byte,byte>(1,5) },
+			{ "ti7", new Pair<byte,byte>(1,6) },
+			{ "ti8", new Pair<byte,byte>(1,7) },
+			{ "ti9", new Pair<byte,byte>(1,8) },
+			{ "ti10", new Pair<byte,byte>(1,9) },
+			{ "ti11", new Pair<byte,byte>(1,10) },
+			{ "ti12", new Pair<byte,byte>(1,11) },
+		};
+
+		static Dictionary<string, string> overlayActorMapping = new Dictionary<string, string>() {
+			// Fences
+			{"sbag","sbag"},
+			{"cycl","cycl"},
+			{"brik","brik"},
+			{"fenc","fenc"},
+			{"wood","wood"},
+			
+			// Fields
+			{"v12","v12"},
+			{"v13","v13"},
+			{"v14","v14"},
+			{"v15","v15"},
+			{"v16","v16"},
+			{"v17","v17"},
+			{"v18","v18"},
+			
+			// Crates
+//			{"wcrate","crate"},
+//			{"scrate","crate"},
+		};
+		
+		static Dictionary<string,Pair<Color,Color>> namedColorMapping = new Dictionary<string, Pair<Color, Color>>()
+		{
+			{"gold",Pair.New(Color.FromArgb(246,214,121),Color.FromArgb(40,32,8))},
+			{"blue",Pair.New(Color.FromArgb(226,230,246),Color.FromArgb(8,20,52))},
+			{"red",Pair.New(Color.FromArgb(255,20,0),Color.FromArgb(56,0,0))},
+			{"neutral",Pair.New(Color.FromArgb(238,238,238),Color.FromArgb(44,28,24))},
+			{"orange",Pair.New(Color.FromArgb(255,230,149),Color.FromArgb(56,0,0))},
+			{"teal",Pair.New(Color.FromArgb(93,194,165),Color.FromArgb(0,32,32))},
+			{"salmon",Pair.New(Color.FromArgb(210,153,125),Color.FromArgb(56,0,0))},
+			{"green",Pair.New(Color.FromArgb(160,240,140),Color.FromArgb(20,20,20))},
+			{"white",Pair.New(Color.FromArgb(255,255,255),Color.FromArgb(75,75,75))},
+			{"black",Pair.New(Color.FromArgb(80,80,80),Color.FromArgb(5,5,5))},
+		};
+		
+		int MapSize;
+		int ActorCount = 0;
+		Map Map = new Map();
+		List<string> Players = new List<string>();
+		
+		LegacyMapImporter(string filename)
+		{
+			ConvertIniMap(filename);
+		}
+
+		public static Map Import(string filename)
+		{
+			var converter = new LegacyMapImporter(filename);
+			return converter.Map;
+		}
+
+		enum IniMapFormat { RedAlert = 3, /* otherwise, cnc (2 variants exist, we don't care to differentiate) */ };
+		
+		public void ConvertIniMap(string iniFile)
+		{
+			var file = new IniFile(FileSystem.Open(iniFile));
+			var basic = file.GetSection("Basic");
+			var map = file.GetSection("Map");
+			var legacyMapFormat = (IniMapFormat)int.Parse(basic.GetValue("NewINIFormat", "0"));
+			var XOffset = int.Parse(map.GetValue("X", "0"));
+			var YOffset = int.Parse(map.GetValue("Y", "0"));
+			var Width = int.Parse(map.GetValue("Width", "0"));
+			var Height = int.Parse(map.GetValue("Height", "0"));
+			MapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64;
+
+			Map.Title = basic.GetValue("Name", "(null)");
+			Map.Author = "Westwood Studios";
+			Map.Tileset = Truncate(map.GetValue("Theater", "TEMPERAT"), 8);
+			Map.MapSize.X = MapSize;
+			Map.MapSize.Y = MapSize;
+			Map.TopLeft = new int2(XOffset, YOffset);
+			Map.BottomRight = new int2(XOffset + Width, YOffset + Height);
+			Map.Selectable = true;
+
+			if (legacyMapFormat == IniMapFormat.RedAlert)
+			{
+				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
+				UnpackRAOverlayData(ReadPackedSection(file.GetSection("OverlayPack")));
+				ReadRATrees(file);
+			}
+			else // CNC
+			{
+				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"));
+				ReadCncOverlay(file);
+				ReadCncTrees(file);
+			}
+
+			LoadActors(file, "STRUCTURES");
+			LoadActors(file, "UNITS");
+			LoadActors(file, "INFANTRY");
+			LoadSmudges(file, "SMUDGE");
+
+			foreach (var p in Players)
+				LoadPlayer(file, p, (legacyMapFormat == IniMapFormat.RedAlert));
+			
+			var wp = file.GetSection("Waypoints")
+					.Where(kv => int.Parse(kv.Value) > 0)
+					.Select(kv => Pair.New(int.Parse(kv.Key),
+						LocationFromMapOffset(int.Parse(kv.Value), MapSize)))
+					.ToArray();
+
+			Map.PlayerCount = wp.Count();
+
+			foreach (var kv in wp)
+				Map.Waypoints.Add("spawn" + kv.First, kv.Second);
+		}
+
+		static int2 LocationFromMapOffset(int offset, int mapSize)
+		{
+			return new int2(offset % mapSize, offset / mapSize);
+		}
+
+		static MemoryStream ReadPackedSection(IniSection mapPackSection)
+		{
+			StringBuilder sb = new StringBuilder();
+			for (int i = 1; ; i++)
+			{
+				string line = mapPackSection.GetValue(i.ToString(), null);
+				if (line == null)
+					break;
+
+				sb.Append(line.Trim());
+			}
+
+			byte[] data = Convert.FromBase64String(sb.ToString());
+			List<byte[]> chunks = new List<byte[]>();
+			BinaryReader reader = new BinaryReader(new MemoryStream(data));
+
+			try
+			{
+				while (true)
+				{
+					uint length = reader.ReadUInt32() & 0xdfffffff;
+					byte[] dest = new byte[8192];
+					byte[] src = reader.ReadBytes((int)length);
+
+					/*int actualLength =*/
+					Format80.DecodeInto(src, dest);
+
+					chunks.Add(dest);
+				}
+			}
+			catch (EndOfStreamException) { }
+
+			MemoryStream ms = new MemoryStream();
+			foreach (byte[] chunk in chunks)
+				ms.Write(chunk, 0, chunk.Length);
+
+			ms.Position = 0;
+
+			return ms;
+		}
+
+		static byte ReadByte(Stream s)
+		{
+			int ret = s.ReadByte();
+			if (ret == -1)
+				throw new NotImplementedException();
+			return (byte)ret;
+		}
+
+		static ushort ReadWord(Stream s)
+		{
+			ushort ret = ReadByte(s);
+			ret |= (ushort)(ReadByte(s) << 8);
+
+			return ret;
+		}
+
+		void UnpackRATileData(MemoryStream ms)
+		{
+			Map.MapTiles = new TileReference<ushort, byte>[MapSize, MapSize];
+			for (int i = 0; i < MapSize; i++)
+				for (int j = 0; j < MapSize; j++)
+					Map.MapTiles[i, j] = new TileReference<ushort, byte>();
+
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+					Map.MapTiles[i, j].type = ReadWord(ms);
+
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+				{
+					Map.MapTiles[i, j].index = ReadByte(ms);
+					if (Map.MapTiles[i, j].type == 0xff || Map.MapTiles[i, j].type == 0xffff)
+						Map.MapTiles[i, j].index = byte.MaxValue;
+				}
+		}
+
+		void UnpackRAOverlayData(MemoryStream ms)
+		{
+			Map.MapResources = new TileReference<byte, byte>[MapSize, MapSize];
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+				{
+					byte o = ReadByte(ms);
+					var res = Pair.New((byte)0, (byte)0);
+
+					if (o != 255 && overlayResourceMapping.ContainsKey(raOverlayNames[o]))
+						res = overlayResourceMapping[raOverlayNames[o]];
+
+					Map.MapResources[i, j] = new TileReference<byte, byte>(res.First, res.Second);
+
+					if (o != 255 && overlayActorMapping.ContainsKey(raOverlayNames[o]))
+						Map.Actors.Add("Actor" + ActorCount++,
+							new ActorReference(overlayActorMapping[raOverlayNames[o]]) 
+							{ 
+								new LocationInit( new int2(i, j) ),
+								new OwnerInit( "Neutral" ) 
+							});
+				}
+		}
+
+		void ReadRATrees(IniFile file)
+		{
+			IniSection terrain = file.GetSection("TERRAIN", true);
+			if (terrain == null)
+				return;
+
+			foreach (KeyValuePair<string, string> kv in terrain)
+			{
+				var loc = int.Parse(kv.Key);
+				Map.Actors.Add("Actor" + ActorCount++, 
+					new ActorReference(kv.Value.ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit("Neutral")
+					});
+			}
+		}
+
+		void UnpackCncTileData(Stream ms)
+		{
+			Map.MapTiles = new TileReference<ushort, byte>[MapSize, MapSize];
+			for (int i = 0; i < MapSize; i++)
+				for (int j = 0; j < MapSize; j++)
+					Map.MapTiles[i, j] = new TileReference<ushort, byte>();
+
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+				{
+					Map.MapTiles[i, j].type = ReadByte(ms);
+					Map.MapTiles[i, j].index = ReadByte(ms);
+
+					if (Map.MapTiles[i, j].type == 0xff)
+						Map.MapTiles[i, j].index = byte.MaxValue;
+				}
+		}
+
+		void ReadCncOverlay(IniFile file)
+		{
+			IniSection overlay = file.GetSection("OVERLAY", true);
+			if (overlay == null)
+				return;
+
+			Map.MapResources = new TileReference<byte, byte>[MapSize, MapSize];
+			foreach (KeyValuePair<string, string> kv in overlay)
+			{
+				var loc = int.Parse(kv.Key);
+				int2 cell = new int2(loc % MapSize, loc / MapSize);
+
+				var res = Pair.New((byte)0, (byte)0);
+				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
+					res = overlayResourceMapping[kv.Value.ToLower()];
+
+				Map.MapResources[cell.X, cell.Y] = new TileReference<byte, byte>(res.First, res.Second);
+
+				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
+					Map.Actors.Add("Actor" + ActorCount++, 
+						new ActorReference(overlayActorMapping[kv.Value.ToLower()])
+						{
+							new LocationInit(cell),
+							new OwnerInit("Neutral")
+						});
+			}
+		}
+
+		void ReadCncTrees(IniFile file)
+		{
+			IniSection terrain = file.GetSection("TERRAIN", true);
+			if (terrain == null)
+				return;
+
+			foreach (KeyValuePair<string, string> kv in terrain)
+			{
+				var loc = int.Parse(kv.Key);
+				Map.Actors.Add("Actor" + ActorCount++,
+					new ActorReference(kv.Value.Split(',')[0].ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit("Neutral")
+					});
+			}
+		}
+
+		void LoadActors(IniFile file, string section)
+		{
+			foreach (var s in file.GetSection(section, true))
+			{
+				//Structures: num=owner,type,health,location,turret-facing,trigger
+				//Units: num=owner,type,health,location,facing,action,trigger
+				//Infantry: num=owner,type,health,location,subcell,action,facing,trigger
+				var parts = s.Value.Split(',');
+				var loc = int.Parse(parts[3]);
+				if (parts[0] == "")
+					parts[0] = "Neutral";
+				
+				
+				if (!Players.Contains(parts[0]))
+					Players.Add(parts[0]);
+				
+				var stance = ActorStance.Stance.None;
+				switch(parts[5])
+				{
+					case "Area Guard":
+					case "Guard":
+						stance = ActorStance.Stance.Guard;
+					break;
+					case "Defend Base":
+						stance = ActorStance.Stance.Defend;
+					break;
+					case "Hunt":
+					case "Rampage":
+					case "Attack Base":
+					case "Attack Units":
+					case "Attack Civil.":
+					case "Attack Tarcom":
+						stance = ActorStance.Stance.Hunt;
+					break;
+					case "Retreat":
+					case "Return":
+						stance = ActorStance.Stance.Retreat;
+					break;
+					// do we care about `Harvest' and `Sticky'?
+				}
+				
+				var actor = new ActorReference(parts[1].ToLowerInvariant())
+				{
+					new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+					new OwnerInit(parts[0]),
+					new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo)/256),
+					new FacingInit((section == "INFANTRY") ? int.Parse(parts[6]) : int.Parse(parts[4])),
+					new ActorStanceInit(stance),
+				};
+				
+				if (section == "INFANTRY")
+					actor.Add(new SubcellInit(int.Parse(parts[4])));
+				
+				Map.Actors.Add("Actor" + ActorCount++,actor);
+					
+			}
+		}
+
+		void LoadSmudges(IniFile file, string section)
+		{
+			foreach (var s in file.GetSection(section, true))
+			{
+				//loc=type,loc,depth
+				var parts = s.Value.Split(',');
+				var loc = int.Parse(parts[1]);
+				Map.Smudges.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), int.Parse(parts[2])));
+			}
+		}
+		
+		void LoadPlayer(IniFile file, string section, bool isRA)
+		{			
+			var c = (section == "BadGuy") ? "red" :
+						(isRA) ? "blue" : "gold";
+			
+			var color = namedColorMapping[c];
+			
+			var pr = new PlayerReference
+			{
+				Name = section,
+				OwnsWorld = (section == "Neutral"),
+				NonCombatant = (section == "Neutral"),
+				Race = (isRA) ? ((section == "BadGuy") ? "soviet" : "allies") : ((section == "BadGuy") ? "nod" : "gdi"),
+				Color = color.First,
+				Color2 = color.Second,
+			};
+			
+			var Neutral = new List<string>(){"Neutral"};
+			foreach (var s in file.GetSection(section, true))
+			{
+				Console.WriteLine(s.Key);
+				switch(s.Key)
+				{
+					case "Credits":
+						pr.InitialCash = int.Parse(s.Value);
+					break;
+					case "Allies":
+						pr.Allies = s.Value.Split(',').Intersect(Players).Except(Neutral).ToArray();
+						pr.Enemies = s.Value.Split(',').SymmetricDifference(Players).Except(Neutral).ToArray();
+					break;
+				}
+			}
+			
+			Map.Players.Add(section, pr);
+		}
+
+		static string Truncate(string s, int maxLength)
+		{
+			return s.Length <= maxLength ? s : s.Substring(0, maxLength);
+		}
+	}
+}

OpenRA.Editor/MapSelect.Designer.cs

@@ -1,319 +1,375 @@
-#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.Editor
-{
-	partial class MapSelect
-	{
-		// TODO:
-		private System.ComponentModel.IContainer components = null;
-
-		// TODO:
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-
-			base.Dispose(disposing);
-		}
-
-		// TODO:
-		private void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
-			this.MapList = new System.Windows.Forms.ListView();
-			this.ColumnMapName = new System.Windows.Forms.ColumnHeader("(none)");
-			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
-			this.ButtonCancel = new System.Windows.Forms.Button();
-			this.ButtonOkay = new System.Windows.Forms.Button();
-			this.NewLabel = new System.Windows.Forms.Label();
-			this.NewText = new System.Windows.Forms.TextBox();
-			this.MiniMapBox = new System.Windows.Forms.PictureBox();
-			this.BottomPanel = new System.Windows.Forms.Panel();
-			this.PathOutText = new System.Windows.Forms.TextBox();
-			this.PathOutLabel = new System.Windows.Forms.Label();
-			this.PathLabel = new System.Windows.Forms.Label();
-			this.SplitContainer1 = new System.Windows.Forms.SplitContainer();
-			this.MapListLabel = new System.Windows.Forms.Label();
-			this.DescTxt = new System.Windows.Forms.TextBox();
-			this.DescLabel = new System.Windows.Forms.Label();
-			this.TheaterText = new System.Windows.Forms.TextBox();
-			this.TheaterLabel = new System.Windows.Forms.Label();
-			this.AuthorText = new System.Windows.Forms.TextBox();
-			this.AuthorLabel = new System.Windows.Forms.Label();
-			this.TitleText = new System.Windows.Forms.TextBox();
-			this.MapNameLabel = new System.Windows.Forms.Label();
-			this.MiniMapLabel = new System.Windows.Forms.Label();
-			this.pictureBox1 = new System.Windows.Forms.PictureBox();
-			((System.ComponentModel.ISupportInitialize)this.MiniMapBox).BeginInit();
-			this.BottomPanel.SuspendLayout();
-			this.SplitContainer1.Panel1.SuspendLayout();
-			this.SplitContainer1.Panel2.SuspendLayout();
-			this.SplitContainer1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)this.pictureBox1).BeginInit();
-			this.SuspendLayout();
-
-			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {	this.ColumnMapName });
-			this.MapList.FullRowSelect = true;
-			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-			this.MapList.LargeImageList = this.MapIconsList;
-			this.MapList.Location = new System.Drawing.Point(15, 25);
-			this.MapList.MultiSelect = false;
-			this.MapList.Name = "MapList";
-			this.MapList.Size = new System.Drawing.Size(273, 294);
-			this.MapList.SmallImageList = this.MapIconsList;
-			this.MapList.StateImageList = this.MapIconsList;
-			this.MapList.TabIndex = 0;
-			this.MapList.UseCompatibleStateImageBehavior = false;
-			this.MapList.View = System.Windows.Forms.View.Details;
-			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
-
-			this.ColumnMapName.Text = "Map name";
-			this.ColumnMapName.Width = 240;
-
-			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
-			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
-			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
-
-			this.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.ButtonCancel.Location = new System.Drawing.Point(407, 35);
-			this.ButtonCancel.Name = "btnCancel";
-			this.ButtonCancel.Size = new System.Drawing.Size(75, 23);
-			this.ButtonCancel.TabIndex = 3;
-			this.ButtonCancel.Text = "Cancel";
-			this.ButtonCancel.UseVisualStyleBackColor = true;
-
-			this.ButtonOkay.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.ButtonOkay.Location = new System.Drawing.Point(326, 35);
-			this.ButtonOkay.Name = "btnOk";
-			this.ButtonOkay.Size = new System.Drawing.Size(75, 23);
-			this.ButtonOkay.TabIndex = 2;
-			this.ButtonOkay.Text = "Open";
-			this.ButtonOkay.UseVisualStyleBackColor = true;
-
-			this.NewLabel.AutoSize = true;
-			this.NewLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.NewLabel.Location = new System.Drawing.Point(12, 40);
-			this.NewLabel.Name = "lblNew";
-			this.NewLabel.Size = new System.Drawing.Size(69, 13);
-			this.NewLabel.TabIndex = 3;
-			this.NewLabel.Text = "Map name:";
-
-			this.NewText.BackColor = System.Drawing.SystemColors.Window;
-			this.NewText.Location = new System.Drawing.Point(88, 37);
-			this.NewText.Name = "txtNew";
-			this.NewText.ReadOnly = true;
-			this.NewText.Size = new System.Drawing.Size(232, 20);
-			this.NewText.TabIndex = 1;
-
-			this.MiniMapBox.BackColor = System.Drawing.Color.Black;
-			this.MiniMapBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-			this.MiniMapBox.Location = new System.Drawing.Point(32, 25);
-			this.MiniMapBox.Name = "pbMinimap";
-			this.MiniMapBox.Size = new System.Drawing.Size(124, 124);
-			this.MiniMapBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-			this.MiniMapBox.TabIndex = 5;
-			this.MiniMapBox.TabStop = false;
-
-			this.BottomPanel.Controls.Add(this.pictureBox1);
-			this.BottomPanel.Controls.Add(this.PathOutText);
-			this.BottomPanel.Controls.Add(this.PathOutLabel);
-			this.BottomPanel.Controls.Add(this.PathLabel);
-			this.BottomPanel.Controls.Add(this.ButtonCancel);
-			this.BottomPanel.Controls.Add(this.ButtonOkay);
-			this.BottomPanel.Controls.Add(this.NewText);
-			this.BottomPanel.Controls.Add(this.NewLabel);
-			this.BottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.BottomPanel.Location = new System.Drawing.Point(0, 332);
-			this.BottomPanel.MaximumSize = new System.Drawing.Size(0, 70);
-			this.BottomPanel.Name = "pnlBottom";
-			this.BottomPanel.Size = new System.Drawing.Size(494, 70);
-			this.BottomPanel.TabIndex = 6;
-
-			this.PathOutText.BackColor = System.Drawing.SystemColors.Window;
-			this.PathOutText.Location = new System.Drawing.Point(55, 10);
-			this.PathOutText.Name = "txtPathOut";
-			this.PathOutText.ReadOnly = true;
-			this.PathOutText.Size = new System.Drawing.Size(265, 20);
-			this.PathOutText.TabIndex = 0;
-			this.PathOutText.TextChanged += new System.EventHandler(this.PathOutTextChanged);
-
-			this.PathOutLabel.AutoSize = true;
-			this.PathOutLabel.Location = new System.Drawing.Point(55, 13);
-			this.PathOutLabel.Name = "lblPathOut";
-			this.PathOutLabel.Size = new System.Drawing.Size(0, 13);
-			this.PathOutLabel.TabIndex = 6;
-
-			this.PathLabel.AutoSize = true;
-			this.PathLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.PathLabel.Location = new System.Drawing.Point(12, 13);
-			this.PathLabel.Name = "lblPath";
-			this.PathLabel.Size = new System.Drawing.Size(37, 13);
-			this.PathLabel.TabIndex = 5;
-			this.PathLabel.Text = "Path:";
-
-			this.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.SplitContainer1.Location = new System.Drawing.Point(0, 0);
-			this.SplitContainer1.Name = "splitContainer1";
-
-			this.SplitContainer1.Panel1.Controls.Add(this.MapListLabel);
-			this.SplitContainer1.Panel1.Controls.Add(this.MapList);
-
-			this.SplitContainer1.Panel2.Controls.Add(this.DescTxt);
-			this.SplitContainer1.Panel2.Controls.Add(this.DescLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.TheaterText);
-			this.SplitContainer1.Panel2.Controls.Add(this.TheaterLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.AuthorText);
-			this.SplitContainer1.Panel2.Controls.Add(this.AuthorLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.TitleText);
-			this.SplitContainer1.Panel2.Controls.Add(this.MapNameLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.MiniMapLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.MiniMapBox);
-			this.SplitContainer1.Size = new System.Drawing.Size(494, 332);
-			this.SplitContainer1.SplitterDistance = 300;
-			this.SplitContainer1.TabIndex = 7;
-
-			this.MapListLabel.AutoSize = true;
-			this.MapListLabel.Location = new System.Drawing.Point(12, 9);
-			this.MapListLabel.Name = "lblMapList";
-			this.MapListLabel.Size = new System.Drawing.Size(81, 13);
-			this.MapListLabel.TabIndex = 1;
-			this.MapListLabel.Text = "Available maps:";
-
-			this.DescTxt.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.DescTxt.Location = new System.Drawing.Point(16, 289);
-			this.DescTxt.Name = "txtDesc";
-			this.DescTxt.ReadOnly = true;
-			this.DescTxt.Size = new System.Drawing.Size(162, 20);
-			this.DescTxt.TabIndex = 14;
-
-			this.DescLabel.AutoSize = true;
-			this.DescLabel.Location = new System.Drawing.Point(13, 273);
-			this.DescLabel.Name = "lblDesc";
-			this.DescLabel.Size = new System.Drawing.Size(63, 13);
-			this.DescLabel.TabIndex = 13;
-			this.DescLabel.Text = "Description:";
-
-			this.TheaterText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.TheaterText.Location = new System.Drawing.Point(16, 252);
-			this.TheaterText.Name = "txtTheater";
-			this.TheaterText.ReadOnly = true;
-			this.TheaterText.Size = new System.Drawing.Size(162, 20);
-			this.TheaterText.TabIndex = 12;
-
-			this.TheaterLabel.AutoSize = true;
-			this.TheaterLabel.Location = new System.Drawing.Point(13, 236);
-			this.TheaterLabel.Name = "lblTheater";
-			this.TheaterLabel.Size = new System.Drawing.Size(47, 13);
-			this.TheaterLabel.TabIndex = 11;
-			this.TheaterLabel.Text = "Tileset:";
-
-			this.AuthorText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.AuthorText.Location = new System.Drawing.Point(16, 214);
-			this.AuthorText.Name = "txtAuthor";
-			this.AuthorText.ReadOnly = true;
-			this.AuthorText.Size = new System.Drawing.Size(162, 20);
-			this.AuthorText.TabIndex = 10;
-
-			this.AuthorLabel.AutoSize = true;
-			this.AuthorLabel.Location = new System.Drawing.Point(13, 198);
-			this.AuthorLabel.Name = "lblAuthor";
-			this.AuthorLabel.Size = new System.Drawing.Size(41, 13);
-			this.AuthorLabel.TabIndex = 9;
-			this.AuthorLabel.Text = "Author:";
-
-			this.TitleText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.TitleText.Location = new System.Drawing.Point(16, 177);
-			this.TitleText.Name = "txtTitle";
-			this.TitleText.ReadOnly = true;
-			this.TitleText.Size = new System.Drawing.Size(162, 20);
-			this.TitleText.TabIndex = 8;
-
-			this.MapNameLabel.AutoSize = true;
-			this.MapNameLabel.Location = new System.Drawing.Point(13, 161);
-			this.MapNameLabel.Name = "lblMapName";
-			this.MapNameLabel.Size = new System.Drawing.Size(30, 13);
-			this.MapNameLabel.TabIndex = 7;
-			this.MapNameLabel.Text = "Title:";
-
-			this.MiniMapLabel.AutoSize = true;
-			this.MiniMapLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.MiniMapLabel.Location = new System.Drawing.Point(29, 9);
-			this.MiniMapLabel.Name = "lblMinimap";
-			this.MiniMapLabel.Size = new System.Drawing.Size(71, 13);
-			this.MiniMapLabel.TabIndex = 6;
-			this.MiniMapLabel.Text = "Map preview:";
-
-			this.pictureBox1.Image = (System.Drawing.Image)resources.GetObject("pictureBox1.Image");
-			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
-			this.pictureBox1.Name = "pictureBox1";
-			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
-			this.pictureBox1.TabIndex = 7;
-			this.pictureBox1.TabStop = false;
-			this.pictureBox1.Visible = false;
-
-			this.AcceptButton = this.ButtonOkay;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.ButtonCancel;
-			this.ClientSize = new System.Drawing.Size(494, 402);
-			this.Controls.Add(this.SplitContainer1);
-			this.Controls.Add(this.BottomPanel);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "MapSelect";
-			this.ShowIcon = false;
-			this.ShowInTaskbar = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Select map";
-			this.Load += new System.EventHandler(this.MapSelect_Load);
-			((System.ComponentModel.ISupportInitialize)this.MiniMapBox).EndInit();
-			this.BottomPanel.ResumeLayout(false);
-			this.BottomPanel.PerformLayout();
-			this.SplitContainer1.Panel1.ResumeLayout(false);
-			this.SplitContainer1.Panel1.PerformLayout();
-			this.SplitContainer1.Panel2.ResumeLayout(false);
-			this.SplitContainer1.Panel2.PerformLayout();
-			this.SplitContainer1.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)this.pictureBox1).EndInit();
-			this.ResumeLayout(false);
-		}
-
-		public System.Windows.Forms.ListView MapList;
-		public System.Windows.Forms.Button ButtonCancel;
-		public System.Windows.Forms.Button ButtonOkay;
-		public System.Windows.Forms.Label NewLabel;
-		public System.Windows.Forms.TextBox NewText;
-		public System.Windows.Forms.ColumnHeader ColumnMapName;
-		public System.Windows.Forms.ImageList MapIconsList;
-		public System.Windows.Forms.PictureBox MiniMapBox;
-		public System.Windows.Forms.Panel BottomPanel;
-		public System.Windows.Forms.SplitContainer SplitContainer1;
-		public System.Windows.Forms.Label MiniMapLabel;
-		public System.Windows.Forms.TextBox TheaterText;
-		public System.Windows.Forms.Label TheaterLabel;
-		public System.Windows.Forms.TextBox AuthorText;
-		public System.Windows.Forms.Label AuthorLabel;
-		public System.Windows.Forms.TextBox TitleText;
-		public System.Windows.Forms.Label MapNameLabel;
-		public System.Windows.Forms.TextBox DescTxt;
-		public System.Windows.Forms.Label DescLabel;
-		public System.Windows.Forms.Label MapListLabel;
-		public System.Windows.Forms.Label PathOutLabel;
-		public System.Windows.Forms.Label PathLabel;
-		public System.Windows.Forms.TextBox PathOutText;
-		private System.Windows.Forms.PictureBox pictureBox1;
-	}
+namespace OpenRA.Editor
+{
+    partial class MapSelect
+    {
+        /// <summary>
+        /// TODO
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        /// <param name="disposing">TODO</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Код, автоматически созданный конструктором форм Windows
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        private void InitializeComponent()
+        {
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
+			this.MapList = new System.Windows.Forms.ListView();
+			this.colMapName = new System.Windows.Forms.ColumnHeader("(отсутствует)");
+			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.btnOk = new System.Windows.Forms.Button();
+			this.lblNew = new System.Windows.Forms.Label();
+			this.txtNew = new System.Windows.Forms.TextBox();
+			this.pbMinimap = new System.Windows.Forms.PictureBox();
+			this.pnlBottom = new System.Windows.Forms.Panel();
+			this.txtPathOut = new System.Windows.Forms.TextBox();
+			this.lblPathOut = new System.Windows.Forms.Label();
+			this.lblPath = new System.Windows.Forms.Label();
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.lblMapList = new System.Windows.Forms.Label();
+			this.txtDesc = new System.Windows.Forms.TextBox();
+			this.lblDesc = new System.Windows.Forms.Label();
+			this.txtTheater = new System.Windows.Forms.TextBox();
+			this.lblTheater = new System.Windows.Forms.Label();
+			this.txtAuthor = new System.Windows.Forms.TextBox();
+			this.lblAuthor = new System.Windows.Forms.Label();
+			this.txtTitle = new System.Windows.Forms.TextBox();
+			this.lblMapName = new System.Windows.Forms.Label();
+			this.lblMinimap = new System.Windows.Forms.Label();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit();
+			this.pnlBottom.SuspendLayout();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// MapList
+			// 
+			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colMapName});
+			this.MapList.FullRowSelect = true;
+			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.MapList.LargeImageList = this.MapIconsList;
+			this.MapList.Location = new System.Drawing.Point(15, 25);
+			this.MapList.MultiSelect = false;
+			this.MapList.Name = "MapList";
+			this.MapList.Size = new System.Drawing.Size(273, 294);
+			this.MapList.SmallImageList = this.MapIconsList;
+			this.MapList.StateImageList = this.MapIconsList;
+			this.MapList.TabIndex = 0;
+			this.MapList.UseCompatibleStateImageBehavior = false;
+			this.MapList.View = System.Windows.Forms.View.Details;
+			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
+			// 
+			// colMapName
+			// 
+			this.colMapName.Text = "Map name";
+			this.colMapName.Width = 240;
+			// 
+			// MapIconsList
+			// 
+			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
+			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.Location = new System.Drawing.Point(407, 35);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(75, 23);
+			this.btnCancel.TabIndex = 3;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.UseVisualStyleBackColor = true;
+			// 
+			// btnOk
+			// 
+			this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnOk.Location = new System.Drawing.Point(326, 35);
+			this.btnOk.Name = "btnOk";
+			this.btnOk.Size = new System.Drawing.Size(75, 23);
+			this.btnOk.TabIndex = 2;
+			this.btnOk.Text = "Open";
+			this.btnOk.UseVisualStyleBackColor = true;
+			// 
+			// lblNew
+			// 
+			this.lblNew.AutoSize = true;
+			this.lblNew.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblNew.Location = new System.Drawing.Point(12, 40);
+			this.lblNew.Name = "lblNew";
+			this.lblNew.Size = new System.Drawing.Size(69, 13);
+			this.lblNew.TabIndex = 3;
+			this.lblNew.Text = "Map name:";
+			// 
+			// txtNew
+			// 
+			this.txtNew.BackColor = System.Drawing.SystemColors.Window;
+			this.txtNew.Location = new System.Drawing.Point(88, 37);
+			this.txtNew.Name = "txtNew";
+			this.txtNew.ReadOnly = true;
+			this.txtNew.Size = new System.Drawing.Size(232, 20);
+			this.txtNew.TabIndex = 1;
+			// 
+			// pbMinimap
+			// 
+			this.pbMinimap.BackColor = System.Drawing.Color.Black;
+			this.pbMinimap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.pbMinimap.Location = new System.Drawing.Point(32, 25);
+			this.pbMinimap.Name = "pbMinimap";
+			this.pbMinimap.Size = new System.Drawing.Size(124, 124);
+			this.pbMinimap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.pbMinimap.TabIndex = 5;
+			this.pbMinimap.TabStop = false;
+			// 
+			// pnlBottom
+			// 
+			this.pnlBottom.Controls.Add(this.pictureBox1);
+			this.pnlBottom.Controls.Add(this.txtPathOut);
+			this.pnlBottom.Controls.Add(this.lblPathOut);
+			this.pnlBottom.Controls.Add(this.lblPath);
+			this.pnlBottom.Controls.Add(this.btnCancel);
+			this.pnlBottom.Controls.Add(this.btnOk);
+			this.pnlBottom.Controls.Add(this.txtNew);
+			this.pnlBottom.Controls.Add(this.lblNew);
+			this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.pnlBottom.Location = new System.Drawing.Point(0, 332);
+			this.pnlBottom.MaximumSize = new System.Drawing.Size(0, 70);
+			this.pnlBottom.Name = "pnlBottom";
+			this.pnlBottom.Size = new System.Drawing.Size(494, 70);
+			this.pnlBottom.TabIndex = 6;
+			// 
+			// txtPathOut
+			// 
+			this.txtPathOut.BackColor = System.Drawing.SystemColors.Window;
+			this.txtPathOut.Location = new System.Drawing.Point(55, 10);
+			this.txtPathOut.Name = "txtPathOut";
+			this.txtPathOut.ReadOnly = true;
+			this.txtPathOut.Size = new System.Drawing.Size(265, 20);
+			this.txtPathOut.TabIndex = 0;
+			this.txtPathOut.TextChanged += new System.EventHandler(this.txtPathOut_TextChanged);
+			// 
+			// lblPathOut
+			// 
+			this.lblPathOut.AutoSize = true;
+			this.lblPathOut.Location = new System.Drawing.Point(55, 13);
+			this.lblPathOut.Name = "lblPathOut";
+			this.lblPathOut.Size = new System.Drawing.Size(0, 13);
+			this.lblPathOut.TabIndex = 6;
+			// 
+			// lblPath
+			// 
+			this.lblPath.AutoSize = true;
+			this.lblPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblPath.Location = new System.Drawing.Point(12, 13);
+			this.lblPath.Name = "lblPath";
+			this.lblPath.Size = new System.Drawing.Size(37, 13);
+			this.lblPath.TabIndex = 5;
+			this.lblPath.Text = "Path:";
+			// 
+			// splitContainer1
+			// 
+			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer1.Name = "splitContainer1";
+			// 
+			// splitContainer1.Panel1
+			// 
+			this.splitContainer1.Panel1.Controls.Add(this.lblMapList);
+			this.splitContainer1.Panel1.Controls.Add(this.MapList);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.Controls.Add(this.txtDesc);
+			this.splitContainer1.Panel2.Controls.Add(this.lblDesc);
+			this.splitContainer1.Panel2.Controls.Add(this.txtTheater);
+			this.splitContainer1.Panel2.Controls.Add(this.lblTheater);
+			this.splitContainer1.Panel2.Controls.Add(this.txtAuthor);
+			this.splitContainer1.Panel2.Controls.Add(this.lblAuthor);
+			this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
+			this.splitContainer1.Panel2.Controls.Add(this.lblMapName);
+			this.splitContainer1.Panel2.Controls.Add(this.lblMinimap);
+			this.splitContainer1.Panel2.Controls.Add(this.pbMinimap);
+			this.splitContainer1.Size = new System.Drawing.Size(494, 332);
+			this.splitContainer1.SplitterDistance = 300;
+			this.splitContainer1.TabIndex = 7;
+			// 
+			// lblMapList
+			// 
+			this.lblMapList.AutoSize = true;
+			this.lblMapList.Location = new System.Drawing.Point(12, 9);
+			this.lblMapList.Name = "lblMapList";
+			this.lblMapList.Size = new System.Drawing.Size(81, 13);
+			this.lblMapList.TabIndex = 1;
+			this.lblMapList.Text = "Available maps:";
+			// 
+			// txtDesc
+			// 
+			this.txtDesc.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtDesc.Location = new System.Drawing.Point(16, 289);
+			this.txtDesc.Name = "txtDesc";
+			this.txtDesc.ReadOnly = true;
+			this.txtDesc.Size = new System.Drawing.Size(162, 20);
+			this.txtDesc.TabIndex = 14;
+			// 
+			// lblDesc
+			// 
+			this.lblDesc.AutoSize = true;
+			this.lblDesc.Location = new System.Drawing.Point(13, 273);
+			this.lblDesc.Name = "lblDesc";
+			this.lblDesc.Size = new System.Drawing.Size(63, 13);
+			this.lblDesc.TabIndex = 13;
+			this.lblDesc.Text = "Description:";
+			// 
+			// txtTheater
+			// 
+			this.txtTheater.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtTheater.Location = new System.Drawing.Point(16, 252);
+			this.txtTheater.Name = "txtTheater";
+			this.txtTheater.ReadOnly = true;
+			this.txtTheater.Size = new System.Drawing.Size(162, 20);
+			this.txtTheater.TabIndex = 12;
+			// 
+			// lblTheater
+			// 
+			this.lblTheater.AutoSize = true;
+			this.lblTheater.Location = new System.Drawing.Point(13, 236);
+			this.lblTheater.Name = "lblTheater";
+			this.lblTheater.Size = new System.Drawing.Size(47, 13);
+			this.lblTheater.TabIndex = 11;
+			this.lblTheater.Text = "Theater:";
+			// 
+			// txtAuthor
+			// 
+			this.txtAuthor.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtAuthor.Location = new System.Drawing.Point(16, 214);
+			this.txtAuthor.Name = "txtAuthor";
+			this.txtAuthor.ReadOnly = true;
+			this.txtAuthor.Size = new System.Drawing.Size(162, 20);
+			this.txtAuthor.TabIndex = 10;
+			// 
+			// lblAuthor
+			// 
+			this.lblAuthor.AutoSize = true;
+			this.lblAuthor.Location = new System.Drawing.Point(13, 198);
+			this.lblAuthor.Name = "lblAuthor";
+			this.lblAuthor.Size = new System.Drawing.Size(41, 13);
+			this.lblAuthor.TabIndex = 9;
+			this.lblAuthor.Text = "Author:";
+			// 
+			// txtTitle
+			// 
+			this.txtTitle.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtTitle.Location = new System.Drawing.Point(16, 177);
+			this.txtTitle.Name = "txtTitle";
+			this.txtTitle.ReadOnly = true;
+			this.txtTitle.Size = new System.Drawing.Size(162, 20);
+			this.txtTitle.TabIndex = 8;
+			// 
+			// lblMapName
+			// 
+			this.lblMapName.AutoSize = true;
+			this.lblMapName.Location = new System.Drawing.Point(13, 161);
+			this.lblMapName.Name = "lblMapName";
+			this.lblMapName.Size = new System.Drawing.Size(30, 13);
+			this.lblMapName.TabIndex = 7;
+			this.lblMapName.Text = "Title:";
+			// 
+			// lblMinimap
+			// 
+			this.lblMinimap.AutoSize = true;
+			this.lblMinimap.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblMinimap.Location = new System.Drawing.Point(29, 9);
+			this.lblMinimap.Name = "lblMinimap";
+			this.lblMinimap.Size = new System.Drawing.Size(71, 13);
+			this.lblMinimap.TabIndex = 6;
+			this.lblMinimap.Text = "Map preview:";
+			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
+			this.pictureBox1.TabIndex = 7;
+			this.pictureBox1.TabStop = false;
+			this.pictureBox1.Visible = false;
+			// 
+			// MapSelect
+			// 
+			this.AcceptButton = this.btnOk;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.btnCancel;
+			this.ClientSize = new System.Drawing.Size(494, 402);
+			this.Controls.Add(this.splitContainer1);
+			this.Controls.Add(this.pnlBottom);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MapSelect";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Select map";
+			this.Load += new System.EventHandler(this.MapSelect_Load);
+			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).EndInit();
+			this.pnlBottom.ResumeLayout(false);
+			this.pnlBottom.PerformLayout();
+			this.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel1.PerformLayout();
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			this.splitContainer1.Panel2.PerformLayout();
+			this.splitContainer1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+			this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public System.Windows.Forms.ListView MapList;
+        public System.Windows.Forms.Button btnCancel;
+        public System.Windows.Forms.Button btnOk;
+        public System.Windows.Forms.Label lblNew;
+        public System.Windows.Forms.TextBox txtNew;
+        public System.Windows.Forms.ColumnHeader colMapName;
+        public System.Windows.Forms.ImageList MapIconsList;
+        public System.Windows.Forms.PictureBox pbMinimap;
+        public System.Windows.Forms.Panel pnlBottom;
+        public System.Windows.Forms.SplitContainer splitContainer1;
+        public System.Windows.Forms.Label lblMinimap;
+        public System.Windows.Forms.TextBox txtTheater;
+        public System.Windows.Forms.Label lblTheater;
+        public System.Windows.Forms.TextBox txtAuthor;
+        public System.Windows.Forms.Label lblAuthor;
+        public System.Windows.Forms.TextBox txtTitle;
+        public System.Windows.Forms.Label lblMapName;
+        public System.Windows.Forms.TextBox txtDesc;
+        public System.Windows.Forms.Label lblDesc;
+        public System.Windows.Forms.Label lblMapList;
+        public System.Windows.Forms.Label lblPathOut;
+        public System.Windows.Forms.Label lblPath;
+        public System.Windows.Forms.TextBox txtPathOut;
+		private System.Windows.Forms.PictureBox pictureBox1;
+    }
 }

OpenRA.Editor/MapSelect.cs

@@ -1,92 +1,66 @@
-#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.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.Graphics;
-
-namespace OpenRA.Editor
-{
-	public partial class MapSelect : Form
-	{
-		public string MapFolderPath;
-
-		public bool DirectoryIsEmpty(string path)
-		{
-			return !Directory.GetFileSystemEntries(path).Any();
-		}
-
-		public MapSelect(string currentMod)
-		{
-			MapFolderPath = new string[] { Platform.SupportDir, "maps", currentMod }
-				.Aggregate(Path.Combine);
-
-			if (!Directory.Exists(MapFolderPath))
-				Directory.CreateDirectory(MapFolderPath);
-
-			InitializeComponent();
-			MapIconsList.Images.Add(pictureBox1.Image);
-		}
-
-		void MapSelect_Load(object sender, EventArgs e)
-		{
-			MapList.Items.Clear();
-			PathOutText.Text = MapFolderPath;
-
-			if (DirectoryIsEmpty(MapFolderPath))
-				return;
-
-			foreach (var map in ModData.FindMapsIn(MapFolderPath))
-			{
-				ListViewItem map1 = new ListViewItem();
-				map1.Tag = map;
-				map1.Text = Path.GetFileNameWithoutExtension(map);
-				map1.ImageIndex = 0;
-				MapList.Items.Add(map1);
-			}
-
-			// hack
-			if (NewText.Text != "unnamed")
-				MapList.Items[0].Selected = true;
-		}
-
-		void MapList_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			if (MapList.SelectedItems.Count == 1)
-			{
-				NewText.Text = MapList.SelectedItems[0].Text;
-				NewText.Tag = MapList.SelectedItems[0].Tag;
-
-				var map = new Map(NewText.Tag as string);
-				TitleText.Text = map.Title;
-				AuthorText.Text = map.Author;
-				TheaterText.Text = map.Tileset;
-				DescTxt.Text = map.Description;
-				MiniMapBox.Image = null;
-
-				try
-				{
-					MiniMapBox.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
-				}
-				catch (Exception ed)
-				{
-					Console.WriteLine("No map preview image found: {0}", ed.ToString());
-				}
-			}
-		}
-
-		void PathOutTextChanged(object sender, EventArgs e)
-		{
-			MapFolderPath = PathOutText.Text;
-		}
-	}
-}
+using System;
+using System.IO;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+
+namespace OpenRA.Editor
+{
+    public partial class MapSelect : Form
+    {
+        public string MapFolderPath;
+
+        public MapSelect()
+        {
+            InitializeComponent();
+			MapIconsList.Images.Add(pictureBox1.Image);
+        }
+
+        void MapSelect_Load(object sender, EventArgs e)
+        {
+            DirectoryInfo directory = new DirectoryInfo(MapFolderPath);
+            DirectoryInfo[] directories = directory.GetDirectories();
+            MapList.Items.Clear();
+            txtPathOut.Text = MapFolderPath;
+            foreach (DirectoryInfo subDirectory in directories)
+            {
+                ListViewItem map1 = new ListViewItem(subDirectory.Name);
+                map1.ImageIndex = 0;
+                MapList.Items.Add(map1);
+            }
+            
+			// hack
+			if (txtNew.Text != "unnamed")
+                MapList.Items[0].Selected = true;
+        }
+
+        void MapList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (MapList.SelectedItems.Count == 1)
+            {
+                txtNew.Text = MapList.SelectedItems[0].Text;
+                var map = new Map(new Folder(Path.Combine(MapFolderPath, MapList.SelectedItems[0].Text)));
+                txtTitle.Text = map.Title;
+                txtAuthor.Text = map.Author;
+                txtTheater.Text = map.Theater;
+                txtDesc.Text = map.Description;
+				pbMinimap.Image = null;
+                try
+                {
+					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
+                }
+                catch (Exception ed)
+                {
+                    Console.WriteLine("No map preview image found: {0}", ed.ToString());
+                }
+                finally { }
+            }
+        }
+
+        void txtPathOut_TextChanged(object sender, EventArgs e)
+        {
+            MapFolderPath = txtPathOut.Text;
+        }
+
+    }
+}

OpenRA.Editor/MapSelect.resx

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

OpenRA.Editor/NewMapDialog.Designer.cs

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

OpenRA.Editor/NewMapDialog.cs

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

OpenRA.Editor/NewMapDialog.resx

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

OpenRA.Editor/OpenRA.Editor.csproj

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

OpenRA.Editor/PaletteBox.Designer.cs

@@ -0,0 +1,165 @@
+namespace OpenRA.Editor
+{
+    partial class PaletteBox
+    {
+        /// <summary>
+        /// Требуется переменная конструктора.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Освободить все используемые ресурсы.
+        /// </summary>
+        /// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Код, автоматически созданный конструктором форм Windows
+
+        /// <summary>
+        /// Обязательный метод для поддержки конструктора - не изменяйте
+        /// содержимое данного метода при помощи редактора кода.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.LayerBox = new System.Windows.Forms.ComboBox();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.pbtilePalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.pbactorPalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.pbresourcePalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            this.tabPage3.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // LayerBox
+            // 
+            this.LayerBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.LayerBox.FormattingEnabled = true;
+            this.LayerBox.Location = new System.Drawing.Point(0, 0);
+            this.LayerBox.Name = "LayerBox";
+            this.LayerBox.Size = new System.Drawing.Size(194, 21);
+            this.LayerBox.TabIndex = 0;
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Controls.Add(this.tabPage3);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.Location = new System.Drawing.Point(0, 21);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
+            this.tabControl1.Multiline = true;
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(194, 357);
+            this.tabControl1.TabIndex = 1;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.pbtilePalette);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(186, 331);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "Templates";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // pbtilePalette
+            // 
+            this.pbtilePalette.AutoScroll = true;
+            this.pbtilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbtilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbtilePalette.Location = new System.Drawing.Point(3, 3);
+            this.pbtilePalette.Name = "pbtilePalette";
+            this.pbtilePalette.Size = new System.Drawing.Size(180, 325);
+            this.pbtilePalette.TabIndex = 1;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.pbactorPalette);
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(186, 331);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "Actors";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // pbactorPalette
+            // 
+            this.pbactorPalette.AutoScroll = true;
+            this.pbactorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbactorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbactorPalette.Location = new System.Drawing.Point(3, 3);
+            this.pbactorPalette.Name = "pbactorPalette";
+            this.pbactorPalette.Size = new System.Drawing.Size(180, 325);
+            this.pbactorPalette.TabIndex = 2;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.pbresourcePalette);
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(186, 331);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "Resources";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // pbresourcePalette
+            // 
+            this.pbresourcePalette.AutoScroll = true;
+            this.pbresourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbresourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbresourcePalette.Location = new System.Drawing.Point(0, 0);
+            this.pbresourcePalette.Name = "pbresourcePalette";
+            this.pbresourcePalette.Size = new System.Drawing.Size(186, 331);
+            this.pbresourcePalette.TabIndex = 3;
+            // 
+            // PaletteBox
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(194, 378);
+            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.LayerBox);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "PaletteBox";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Palette Box";
+            this.TopMost = true;
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            this.tabPage3.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public System.Windows.Forms.ComboBox LayerBox;
+        public System.Windows.Forms.TabControl tabControl1;
+        public System.Windows.Forms.TabPage tabPage1;
+        public System.Windows.Forms.FlowLayoutPanel pbtilePalette;
+        public System.Windows.Forms.TabPage tabPage2;
+        public System.Windows.Forms.FlowLayoutPanel pbactorPalette;
+        public System.Windows.Forms.TabPage tabPage3;
+        public System.Windows.Forms.FlowLayoutPanel pbresourcePalette;
+
+    }
+}

OpenRA.Editor/PaletteBox.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+    public partial class PaletteBox : Form
+    {
+        public PaletteBox()
+        {
+            InitializeComponent();
+        }
+    }
+}

OpenRA.Editor/Program.cs

@@ -1,59 +1,29 @@
-#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.Globalization;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.FileFormats;
-
-namespace OpenRA.Editor
-{
-	static class Program
-	{
-		[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;
-			}
-
-			Application.CurrentCulture = CultureInfo.InvariantCulture;
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
-
-			Application.Run(new Form1(args));
-		}
-
-		static void UpgradeMaps(string mod)
-		{
-			var mapFolderPath = new string[] { Environment.CurrentDirectory, "mods", mod, "maps" }
-				.Aggregate(Path.Combine);
-
-			foreach (var path in ModData.FindMapsIn(mapFolderPath))
-			{
-				var map = new Map(path);
-
-				// Touch the lazy bits to initialize them
-				map.Actors.Force();
-				map.Smudges.Force();
-				map.MapTiles.Force();
-				map.MapResources.Force();
-				map.Save(path);
-			}
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	static class Program
+	{
+		[STAThread]
+		static void Main( string[] args )
+		{
+			Application.CurrentCulture = CultureInfo.InvariantCulture;
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+			Application.Run(new Form1(args));
+		}
+	}
+}

OpenRA.Editor/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenRA.Editor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("OpenRA.Editor")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("e18ea68f-f344-46c9-b026-8bda76fa91f8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

OpenRA.Editor/Properties/Resources.Designer.cs

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

OpenRA.Editor/Properties/Settings.Designer.cs

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

OpenRA.Editor/Properties/Settings.settings

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

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -1,181 +1,159 @@
-#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.Editor
-{
-	partial class PropertiesDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.TitleBox = new System.Windows.Forms.TextBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.DescBox = new System.Windows.Forms.TextBox();
-			this.SelectableCheckBox = new System.Windows.Forms.CheckBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.AuthorBox = new System.Windows.Forms.TextBox();
-			this.ShellmapCheckBox = new System.Windows.Forms.CheckBox();
-			this.SuspendLayout();
-			//
-			// button2
-			//
-			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(196, 193);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 14;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// button1
-			//
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(277, 193);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 15;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 50);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 16;
-			this.label1.Text = "Title";
-			//
-			// title
-			//
-			this.TitleBox.Location = new System.Drawing.Point(66, 47);
-			this.TitleBox.Name = "title";
-			this.TitleBox.Size = new System.Drawing.Size(286, 20);
-			this.TitleBox.TabIndex = 17;
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(12, 76);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(32, 13);
-			this.label2.TabIndex = 16;
-			this.label2.Text = "Desc";
-			//
-			// desc
-			//
-			this.DescBox.Location = new System.Drawing.Point(66, 73);
-			this.DescBox.Name = "desc";
-			this.DescBox.Size = new System.Drawing.Size(286, 20);
-			this.DescBox.TabIndex = 17;
-			//
-			// selectable
-			//
-			this.SelectableCheckBox.AutoSize = true;
-			this.SelectableCheckBox.Location = new System.Drawing.Point(118, 138);
-			this.SelectableCheckBox.Name = "selectable";
-			this.SelectableCheckBox.Size = new System.Drawing.Size(130, 17);
-			this.SelectableCheckBox.TabIndex = 18;
-			this.SelectableCheckBox.Text = "Show in Map Chooser";
-			this.SelectableCheckBox.UseVisualStyleBackColor = true;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(12, 102);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(38, 13);
-			this.label3.TabIndex = 16;
-			this.label3.Text = "Author";
-			//
-			// author
-			//
-			this.AuthorBox.Location = new System.Drawing.Point(66, 99);
-			this.AuthorBox.Name = "author";
-			this.AuthorBox.Size = new System.Drawing.Size(286, 20);
-			this.AuthorBox.TabIndex = 17;
-			//
-			// checkBox1
-			//
-			this.ShellmapCheckBox.AutoSize = true;
-			this.ShellmapCheckBox.Location = new System.Drawing.Point(118, 161);
-			this.ShellmapCheckBox.Name = "checkBox1";
-			this.ShellmapCheckBox.Size = new System.Drawing.Size(105, 17);
-			this.ShellmapCheckBox.TabIndex = 18;
-			this.ShellmapCheckBox.Text = "Use as Shellmap";
-			this.ShellmapCheckBox.UseVisualStyleBackColor = true;
-			//
-			// PropertiesDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(370, 228);
-			this.Controls.Add(this.ShellmapCheckBox);
-			this.Controls.Add(this.SelectableCheckBox);
-			this.Controls.Add(this.AuthorBox);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.DescBox);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.TitleBox);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "PropertiesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Properties";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.TextBox TitleBox;
-		private System.Windows.Forms.Label label2;
-		public System.Windows.Forms.TextBox DescBox;
-		public System.Windows.Forms.CheckBox SelectableCheckBox;
-		private System.Windows.Forms.Label label3;
-		public System.Windows.Forms.TextBox AuthorBox;
-		public System.Windows.Forms.CheckBox ShellmapCheckBox;
-	}
-}
+namespace OpenRA.Editor
+{
+	partial class PropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.title = new System.Windows.Forms.TextBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.desc = new System.Windows.Forms.TextBox();
+			this.selectable = new System.Windows.Forms.CheckBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.author = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// button2
+			// 
+			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(196, 193);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 14;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// button1
+			// 
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(277, 193);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 15;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 50);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 16;
+			this.label1.Text = "Title";
+			// 
+			// title
+			// 
+			this.title.Location = new System.Drawing.Point(66, 47);
+			this.title.Name = "title";
+			this.title.Size = new System.Drawing.Size(286, 20);
+			this.title.TabIndex = 17;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 76);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(32, 13);
+			this.label2.TabIndex = 16;
+			this.label2.Text = "Desc";
+			// 
+			// desc
+			// 
+			this.desc.Location = new System.Drawing.Point(66, 73);
+			this.desc.Name = "desc";
+			this.desc.Size = new System.Drawing.Size(286, 20);
+			this.desc.TabIndex = 17;
+			// 
+			// selectable
+			// 
+			this.selectable.AutoSize = true;
+			this.selectable.Location = new System.Drawing.Point(118, 138);
+			this.selectable.Name = "selectable";
+			this.selectable.Size = new System.Drawing.Size(130, 17);
+			this.selectable.TabIndex = 18;
+			this.selectable.Text = "Show in Map Chooser";
+			this.selectable.UseVisualStyleBackColor = true;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 102);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(38, 13);
+			this.label3.TabIndex = 16;
+			this.label3.Text = "Author";
+			// 
+			// author
+			// 
+			this.author.Location = new System.Drawing.Point(66, 99);
+			this.author.Name = "author";
+			this.author.Size = new System.Drawing.Size(286, 20);
+			this.author.TabIndex = 17;
+			// 
+			// PropertiesDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(370, 228);
+			this.Controls.Add(this.selectable);
+			this.Controls.Add(this.author);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.desc);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.title);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "PropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "PropertiesDialog";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.TextBox title;
+		private System.Windows.Forms.Label label2;
+		public System.Windows.Forms.TextBox desc;
+		public System.Windows.Forms.CheckBox selectable;
+		private System.Windows.Forms.Label label3;
+		public System.Windows.Forms.TextBox author;
+	}
+}

OpenRA.Editor/PropertiesDialog.cs

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

OpenRA.Editor/PropertiesDialog.resx

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

OpenRA.Editor/RenderUtils.cs

@@ -1,105 +1,136 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using OpenRA.FileFormats;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	static class RenderUtils
-	{
-		static Bitmap RenderShp(ShpReader shp, Palette p)
-		{
-			var frame = shp[0];
-
-			var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				byte* q = (byte*)data.Scan0.ToPointer();
-				var stride2 = data.Stride;
-
-				for (var i = 0; i < shp.Width; i++)
-					for (var j = 0; j < shp.Height; j++)
-						q[j * stride2 + i] = frame.Image[i + shp.Width * j];
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
-		{
-			var image = RenderSprites.GetImage(info);
-
-			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
-			{
-				var shp = new ShpReader(s);
-				var bitmap = RenderShp(shp, p);
-
-				try
-				{
-					using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
-					{
-						var shp2 = new ShpReader(s2);
-						var roofBitmap = RenderShp(shp2, p);
-
-						using (var g = System.Drawing.Graphics.FromImage(bitmap))
-							g.DrawImage(roofBitmap, 0, 0);
-					}
-				}
-				catch { }
-
-				return new ActorTemplate
-				{
-					Bitmap = bitmap,
-					Info = info,
-					Appearance = info.Traits.GetOrDefault<EditorAppearanceInfo>()
-				};
-			}
-		}
-
-		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
-		{
-			var image = info.SpriteNames[0];
-			using (var s = FileSystem.OpenWithExts(image, exts))
-			{
-				var shp = new ShpReader(s);
-				var frame = shp[shp.ImageCount - 1];
-
-				var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
-				bitmap.Palette = p.AsSystemPalette();
-				var data = bitmap.LockBits(bitmap.Bounds(),
-					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-				unsafe
-				{
-					byte* q = (byte*)data.Scan0.ToPointer();
-					var stride = data.Stride;
-
-					for (var i = 0; i < shp.Width; i++)
-						for (var j = 0; j < shp.Height; j++)
-							q[j * stride + i] = frame.Image[i + shp.Width * j];
-				}
-
-				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
-			}
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	static class RenderUtils
+	{
+		public static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
+		{
+			var template = ts.Templates[n];
+			var tile = ts.Tiles[n];
+
+			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y);
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* q = (int*)data.Scan0.ToPointer();
+				var stride = data.Stride >> 2;
+
+				for (var u = 0; u < template.Size.X; u++)
+					for (var v = 0; v < template.Size.Y; v++)
+						if (tile.TileBitmapBytes[u + v * template.Size.X] != null)
+						{
+							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = p.GetColor(rawImage[i + ts.TileSize * j]).ToArgb();
+						}
+						else
+						{
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = Color.Transparent.ToArgb();
+						}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		static Bitmap RenderShp(ShpReader shp, Palette p)
+		{
+			var frame = shp[0];
+
+			var bitmap = new Bitmap(shp.Width, shp.Height);
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* q = (int*)data.Scan0.ToPointer();
+				var stride2 = data.Stride >> 2;
+
+				for (var i = 0; i < shp.Width; i++)
+					for (var j = 0; j < shp.Height; j++)
+						q[j * stride2 + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
+		{
+			var ri = info.Traits.Get<RenderSimpleInfo>();
+			string image = null;
+			if (ri.OverrideTheater != null)
+				for (int i = 0; i < ri.OverrideTheater.Length; i++)
+					if (ri.OverrideTheater[i] == tileset.Id)
+						image = ri.OverrideImage[i];
+
+			image = image ?? ri.Image ?? info.Name;
+			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			{
+				var shp = new ShpReader(s);
+				var bitmap = RenderShp(shp, p);
+
+				try
+				{
+					using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
+					{
+						var shp2 = new ShpReader(s2);
+						var roofBitmap = RenderShp(shp2, p);
+
+						using (var g = System.Drawing.Graphics.FromImage(bitmap))
+							g.DrawImage(roofBitmap, 0, 0);
+					}
+				}
+				catch { }
+
+				return new ActorTemplate { Bitmap = bitmap, Info = info, Centered = !info.Traits.Contains<BuildingInfo>() };
+			}
+		}
+
+		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
+		{
+			var image = info.SpriteNames[0];
+			using (var s = FileSystem.OpenWithExts(image, exts))
+			{
+				var shp = new ShpReader(s);
+				var frame = shp[shp.ImageCount - 1];
+
+				var bitmap = new Bitmap(shp.Width, shp.Height);
+				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+				unsafe
+				{
+					int* q = (int*)data.Scan0.ToPointer();
+					var stride = data.Stride >> 2;
+
+					for (var i = 0; i < shp.Width; i++)
+						for (var j = 0; j < shp.Height; j++)
+							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+				}
+
+				bitmap.UnlockBits(data);
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
+			}
+		}
+	}
+}

OpenRA.Editor/ResizeDialog.Designer.cs

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

OpenRA.Editor/ResizeDialog.cs

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

OpenRA.Editor/ResizeDialog.resx

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

OpenRA.Editor/ResourceTool.cs

@@ -1,50 +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 OpenRA.FileFormats;
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class ResourceTool : ITool
-	{
-		ResourceTemplate resourceTemplate;
-
-		public ResourceTool(ResourceTemplate resource) { resourceTemplate = resource; }
-
-		public void Apply(Surface surface)
-		{
-			surface.Map.MapResources.Value[surface.GetBrushLocation().X, surface.GetBrushLocation().Y]
-				= new TileReference<byte, byte>
-				{
-					Type = (byte)resourceTemplate.Info.ResourceType,
-					Index = (byte)random.Next(resourceTemplate.Info.SpriteNames.Length)
-				};
-
-			var ch = new int2(surface.GetBrushLocation().X / Surface.ChunkSize,
-				surface.GetBrushLocation().Y / Surface.ChunkSize);
-
-			if (surface.Chunks.ContainsKey(ch))
-			{
-				surface.Chunks[ch].Dispose();
-				surface.Chunks.Remove(ch);
-			}
-		}
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			surface.DrawImage(g, resourceTemplate.Bitmap, surface.GetBrushLocation(), false, null);
-		}
-
-		Random random = new Random();
-	}
-}

OpenRA.Editor/Settings.StyleCop

@@ -1,344 +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>
-      </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/CompressedPackage.cs

@@ -0,0 +1,45 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Packaging;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class CompressedPackage : IFolder
+	{
+		readonly uint[] hashes;
+		readonly Stream s;
+		readonly ZipPackage pkg;
+
+		public CompressedPackage(string filename)
+		{
+			s = FileSystem.Open(filename);
+			pkg = (ZipPackage)ZipPackage.Open(s, FileMode.Open);
+			hashes = pkg.GetParts()
+				.Select(p => PackageEntry.HashFilename(p.Uri.LocalPath)).ToArray();
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return pkg.GetPart(new Uri(filename)).GetStream(FileMode.Open);
+		}
+
+		public IEnumerable<uint> AllFileHashes() { return hashes; }
+		
+		public bool Exists(string filename)
+		{
+			return hashes.Contains(PackageEntry.HashFilename(filename));
+		}
+	}
+}

OpenRA.FileFormats/Evaluator.cs

@@ -1,108 +1,107 @@
-#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;
-
-namespace OpenRA.FileFormats
-{
-	public static class Evaluator
-	{
-		public static int Evaluate(string expr)
-		{
-			return Evaluate(expr, new Dictionary<string, int>());
-		}
-
-		public static int Evaluate(string expr, Dictionary<string, int> syms)
-		{
-			var toks = Tokens(expr, "+-*/()");
-			var postfix = ToPostfix(toks, syms);
-
-			var s = new Stack<int>();
-
-			foreach (var t in postfix)
-			{
-				switch (t[0])
-				{
-					case '+': ApplyBinop(s, (x, y) => y + x); break;
-					case '-': ApplyBinop(s, (x, y) => y - x); break;
-					case '*': ApplyBinop(s, (x, y) => y * x); break;
-					case '/': ApplyBinop(s, (x, y) => y / x); break;
-					default: s.Push(int.Parse(t)); break;
-				}
-			}
-
-			return s.Pop();
-		}
-
-		static void ApplyBinop(Stack<int> s, Func<int, int, int> f)
-		{
-			var x = s.Pop();
-			var y = s.Pop();
-			s.Push(f(x, y));
-		}
-
-		static IEnumerable<string> ToPostfix(IEnumerable<string> toks, Dictionary<string, int> syms)
-		{
-			var s = new Stack<string>();
-			foreach (var t in toks)
-			{
-				if (t[0] == '(') s.Push(t);
-				else if (t[0] == ')')
-				{
-					var temp = "";
-					while ((temp = s.Pop()) != "(") yield return temp;
-				}
-				else if (char.IsNumber(t[0])) yield return t;
-				else if (char.IsLetter(t[0]))
-				{
-					if (!syms.ContainsKey(t))
-						throw new InvalidOperationException("Substitution `{0}` undefined".F(t));
-
-					yield return syms[t].ToString();
-				}
-				else
-				{
-					while (s.Count > 0 && Prec[t] <= Prec[s.Peek()]) yield return s.Pop();
-					s.Push(t);
-				}
-			}
-
-			while (s.Count > 0) yield return s.Pop();
-		}
-
-		static readonly Dictionary<string, int> Prec
-			= new Dictionary<string, int> { { "+", 0 }, { "-", 0 }, { "*", 1 }, { "/", 1 }, { "(", -1 } };
-
-		static IEnumerable<string> Tokens(string expr, string ops)
-		{
-			var s = "";
-			foreach (var c in expr)
-			{
-				if (char.IsWhiteSpace(c))
-				{
-					if (s != "") yield return s;
-					s = "";
-				}
-				else if (ops.Contains(c))
-				{
-					if (s != "") yield return s;
-					s = "";
-					yield return "" + c;
-				}
-				else
-					s += c;
-			}
-
-			if (s != "") yield return s;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public static class Evaluator
+	{
+		public static int Evaluate(string expr)
+		{
+			return Evaluate(expr, new Dictionary<string, int>());
+		}
+
+		public static int Evaluate(string expr, Dictionary<string, int> syms)
+		{
+			var toks = Tokens(expr, "+-*/()");
+			var postfix = ToPostfix(toks, syms);
+
+			var s = new Stack<int>();
+
+			foreach (var t in postfix)
+			{
+				switch (t[0])
+				{
+					case '+': ApplyBinop(s, (x, y) => y + x); break;
+					case '-': ApplyBinop(s, (x, y) => y - x); break;
+					case '*': ApplyBinop(s, (x, y) => y * x); break;
+					case '/': ApplyBinop(s, (x, y) => y / x); break;
+					default: s.Push(int.Parse(t)); break;
+				}
+			}
+			return s.Pop();
+		}
+
+		static void ApplyBinop( Stack<int> s, Func<int,int,int> f )
+		{
+			var x = s.Pop();
+			var y = s.Pop();
+			s.Push( f(x,y) );
+		}
+
+		static IEnumerable<string> ToPostfix(IEnumerable<string> toks, Dictionary<string, int> syms)
+		{
+			var s = new Stack<string>();
+			foreach (var t in toks)
+			{
+				if (t[0] == '(') s.Push(t);
+				else if (t[0] == ')')
+				{
+					var temp = "";
+					while ((temp = s.Pop()) != "(") yield return temp;
+				}
+				else if (char.IsNumber(t[0])) yield return t;
+				else if (char.IsLetter(t[0])) 
+				{
+					if (!syms.ContainsKey(t))
+						throw new InvalidOperationException("Substitution `{0}` undefined".F(t));
+					    
+					yield return syms[t].ToString();;
+				}
+				else
+				{
+					while (s.Count > 0 && Prec[t] <= Prec[s.Peek()]) yield return s.Pop();
+					s.Push(t);
+				}
+			}
+			
+			while (s.Count > 0) yield return s.Pop();
+		}
+
+		static readonly Dictionary<string, int> Prec
+			= new Dictionary<string, int> { { "+", 0 }, { "-", 0 }, { "*", 1 }, { "/", 1 }, { "(", -1 } };
+
+		static IEnumerable<string> Tokens(string expr, string ops)
+		{
+			var s = "";
+			foreach (var c in expr)
+			{
+				if (char.IsWhiteSpace(c))
+				{
+					if (s != "") yield return s;
+					s = "";
+				}
+				else if (ops.Contains(c))
+				{
+					if (s != "") yield return s;
+					s = "";
+					yield return "" + c;
+				}
+				else
+					s += c;
+			}
+
+			if (s != "") yield return s;
+		}
+	}
+}

OpenRA.FileFormats/Exts.cs

@@ -1,266 +1,99 @@
-#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.Drawing;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace OpenRA
-{
-	public static class Exts
-	{
-		public static string F(this string fmt, params object[] args)
-		{
-			return string.Format(fmt, args);
-		}
-
-		public static T WithDefault<T>(T def, Func<T> f)
-		{
-			try { return f(); }
-			catch { return def; }
-		}
-
-		public static void Do<T>(this IEnumerable<T> e, Action<T> fn)
-		{
-			foreach (var ee in e)
-				fn(ee);
-		}
-
-		public static IEnumerable<string> GetNamespaces(this Assembly a)
-		{
-			return a.GetTypes().Select(t => t.Namespace).Distinct().Where(n => n != null);
-		}
-
-		public static bool HasAttribute<T>(this MemberInfo mi)
-		{
-			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
-		}
-
-		public static T[] GetCustomAttributes<T>(this MemberInfo mi, bool inherit)
-			where T : class
-		{
-			return (T[])mi.GetCustomAttributes(typeof(T), inherit);
-		}
-
-		public static T[] GetCustomAttributes<T>(this ParameterInfo mi)
-			where T : class
-		{
-			return (T[])mi.GetCustomAttributes(typeof(T), true);
-		}
-
-		public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
-		{
-			if (val.CompareTo(min) < 0)
-				return min;
-			else if (val.CompareTo(max) > 0)
-				return max;
-			else
-				return val;
-		}
-
-		public static bool Contains(this Rectangle r, int2 p)
-		{
-			return r.Contains(p.ToPoint());
-		}
-
-		public static bool Contains(this RectangleF r, int2 p)
-		{
-			return r.Contains(p.ToPointF());
-		}
-
-		public static bool HasModifier(this Modifiers k, Modifiers mod)
-		{
-			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()
-		{
-			return d.GetOrAdd(k, _ => new V());
-		}
-
-		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
-		{
-			V ret;
-			if (!d.TryGetValue(k, out ret))
-				d.Add(k, ret = createFn(k));
-			return ret;
-		}
-
-		public static T Random<T>(this IEnumerable<T> ts, Thirdparty.Random r)
-		{
-			var xs = ts.ToArray();
-			return xs[r.Next(xs.Length)];
-		}
-
-		public static T RandomOrDefault<T>(this IEnumerable<T> ts, Thirdparty.Random r)
-		{
-			if (!ts.Any())
-				return default(T);
-
-			return ts.Random(r);
-		}
-
-		public static float Product(this IEnumerable<float> xs)
-		{
-			return xs.Aggregate(1f, (a, x) => a * x);
-		}
-
-		public static IEnumerable<T> SymmetricDifference<T>(this IEnumerable<T> xs, IEnumerable<T> ys)
-		{
-			// this is probably a shockingly-slow way to do this, but it's concise.
-			return xs.Except(ys).Concat(ys.Except(xs));
-		}
-
-		public static IEnumerable<T> Iterate<T>(this T t, Func<T, T> f)
-		{
-			for (;;) { yield return t; t = f(t); }
-		}
-
-		public static int NextPowerOf2(int v)
-		{
-			--v;
-			v |= v >> 1;
-			v |= v >> 2;
-			v |= v >> 4;
-			v |= v >> 8;
-			++v;
-			return v;
-		}
-
-		public static bool IsPowerOf2(int v)
-		{
-			return (v & (v - 1)) == 0;
-		}
-
-		public static Size NextPowerOf2(this Size s) { return new Size(NextPowerOf2(s.Width), NextPowerOf2(s.Height)); }
-
-		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
-		{
-			return string.Join(j, ts.Select(t => t.ToString()).ToArray());
-		}
-
-		public static IEnumerable<T> Append<T>(this IEnumerable<T> ts, params T[] moreTs)
-		{
-			return ts.Concat(moreTs);
-		}
-
-		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
-		{
-			return ToDictionaryWithConflictLog(source, keySelector, x => x, debugName, logKey, logValue);
-		}
-
-		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector, string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
-		{
-			// Fall back on ToString() if null functions are provided:
-			logKey = logKey ?? (s => s.ToString());
-			logValue = logValue ?? (s => s.ToString());
-
-			// Try to build a dictionary and log all duplicates found (if any):
-			var dupKeys = new Dictionary<TKey, List<string>>();
-			var d = new Dictionary<TKey, TElement>();
-			foreach (var item in source)
-			{
-				TKey key = keySelector(item);
-				TElement element = elementSelector(item);
-
-				// Check for a key conflict:
-				if (d.ContainsKey(key))
-				{
-					List<string> dupKeyMessages;
-					if (!dupKeys.TryGetValue(key, out dupKeyMessages))
-					{
-						// Log the initial conflicting value already inserted:
-						dupKeyMessages = new List<string>();
-						dupKeyMessages.Add(logValue(d[key]));
-						dupKeys.Add(key, dupKeyMessages);
-					}
-
-					// Log this conflicting value:
-					dupKeyMessages.Add(logValue(element));
-					continue;
-				}
-
-				d.Add(key, element);
-			}
-
-			// If any duplicates were found, throw a descriptive error
-			if (dupKeys.Count > 0)
-			{
-				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value.ToArray()))).ToArray());
-				var msg = "{0}, duplicate values found for the following keys: {1}".F(debugName, badKeysFormatted);
-				throw new ArgumentException(msg);
-			}
-
-			// Return the dictionary we built:
-			return d;
-		}
-
-		public static Color ColorLerp(float t, Color c1, Color c2)
-		{
-			return Color.FromArgb(
-				(int)(t * c2.A + (1 - t) * c1.A),
-				(int)(t * c2.R + (1 - t) * c1.R),
-				(int)(t * c2.G + (1 - t) * c1.G),
-				(int)(t * c2.B + (1 - t) * c1.B));
-		}
-
-		public static T[] MakeArray<T>(int count, Func<int, T> f)
-		{
-			T[] result = new T[count];
-			for (int i = 0; i < count; i++)
-				result[i] = f(i);
-
-			return result;
-		}
-
-		public static T[,] ResizeArray<T>(T[,] ts, T t, int width, int height)
-		{
-			var result = new T[width, height];
-			for (var i = 0; i < width; i++)
-				for (var j = 0; j < height; j++)
-					result[i, j] = i <= ts.GetUpperBound(0) && j <= ts.GetUpperBound(1)
-						? ts[i, j] : t;
-			return result;
-		}
-
-		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
-
-		public static int ToBits(this IEnumerable<bool> bits)
-		{
-			var i = 0;
-			var result = 0;
-			foreach (var b in bits)
-				if (b)
-					result |= 1 << i++;
-				else
-					i++;
-			if (i > 33)
-				throw new InvalidOperationException("ToBits only accepts up to 32 values.");
-			return result;
-		}
-	}
-
-	public static class Enum<T>
-	{
-		public static T Parse(string s) { return (T)Enum.Parse(typeof(T), s); }
-		public static T[] GetValues() { return (T[])Enum.GetValues(typeof(T)); }
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace OpenRA
+{
+	public static class Exts
+	{
+		public static string F(this string fmt, params object[] args)
+		{
+			return string.Format(fmt, args);
+		}
+
+		public static void Do<T>( this IEnumerable<T> e, Action<T> fn )
+		{
+			foreach( var ee in e )
+				fn( ee );
+		}
+
+		public static IEnumerable<string> GetNamespaces(this Assembly a)
+		{
+			return a.GetTypes().Select(t => t.Namespace).Distinct().Where(n => n != null);
+		}
+
+		public static string ReadAllText(this Stream s)
+		{
+			using (s)
+			using (var sr = new StreamReader(s))
+				return sr.ReadToEnd();
+		}
+
+		public static byte[] ReadAllBytes(this Stream s)
+		{
+			using (s)
+			{
+				var data = new byte[s.Length - s.Position];
+				s.Read(data, 0, data.Length);
+				return data;
+			}
+		}
+
+		public static void Write(this Stream s, byte[] data)
+		{
+			s.Write(data, 0, data.Length);
+		}
+
+		public static IEnumerable<string> ReadAllLines(this Stream s)
+		{
+			using (var sr = new StreamReader(s))
+				for (; ; )
+				{
+					var line = sr.ReadLine();
+					if (line == null)
+						yield break;
+					else
+						yield return line;
+				}
+		}
+
+		public static bool HasAttribute<T>(this MemberInfo mi)
+		{
+			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
+		}
+
+		public static T[] GetCustomAttributes<T>( this MemberInfo mi, bool inherit )
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes( typeof( T ), inherit );
+		}
+
+		public static T[] GetCustomAttributes<T>( this ParameterInfo mi )
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes( typeof( T ), true );
+		}
+
+		public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
+		{
+			if (val.CompareTo(min) < 0)
+				return min;
+			else if (val.CompareTo(max) > 0)
+				return max;
+			else
+				return val;
+		}
+	}
+}

OpenRA.FileFormats/FieldLoader.cs

@@ -1,391 +1,280 @@
-#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.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
-
-namespace OpenRA.FileFormats
-{
-	public static class FieldLoader
-	{
-		public static Func<string, Type, string, object> InvalidValueAction = (s, t, f) =>
-		{
-			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s, f, t));
-		};
-
-		public static Action<string, Type> UnknownFieldAction = (s, f) =>
-		{
-			throw new NotImplementedException("FieldLoader: Missing field `{0}` on `{1}`".F(s, f.Name));
-		};
-
-		public static void Load(object self, MiniYaml my)
-		{
-			var loadDict = typeLoadInfo[self.GetType()];
-
-			foreach (var kv in loadDict)
-			{
-				object val;
-				if (kv.Value != null)
-					val = kv.Value(kv.Key.Name, kv.Key.FieldType, my);
-				else if (!TryGetValueFromYaml(kv.Key, my, out val))
-					continue;
-
-				kv.Key.SetValue(self, val);
-			}
-		}
-
-		static bool TryGetValueFromYaml(FieldInfo field, MiniYaml yaml, out object ret)
-		{
-			ret = null;
-			var n = yaml.Nodes.Where(x => x.Key == field.Name).ToList();
-			if (n.Count == 0)
-				return false;
-			if (n.Count == 1 && n[0].Value.Nodes.Count == 0)
-			{
-				ret = GetValue(field.Name, field.FieldType, n[0].Value.Value, field);
-				return true;
-			}
-			else if (n.Count > 1)
-			{
-				throw new InvalidOperationException("The field {0} has multiple definitions:\n{1}"
-					.F(field.Name, n.Select(m => "\t- " + m.Location).JoinWith("\n")));
-			}
-
-			throw new InvalidOperationException("TryGetValueFromYaml: unable to load field {0} (of type {1})".F(field.Name, field.FieldType));
-		}
-
-		public static T Load<T>(MiniYaml y) where T : new()
-		{
-			var t = new T();
-			Load(t, y);
-			return t;
-		}
-
-		static readonly object[] NoIndexes = { };
-		public static void LoadField(object self, string key, string value)
-		{
-			var field = self.GetType().GetField(key.Trim());
-
-			if (field != null)
-			{
-				if (!field.HasAttribute<FieldFromYamlKeyAttribute>())
-					field.SetValue(self, GetValue(field.Name, field.FieldType, value, field));
-				return;
-			}
-
-			var prop = self.GetType().GetProperty(key.Trim());
-
-			if (prop != null)
-			{
-				if (!prop.HasAttribute<FieldFromYamlKeyAttribute>())
-					prop.SetValue(self, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
-				return;
-			}
-
-			UnknownFieldAction(key.Trim(), self.GetType());
-		}
-
-		public static T GetValue<T>(string field, string value)
-		{
-			return (T)GetValue(field, typeof(T), value, null);
-		}
-
-		public static object GetValue(string fieldName, Type fieldType, string value)
-		{
-			return GetValue(fieldName, fieldType, value, null);
-		}
-
-		public static object GetValue(string fieldName, Type fieldType, string value, MemberInfo field)
-		{
-			if (value != null) value = value.Trim();
-
-			if (fieldType == typeof(int))
-			{
-				int res;
-				if (int.TryParse(value, out res))
-					return res;
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(ushort))
-			{
-				ushort res;
-				if (ushort.TryParse(value, out res))
-					return res;
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(float))
-			{
-				float res;
-				if (float.TryParse(value.Replace("%", ""),  NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
-					return res * (value.Contains('%') ? 0.01f : 1f);
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(decimal))
-			{
-				decimal res;
-				if (decimal.TryParse(value.Replace("%", ""),  NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
-					return res * (value.Contains('%') ? 0.01m : 1m);
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(string))
-			{
-				if (field != null && field.HasAttribute<TranslateAttribute>())
-					return Regex.Replace(value, "@[^@]+@", m => Translate(m.Value.Substring(1, m.Value.Length - 2)), RegexOptions.Compiled);
-				return value;
-			}
-
-			else if (fieldType == typeof(Color))
-			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
-					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255));
-				if (parts.Length == 4)
-					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255), int.Parse(parts[3]).Clamp(0, 255));
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(HSLColor))
-			{
-				var parts = value.Split(',');
-
-				// 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));
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(Hotkey))
-			{
-				Hotkey res;
-				if (Hotkey.TryParse(value, out res))
-					return res;
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(WRange))
-			{
-				WRange res;
-				if (WRange.TryParse(value, out res))
-					return res;
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(WVec))
-			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
-				{
-					WRange rx, ry, rz;
-					if (WRange.TryParse(parts[0], out rx) && WRange.TryParse(parts[1], out ry) && WRange.TryParse(parts[2], out rz))
-						return new WVec(rx, ry, rz);
-				}
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(WPos))
-			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
-				{
-					WRange rx, ry, rz;
-					if (WRange.TryParse(parts[0], out rx) && WRange.TryParse(parts[1], out ry) && WRange.TryParse(parts[2], out rz))
-						return new WPos(rx, ry, rz);
-				}
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(WAngle))
-			{
-				int res;
-				if (int.TryParse(value, out res))
-					return new WAngle(res);
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType == typeof(WRot))
-			{
-				var parts = value.Split(',');
-				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));
-				}
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-
-			else if (fieldType.IsEnum)
-			{
-				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(value.ToLower()))
-					return InvalidValueAction(value, fieldType, fieldName);
-				return Enum.Parse(fieldType, value, true);
-			}
-
-			else if (fieldType == typeof(bool))
-				return ParseYesNo(value, fieldType, fieldName);
-
-			else if (fieldType.IsArray)
-			{
-				if (value == null)
-					return Array.CreateInstance(fieldType.GetElementType(), 0);
-
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
-				for (int i = 0; i < parts.Length; i++)
-					ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
-				return ret;
-			}
-
-			else if (fieldType == typeof(int2))
-			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
-			}
-
-			else if (fieldType == typeof(float2))
-			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				float xx = 0;
-				float yy = 0;
-				float res;
-				if (float.TryParse(parts[0].Replace("%", ""), out res))
-					xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
-				if (float.TryParse(parts[1].Replace("%", ""), out res))
-					yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
-				return new float2(xx, yy);
-			}
-
-			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]));
-			}
-
-			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
-			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				var argTypes = new Type[] { typeof(string[]) };
-				var argValues = new object[] { parts };
-				return fieldType.GetConstructor(argTypes).Invoke(argValues);
-			}
-
-			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Nullable<>))
-			{
-				var innerType = fieldType.GetGenericArguments().First();
-				var innerValue = GetValue("Nullable<T>", innerType, value, field);
-				return fieldType.GetConstructor(new[] { innerType }).Invoke(new[] { innerValue });
-			}
-
-			UnknownFieldAction("[Type] {0}".F(value), fieldType);
-			return null;
-		}
-
-		static object ParseYesNo(string p, System.Type fieldType, string field)
-		{
-			p = p.ToLowerInvariant();
-			if (p == "yes") return true;
-			if (p == "true") return true;
-			if (p == "no") return false;
-			if (p == "false") return false;
-			return InvalidValueAction(p, fieldType, field);
-		}
-
-		static Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>> typeLoadInfo = new Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>>(GetTypeLoadInfo);
-
-		static Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>> GetTypeLoadInfo(Type type)
-		{
-			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
-
-			foreach (var ff in type.GetFields())
-			{
-				var field = ff;
-				var ignore = field.GetCustomAttributes<IgnoreAttribute>(false);
-				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>(false);
-				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>(false);
-				if (loadUsing.Length != 0)
-					ret[field] = (_1, fieldType, yaml) => loadUsing[0].LoaderFunc(field)(yaml);
-				else if (fromYamlKey.Length != 0)
-					ret[field] = (f, ft, yaml) => GetValue(f, ft, yaml.Value, field);
-				else if (ignore.Length == 0)
-					ret[field] = null;
-			}
-
-			return ret;
-		}
-
-		[AttributeUsage(AttributeTargets.Field)]
-		public class IgnoreAttribute : Attribute { }
-
-		[AttributeUsage(AttributeTargets.Field)]
-		public class LoadUsingAttribute : Attribute
-		{
-			Func<MiniYaml, object> loaderFuncCache;
-			public readonly string Loader;
-
-			public LoadUsingAttribute(string loader)
-			{
-				Loader = loader;
-			}
-
-			internal Func<MiniYaml, object> LoaderFunc(FieldInfo field)
-			{
-				const BindingFlags BindingFlag = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
-				if (loaderFuncCache == null)
-					loaderFuncCache = (Func<MiniYaml, object>)Delegate.CreateDelegate(typeof(Func<MiniYaml, object>), field.DeclaringType.GetMethod(Loader, BindingFlag));
-				return loaderFuncCache;
-			}
-		}
-
-		public static string Translate(string key)
-		{
-			if (Translations == null || string.IsNullOrEmpty(key))
-				return key;
-
-			string value;
-			if (!Translations.TryGetValue(key, out value))
-				return key;
-
-			return value;
-		}
-
-		public static Dictionary<string, string> Translations = new Dictionary<string, string>();
-	}
-
-	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-	public class TranslateAttribute : Attribute { }
-
-	public class FieldFromYamlKeyAttribute : Attribute { }
-
-	// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
-	public class DescAttribute : Attribute
-	{
-		public readonly string[] Lines;
-		public DescAttribute(params string[] lines) { Lines = lines; }
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Reflection;
+using System.Globalization;
+
+namespace OpenRA.FileFormats
+{
+	public static class FieldLoader
+	{
+		public static Func<string,Type,string,object> InvalidValueAction = (s,t,f) =>
+		{
+			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s,f,t) );
+		};
+
+		public static Action<string,Type> UnknownFieldAction = (s,f) =>
+		{
+			throw new NotImplementedException( "FieldLoader: Missing field `{0}` on `{1}`".F( s, f.Name ) );
+		};
+
+		public static void Load( object self, MiniYaml my )
+		{
+			var loadDict = typeLoadInfo[ self.GetType() ];
+
+			foreach( var kv in loadDict )
+			{
+				object val;
+				if( kv.Value != null )
+					val = kv.Value( kv.Key.Name, kv.Key.FieldType, my );
+				else if( !TryGetValueFromYaml( kv.Key.Name, kv.Key.FieldType, my, out val ) )
+					continue;
+
+				kv.Key.SetValue( self, val );
+			}
+		}
+
+		static bool TryGetValueFromYaml( string fieldName, Type fieldType, MiniYaml yaml, out object ret )
+		{
+			ret = null;
+			var n = yaml.Nodes.Where( x=>x.Key == fieldName ).ToList();
+			if( n.Count == 0 )
+				return false;
+			if( n.Count == 1 && n[ 0 ].Value.Nodes.Count == 0 )
+			{
+				ret = GetValue( fieldName, fieldType, n[ 0 ].Value.Value );
+				return true;
+			}
+			throw new InvalidOperationException( "TryGetValueFromYaml: unable to load field {0} (of type {1})".F( fieldName, fieldType ) );
+		}
+
+		public static T Load<T>(MiniYaml y) where T : new()
+		{
+			var t = new T();
+			Load(t, y);
+			return t;
+		}
+
+		public static void LoadField( object self, string key, string value )
+		{
+			var field = self.GetType().GetField( key.Trim() );
+
+			if( field == null )
+				UnknownFieldAction( key.Trim(), self.GetType() );
+			else if( field.HasAttribute<FieldFromYamlKeyAttribute>() )
+				return;
+			else
+				field.SetValue( self, GetValue( field.Name, field.FieldType, value ) );
+		}
+
+		public static object GetValue( string field, Type fieldType, string x )
+		{
+			if (x != null) x = x.Trim();
+			if( fieldType == typeof( int ) )
+			{
+				int res;
+				if (int.TryParse(x,out res))
+					return res;
+				return InvalidValueAction(x,fieldType, field);
+			}
+
+			else if( fieldType == typeof( ushort ) )
+			{
+				ushort res;
+				if (ushort.TryParse(x,out res))
+					return res;
+				return InvalidValueAction(x,fieldType, field);
+			}
+
+			else if (fieldType == typeof(float))
+			{
+				float res;
+				if (float.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
+					return res * (x.Contains( '%' ) ? 0.01f : 1f);
+				return InvalidValueAction(x,fieldType, field);
+			}
+
+			else if (fieldType == typeof(string))
+				return x;
+
+			else if (fieldType == typeof(Color))
+			{
+				var parts = x.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));
+				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 InvalidValueAction(x,fieldType, field);
+			}
+
+			else if (fieldType.IsEnum)
+			{
+				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
+					return InvalidValueAction(x,fieldType, field);
+				return Enum.Parse(fieldType, x, true);
+			}
+
+			else if (fieldType == typeof(bool))
+				return ParseYesNo(x, fieldType, field);
+
+			else if (fieldType.IsArray)
+			{
+				if (x == null)
+					return Array.CreateInstance(fieldType.GetElementType(), 0);
+
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
+				for (int i = 0; i < parts.Length; i++)
+					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
+				return ret;
+			}
+			else if (fieldType == typeof(int2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
+			}
+			else if (fieldType == typeof(float2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				float xx = 0;
+				float yy = 0;
+				float res;
+				if (float.TryParse(parts[0].Replace("%",""), out res))
+					xx = res * (parts[0].Contains( '%' ) ? 0.01f : 1f);
+				if (float.TryParse(parts[1].Replace("%",""), out res))
+					yy = res * (parts[1].Contains( '%' ) ? 0.01f : 1f);
+				return new float2(xx,yy);
+			}
+
+			UnknownFieldAction("[Type] {0}".F(x),fieldType);
+			return null;
+		}
+
+		static object ParseYesNo( string p, System.Type fieldType, string field )
+		{
+			p = p.ToLowerInvariant();
+			if( p == "yes" ) return true;
+			if( p == "true" ) return true;
+			if( p == "no" ) return false;
+			if( p == "false" ) return false;
+			return InvalidValueAction(p,fieldType, field);
+		}
+
+		static Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>> typeLoadInfo = new Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>>( GetTypeLoadInfo );
+
+		static Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>> GetTypeLoadInfo( Type type )
+		{
+			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
+
+			foreach( var ff in type.GetFields() )
+			{
+				var field = ff;
+				var load = field.GetCustomAttributes<LoadAttribute>( false );
+				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>( false );
+				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>( false );
+				if( loadUsing.Length != 0 )
+					ret[ field ] = ( _1, fieldType, yaml ) => loadUsing[ 0 ].LoaderFunc( field )( yaml );
+				else if( fromYamlKey.Length != 0 )
+					ret[ field ] = ( f, ft, yaml ) => GetValue( f, ft, yaml.Value );
+				else if( load.Length != 0 )
+					ret[ field ] = null;
+			}
+
+			if( ret.Count == 0 )
+				foreach( var f in type.GetFields() )
+					ret.Add( f, null );
+
+			return ret;
+		}
+
+		[AttributeUsage( AttributeTargets.Field )]
+		public class LoadAttribute : Attribute { }
+
+		[AttributeUsage( AttributeTargets.Field )]
+		public class LoadUsingAttribute : Attribute
+		{
+			Func<MiniYaml, object> loaderFuncCache;
+			public readonly string Loader;
+
+			public LoadUsingAttribute( string loader )
+			{
+				Loader = loader;
+			}
+
+			internal Func<MiniYaml, object> LoaderFunc( FieldInfo field )
+			{
+				const BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
+				if( loaderFuncCache == null )
+					loaderFuncCache = (Func<MiniYaml, object>)Delegate.CreateDelegate( typeof( Func<MiniYaml, object> ), field.DeclaringType.GetMethod( Loader, bf ) );
+				return loaderFuncCache;
+			}
+		}
+	}
+
+	public static class FieldSaver
+	{
+		public static MiniYaml Save(object o)
+		{
+			var nodes = new List<MiniYamlNode>();
+			string root = null;
+
+			foreach( var f in o.GetType().GetFields( BindingFlags.Public | BindingFlags.Instance ) )
+			{
+				if( f.HasAttribute<FieldFromYamlKeyAttribute>() )
+					root = FormatValue( o, f );
+				else
+					nodes.Add( new MiniYamlNode( f.Name, FormatValue( o, f ) ) );
+			}
+
+			return new MiniYaml( root, nodes );
+		}
+
+		public static MiniYaml SaveDifferences(object o, object from)
+		{
+			if (o.GetType() != from.GetType())
+				throw new InvalidOperationException("FieldLoader: can't diff objects of different types");
+
+			var fields = o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
+				.Where(f => FormatValue(o,f) != FormatValue(from,f));
+
+			return new MiniYaml( null, fields.Select( f => new MiniYamlNode(
+					f.Name,
+					FormatValue( o, f ) ) ).ToList() );
+		}
+
+		public static string FormatValue(object o, FieldInfo f)
+		{
+			var v = f.GetValue(o);
+			if (v == null)
+				return "";
+
+			// Color.ToString() does the wrong thing; force it to format as an array
+			if (f.FieldType == typeof(Color))
+			{
+				var c = (Color)v;
+				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
+					((int)c.R).Clamp(0, 255),
+					((int)c.G).Clamp(0, 255),
+					((int)c.B).Clamp(0, 255));
+			}
+
+			return f.FieldType.IsArray
+				? string.Join(",", ((Array)v).OfType<object>().Select(a => a.ToString()).ToArray())
+				: v.ToString();
+		}
+	}
+
+	public class FieldFromYamlKeyAttribute : Attribute { }
+}

OpenRA.FileFormats/FieldSaver.cs

@@ -1,93 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-
-namespace OpenRA.FileFormats
-{
-	public static class FieldSaver
-	{
-		public static MiniYaml Save(object o)
-		{
-			var nodes = new List<MiniYamlNode>();
-			string root = null;
-
-			foreach (var f in o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance))
-			{
-				if (f.HasAttribute<FieldFromYamlKeyAttribute>())
-					root = FormatValue(o, f);
-				else
-					nodes.Add(new MiniYamlNode(f.Name, FormatValue(o, f)));
-			}
-
-			return new MiniYaml(root, nodes);
-		}
-
-		public static MiniYaml SaveDifferences(object o, object from)
-		{
-			if (o.GetType() != from.GetType())
-				throw new InvalidOperationException("FieldLoader: can't diff objects of different types");
-
-			var fields = o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
-				.Where(f => FormatValue(o, f) != FormatValue(from, f));
-
-			return new MiniYaml(null, fields.Select(f => new MiniYamlNode(f.Name, FormatValue(o, f))).ToList());
-		}
-
-		public static MiniYamlNode SaveField(object o, string field)
-		{
-			return new MiniYamlNode(field, FieldSaver.FormatValue(o, o.GetType().GetField(field)));
-		}
-
-		public static string FormatValue(object v, Type t)
-		{
-			if (v == null)
-				return "";
-
-			// Color.ToString() does the wrong thing; force it to format as an array
-			if (t == typeof(Color))
-			{
-				var c = (Color)v;
-				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
-					((int)c.R).Clamp(0, 255),
-					((int)c.G).Clamp(0, 255),
-					((int)c.B).Clamp(0, 255));
-			}
-
-			// Don't save floats in settings.yaml using country-specific decimal separators which can be misunderstood as group seperators.
-			if (t == typeof(float))
-				return ((float)v).ToString(CultureInfo.InvariantCulture);
-
-			if (t == typeof(Rectangle))
-			{
-				var r = (Rectangle)v;
-				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
-			}
-
-			if (t.IsArray)
-			{
-				var elems = ((Array)v).OfType<object>();
-				return elems.JoinWith(",");
-			}
-
-			return v.ToString();
-		}
-
-		public static string FormatValue(object o, FieldInfo f)
-		{
-			return FormatValue(f.GetValue(o), f.FieldType);
-		}
-	}
-}

OpenRA.FileFormats/FileFormats/AudLoader.cs

@@ -1,157 +1,155 @@
-#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.IO;
-
-namespace OpenRA.FileFormats
-{
-	[Flags]
-	enum SoundFlags
-	{
-		Stereo = 0x1,
-		_16Bit = 0x2,
-	}
-
-	enum SoundFormat
-	{
-		WestwoodCompressed = 1,
-		ImaAdpcm = 99,
-	}
-
-	struct Chunk
-	{
-		public int CompressedSize;
-		public int OutputSize;
-
-		public static Chunk Read(Stream s)
-		{
-			Chunk c;
-			c.CompressedSize = s.ReadUInt16();
-			c.OutputSize = s.ReadUInt16();
-			if (0xdeaf != s.ReadUInt32())
-				throw new InvalidDataException("Chunk header is bogus");
-			return c;
-		}
-	}
-
-	public static class AudLoader
-	{
-		static int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
-		static int[] stepTable = {
-									7,     8,     9,     10,    11,    12,     13,    14,    16,
-									17,    19,    21,    23,    25,    28,     31,    34,    37,
-									41,    45,    50,    55,    60,    66,     73,    80,    88,
-									97,    107,   118,   130,   143,   157,    173,   190,   209,
-									230,   253,   279,   307,   337,   371,    408,   449,   494,
-									544,   598,   658,   724,   796,   876,    963,   1060,  1166,
-									1282,  1411,  1552,  1707,  1878,  2066,   2272,  2499,  2749,
-									3024,  3327,  3660,  4026,  4428,  4871,   5358,  5894,  6484,
-									7132,  7845,  8630,  9493,  10442, 11487,  12635, 13899, 15289,
-									16818, 18500, 20350, 22385, 24623, 27086,  29794, 32767 };
-
-		static short DecodeSample(byte b, ref int index, ref int current)
-		{
-			var sb = (b & 8) != 0;
-			b &= 7;
-
-			var delta = (stepTable[index] * b) / 4 + stepTable[index] / 8;
-			if (sb) delta = -delta;
-
-			current += delta;
-			if (current > short.MaxValue) current = short.MaxValue;
-			if (current < short.MinValue) current = short.MinValue;
-
-			index += indexAdjust[b];
-			if (index < 0) index = 0;
-			if (index > 88) index = 88;
-
-			return (short)current;
-		}
-
-		public static byte[] LoadSound(byte[] raw, ref int index)
-		{
-			var s = new MemoryStream(raw);
-			var dataSize = raw.Length;
-			var outputSize = raw.Length * 4;
-
-			var output = new byte[outputSize];
-			var offset = 0;
-			var currentSample = 0;
-
-			while (dataSize-- > 0)
-			{
-				var b = s.ReadUInt8();
-
-				var t = DecodeSample(b, ref index, ref currentSample);
-				output[offset++] = (byte)t;
-				output[offset++] = (byte)(t >> 8);
-
-				t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
-				output[offset++] = (byte)t;
-				output[offset++] = (byte)(t >> 8);
-			}
-
-			return output;
-		}
-
-		public static float SoundLength(Stream s)
-		{
-			var sampleRate = s.ReadUInt16();
-			/*var dataSize = */ s.ReadInt32();
-			var outputSize = s.ReadInt32();
-			var flags = (SoundFlags)s.ReadByte();
-
-			var samples = outputSize;
-			if (0 != (flags & SoundFlags.Stereo)) samples /= 2;
-			if (0 != (flags & SoundFlags._16Bit)) samples /= 2;
-			return samples / sampleRate;
-		}
-
-		public static byte[] LoadSound(Stream s)
-		{
-			/*var sampleRate =*/ s.ReadUInt16();
-			var dataSize = s.ReadInt32();
-			var outputSize = s.ReadInt32();
-			/*var flags = (SoundFlags)*/ s.ReadByte();
-			/*var format = (SoundFormat)*/ s.ReadByte();
-
-			var output = new byte[outputSize];
-			var offset = 0;
-			var index = 0;
-			var currentSample = 0;
-
-			while (dataSize > 0)
-			{
-				var chunk = Chunk.Read(s);
-				for (int n = 0; n < chunk.CompressedSize; n++)
-				{
-					var b = s.ReadUInt8();
-
-					var t = DecodeSample(b, ref index, ref currentSample);
-					output[offset++] = (byte)t;
-					output[offset++] = (byte)(t >> 8);
-
-					if (offset < outputSize)
-					{
-						/* possible that only half of the final byte is used! */
-						t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
-						output[offset++] = (byte)t;
-						output[offset++] = (byte)(t >> 8);
-					}
-				}
-
-				dataSize -= 8 + chunk.CompressedSize;
-			}
-
-			return output;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	[Flags]
+	enum SoundFlags
+	{
+		Stereo = 0x1,
+		_16Bit = 0x2,
+	}
+
+	enum SoundFormat
+	{
+		WestwoodCompressed = 1,
+		ImaAdpcm = 99,
+	}
+
+	struct Chunk
+	{
+		public int CompressedSize;
+		public int OutputSize;
+
+		public static Chunk Read(BinaryReader r)
+		{
+			Chunk c;
+			c.CompressedSize = r.ReadUInt16();
+			c.OutputSize = r.ReadUInt16();
+			if (0xdeaf != r.ReadUInt32())
+				throw new InvalidDataException("Chunk header is bogus");
+			return c;
+		}
+	}
+
+	public static class AudLoader
+	{
+		static int[] IndexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
+		static int[] StepTable = {
+									7,     8,     9,     10,    11,    12,     13,    14,    16,
+									17,    19,    21,    23,    25,    28,     31,    34,    37,
+									41,    45,    50,    55,    60,    66,     73,    80,    88,
+									97,    107,   118,   130,   143,   157,    173,   190,   209,
+									230,   253,   279,   307,   337,   371,    408,   449,   494,
+									544,   598,   658,   724,   796,   876,    963,   1060,  1166,
+									1282,  1411,  1552,  1707,  1878,  2066,   2272,  2499,  2749,
+									3024,  3327,  3660,  4026,  4428,  4871,   5358,  5894,  6484,
+									7132,  7845,  8630,  9493,  10442, 11487,  12635, 13899, 15289,
+									16818, 18500, 20350, 22385, 24623, 27086,  29794, 32767 };
+
+		static short DecodeSample(byte b, ref int index, ref int current)
+		{
+			var sb = (b & 8) != 0;
+			b &= 7;
+
+			var delta = (StepTable[index] * b) / 4 + StepTable[index] / 8;
+			if (sb) delta = -delta;
+
+			current += delta;
+			if (current > short.MaxValue) current = short.MaxValue;
+			if (current < short.MinValue) current = short.MinValue;
+
+			index += IndexAdjust[b];
+			if (index < 0) index = 0;
+			if (index > 88) index = 88;
+
+			return (short)current;
+		}
+
+		public static byte[] LoadSound(byte[] raw, ref int index)
+		{
+			var br = new BinaryReader(new MemoryStream(raw));
+			var dataSize = raw.Length;
+			var outputSize = raw.Length * 4;
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var currentSample = 0;
+
+			while (dataSize-- > 0)
+			{
+				var b = br.ReadByte();
+
+				var t = DecodeSample(b, ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+
+				t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+			}
+
+			return output;
+		}
+
+		public static float SoundLength(Stream s)
+		{
+			var br = new BinaryReader(s);
+			var sampleRate = br.ReadUInt16();
+			/*var dataSize = */ br.ReadInt32();
+			var outputSize = br.ReadInt32();
+			var flags = (SoundFlags) br.ReadByte();
+			
+			var samples = outputSize;
+			if (0 != (flags & SoundFlags.Stereo)) samples /= 2;
+			if (0 != (flags & SoundFlags._16Bit)) samples /= 2;
+			return samples / sampleRate;
+		}
+		
+		public static byte[] LoadSound(Stream s)
+		{
+			var br = new BinaryReader(s);
+			/*var sampleRate =*/ br.ReadUInt16();
+			var dataSize = br.ReadInt32();
+			var outputSize = br.ReadInt32();
+			/*var flags = (SoundFlags)*/ br.ReadByte();
+			/*var format = (SoundFormat)*/ br.ReadByte();
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var index = 0;
+			var currentSample = 0;
+
+			while (dataSize > 0)
+			{
+				var chunk = Chunk.Read(br);
+				for (int n = 0; n < chunk.CompressedSize; n++)
+				{
+					var b = br.ReadByte();
+
+					var t = DecodeSample(b, ref index, ref currentSample);
+					output[offset++] = (byte)t;
+					output[offset++] = (byte)(t >> 8);
+		
+					t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+					output[offset++] = (byte)t;
+					output[offset++] = (byte)(t >> 8);
+				}
+
+				dataSize -= 8 + chunk.CompressedSize;
+			}
+
+			return output;
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Blast.cs

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

OpenRA.FileFormats/FileFormats/Blowfish.cs

@@ -1,406 +1,406 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	class Blowfish
-	{
-		public Blowfish(byte[] key)
-		{
-			for (int i = 0, j = 0; i < 18; ++i)
-			{
-				uint a = key[j++ % key.Length];
-				uint b = key[j++ % key.Length];
-				uint c = key[j++ % key.Length];
-				uint d = key[j++ % key.Length];
-
-				m_p[i] ^= a << 24 | b << 16 | c << 8 | d;
-			}
-
-			uint l = 0, r = 0;
-
-			for (int i = 0; i < 18; )
-			{
-				Encrypt(ref l, ref r);
-				m_p[i++] = l;
-				m_p[i++] = r;
-			}
-
-			for (int i = 0; i < 4; ++i)
-				for (int j = 0; j < 256; )
-				{
-					Encrypt(ref l, ref r);
-					m_s[i, j++] = l;
-					m_s[i, j++] = r;
-				}
-		}
-
-		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
-		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
-
-		delegate void CipherFunc( ref uint a, ref uint b );
-
-		uint[] RunCipher(uint[] data, CipherFunc f)
-		{
-			uint[] result = new uint[data.Length];
-
-			int size = data.Length / 2;
-			int i = 0;
-			while (size-- > 0)
-			{
-				uint a = SwapBytes(data[i]);
-				uint b = SwapBytes(data[i+1]);
-
-				f(ref a, ref b);
-
-				result[i++] = SwapBytes(a);
-				result[i++] = SwapBytes(b);
-			}
-
-			return result;
-		}
-
-		void Encrypt(ref uint a, ref uint b)
-		{
-			uint _a = a, _b = b;
-			_a ^= m_p[0];
-
-			bool x = false;
-			for( int i = 1; i <= 16; i++, x ^= true)
-			{
-				if (x)
-					Round(ref _a, _b, i);
-				else
-					Round(ref _b, _a, i);
-			}
-			_b ^= m_p[17];
-
-			a = _b;
-			b = _a;
-		}
-
-		void Decrypt(ref uint a, ref uint b)
-		{
-			uint _a = a, _b = b;
-			_a ^= m_p[17];
-
-			bool x = false;
-			for (int i = 16; i >= 1; i--, x ^= true)
-			{
-				if (x)
-					Round(ref _a, _b, i);
-				else
-					Round(ref _b, _a, i);
-			}
-			_b ^= m_p[0];
-
-			a = _b;
-			b = _a;
-		}
-
-		uint S(uint x, int i)
-		{
-			return m_s[i, (x >> ((3 - i) << 3)) & 0xff];
-		}
-
-		uint bf_f(uint x)
-		{
-			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
-		}
-
-		void Round(ref uint a, uint b, int n)
-		{
-			a ^= bf_f(b) ^ m_p[n];
-		}
-
-		uint SwapBytes(uint i)
-		{
-			i = (i << 16) | (i >> 16);
-			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);
-			return i;
-		}
-
-		uint[] m_p = new uint[] {
-			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-			0x9216d5d9, 0x8979fb1b
-		};
-
-		uint[,] m_s = new uint[,] {
-			{
-				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-				0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-			},
-			{
-				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-				0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-			},
-			{
-				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-				0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-			},
-			{
-				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-			}
-
-		};
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	class Blowfish
+	{
+		public Blowfish(byte[] key)
+		{
+			for (int i = 0, j = 0; i < 18; ++i)
+			{
+				uint a = key[j++ % key.Length];
+				uint b = key[j++ % key.Length];
+				uint c = key[j++ % key.Length];
+				uint d = key[j++ % key.Length];
+
+				m_p[i] ^= a << 24 | b << 16 | c << 8 | d;
+			}
+
+			uint l = 0, r = 0;
+
+			for (int i = 0; i < 18; )
+			{
+				Encrypt(ref l, ref r);
+				m_p[i++] = l;
+				m_p[i++] = r;
+			}
+
+			for (int i = 0; i < 4; ++i)
+				for (int j = 0; j < 256; )
+				{
+					Encrypt(ref l, ref r);
+					m_s[i, j++] = l;
+					m_s[i, j++] = r;
+				}
+		}
+
+		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
+		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
+
+		delegate void CipherFunc( ref uint a, ref uint b );
+
+		uint[] RunCipher(uint[] data, CipherFunc f)
+		{
+			uint[] result = new uint[data.Length];
+
+			int size = data.Length / 2;
+			int i = 0;
+			while (size-- > 0)
+			{
+				uint a = SwapBytes(data[i]);
+				uint b = SwapBytes(data[i+1]);
+
+				f(ref a, ref b);
+
+				result[i++] = SwapBytes(a);
+				result[i++] = SwapBytes(b);
+			}
+
+			return result;
+		}
+
+		void Encrypt(ref uint a, ref uint b)
+		{
+			uint _a = a, _b = b;
+			_a ^= m_p[0];
+
+			bool x = false;
+			for( int i = 1; i <= 16; i++, x ^= true)
+			{
+				if (x)
+					Round(ref _a, _b, i);
+				else
+					Round(ref _b, _a, i);
+			}
+			_b ^= m_p[17];
+
+			a = _b;
+			b = _a;
+		}
+
+		void Decrypt(ref uint a, ref uint b)
+		{
+			uint _a = a, _b = b;
+			_a ^= m_p[17];
+
+			bool x = false;
+			for (int i = 16; i >= 1; i--, x ^= true)
+			{
+				if (x)
+					Round(ref _a, _b, i);
+				else
+					Round(ref _b, _a, i);
+			}
+			_b ^= m_p[0];
+
+			a = _b;
+			b = _a;
+		}
+
+		uint S(uint x, int i)
+		{
+			return m_s[i, (x >> ((3 - i) << 3)) & 0xff];
+		}
+
+		uint bf_f(uint x)
+		{
+			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
+		}
+
+		void Round(ref uint a, uint b, int n)
+		{
+			a ^= bf_f(b) ^ m_p[n];
+		}
+
+		uint SwapBytes(uint i)
+		{
+			i = (i << 16) | (i >> 16);
+			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);
+			return i;
+		}
+
+		uint[] m_p = new uint[] {
+			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+			0x9216d5d9, 0x8979fb1b
+		};
+
+		uint[,] m_s = new uint[,] {
+			{
+				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+				0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+			},
+			{
+				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+				0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+			},
+			{
+				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+				0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+			},
+			{
+				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+			}
+
+		};
+	}
+}

OpenRA.FileFormats/FileFormats/CRC32.cs

@@ -1,133 +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
-
-namespace OpenRA.FileFormats
-{
-
-	/// <summary>
-	/// Static class that uses a lookup table to calculates CRC32
-	/// checksums of input strings.
-	/// </summary>
-	public static class CRC32
-	{
-		/// <summary>
-		/// The CRC32 lookup table
-		/// </summary>
-		static uint[] lookUp = new uint[256]
-		{
-			0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-			0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-			0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-			0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-			0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-			0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-			0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-			0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-			0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-			0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-			0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-			0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-			0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-			0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-			0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-			0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-			0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-			0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-			0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-			0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-			0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-			0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-			0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-			0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-			0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-			0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-			0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-			0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-			0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-			0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-			0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-			0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-			0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-			0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-			0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-			0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-			0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-			0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-			0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-			0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-			0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-			0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-			0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-			0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-			0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-			0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-			0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-			0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-			0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-			0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-			0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-			0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-			0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-			0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-			0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-			0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-			0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-			0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-			0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-			0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-			0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-			0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-			0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-			0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-		};
-
-		/// <summary>
-		/// 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>
-		/// <returns>
-		/// The calculated checksum.
-		/// </returns>
-		public static uint Calculate(byte[] data, uint polynomial)
-		{
-			uint crc = polynomial;
-			for (int i = 0; i < data.Length; i++)
-				crc = (crc >> 8) ^ lookUp[(crc & 0xFF) ^ data[i]];
-			crc ^= polynomial;
-			return crc;
-		}
-		public static uint Calculate(byte[] data)
-		{
-			return Calculate(data, 0xFFFFFFFF);
-		}
-
-		/// <summary>
-		/// A fast (native) CRC32 implementation that can be used on a pinned byte array using
-		/// default polynomal.
-		/// </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>
-		/// <returns>The calculated checksum.</returns>
-		public static unsafe uint Calculate(byte* data, uint len, uint polynomial)
-		{
-			uint crc = polynomial;
-			for (int i = 0; i < len; i++)
-				crc = (crc >> 8) ^ lookUp[(crc & 0xFF) ^ *data++];
-			crc ^= polynomial;
-			return crc;
-		}
-		public static unsafe uint Calculate(byte* data, uint len)
-		{
-			return Calculate(data, len, 0xFFFFFFFF);
-		}
-	}
-}

OpenRA.FileFormats/FileFormats/Format2.cs

@@ -1,36 +1,36 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public static class Format2
-	{
-		public static int DecodeInto(byte[] src, byte[] dest)
-		{
-			FastByteReader r = new FastByteReader(src);
-
-			int i = 0;
-			while (!r.Done())
-			{
-				byte cmd = r.ReadByte();
-				if (cmd == 0)
-				{
-					byte count = r.ReadByte();
-					while (count-- > 0)
-						dest[i++] = 0;
-				}
-				else
-					dest[i++] = cmd;
-			}
-
-			return i;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public static class Format2
+	{
+		public static int DecodeInto(byte[] src, byte[] dest)
+		{
+			FastByteReader r = new FastByteReader(src);
+
+			int i = 0;
+			while (!r.Done())
+			{
+				byte cmd = r.ReadByte();
+				if (cmd == 0)
+				{
+					byte count = r.ReadByte();
+					while (count-- > 0)
+						dest[i++] = 0;
+				}
+				else
+					dest[i++] = cmd;
+			}
+
+			return i;
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Format40.cs

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

OpenRA.FileFormats/FileFormats/Format80.cs

@@ -1,150 +1,125 @@
-#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.IO;
-
-namespace OpenRA.FileFormats
-{
-	class FastByteReader
-	{
-		readonly byte[] src;
-		int offset = 0;
-
-		public FastByteReader(byte[] src)
-		{
-			this.src = src;
-		}
-
-		public bool Done() { return offset >= src.Length; }
-		public byte ReadByte() { return src[offset++]; }
-		public int ReadWord()
-		{
-			int x = ReadByte();
-			return x | (ReadByte() << 8);
-		}
-
-		public void CopyTo(byte[] dest, int offset, int count)
-		{
-			Array.Copy(src, this.offset, dest, offset, count);
-			this.offset += count;
-		}
-
-		public int Remaining() { return src.Length - offset; }
-	}
-
-	public static class Format80
-	{
-		static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count )
-		{
-			if( srcIndex > destIndex )
-				throw new NotImplementedException("srcIndex > destIndex {0} {1}".F(srcIndex, destIndex));
-
-			if( destIndex - srcIndex == 1 )
-			{
-				for( int 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 ];
-			}
-		}
-
-		public static int DecodeInto( byte[] src, byte[] dest )
-		{
-			var ctx = new FastByteReader(src);
-			int destIndex = 0;
-
-			while( true )
-			{
-				byte i = ctx.ReadByte();
-				if( ( i & 0x80 ) == 0 )
-				{
-					// case 2
-					byte secondByte = ctx.ReadByte();
-					int count = ( ( i & 0x70 ) >> 4 ) + 3;
-					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
-
-					ReplicatePrevious( dest, destIndex, destIndex - rpos, count );
-					destIndex += count;
-				}
-				else if( ( i & 0x40 ) == 0 )
-				{
-					// case 1
-					int count = i & 0x3F;
-					if( count == 0 )
-						return destIndex;
-
-					ctx.CopyTo( dest, destIndex, count );
-					destIndex += count;
-				}
-				else
-				{
-					int count3 = i & 0x3F;
-					if( count3 == 0x3E )
-					{
-						// case 4
-						int count = ctx.ReadWord();
-						byte color = ctx.ReadByte();
-
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] = color;
-					}
-					else if( count3 == 0x3F )
-					{
-						// case 5
-						int count = ctx.ReadWord();
-						int 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++ ];
-					}
-					else
-					{
-						// case 3
-						int count = count3 + 3;
-						int 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++ ];
-					}
-				}
-			}
-		}
-
-		public static byte[] Encode(byte[] src)
-		{
-			/* quick & dirty format80 encoder -- only uses raw copy operator, terminated with a zero-run. */
-			/* this does not produce good compression, but it's valid format80 */
-
-			var ctx = new FastByteReader(src);
-			var ms = new MemoryStream();
-
-			do
-			{
-				var len = Math.Min(ctx.Remaining(), 0x3F);
-				ms.WriteByte((byte)(0x80 | len));
-				while (len-- > 0)
-					ms.WriteByte(ctx.ReadByte());
-			}
-			while (!ctx.Done());
-
-			ms.WriteByte(0x80);	// terminator -- 0-length run.
-
-			return ms.ToArray();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA.FileFormats
+{
+    class FastByteReader
+    {
+        readonly byte[] src;
+        int offset = 0;
+
+        public FastByteReader(byte[] src)
+        {
+            this.src = src;
+        }
+
+        public bool Done() { return offset >= src.Length; }
+        public byte ReadByte() { return src[offset++]; }
+        public int ReadWord()
+        {
+            int x = ReadByte();
+            return x | (ReadByte() << 8);
+        }
+
+        public void CopyTo(byte[] dest, int offset, int count)
+        {
+            Array.Copy(src, this.offset, dest, offset, count);
+            this.offset += count;
+        }
+    }
+
+	public static class Format80
+	{
+		static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count )
+		{
+			if( srcIndex > destIndex )
+				throw new NotImplementedException( string.Format( "srcIndex > destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+			if( destIndex - srcIndex == 1 )
+			{
+				for( int 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 ];
+			}
+		}
+
+		public static int DecodeInto( byte[] src, byte[] dest )
+		{
+            var ctx = new FastByteReader(src);
+			int destIndex = 0;
+
+			while( true )
+			{
+                byte i = ctx.ReadByte();
+				if( ( i & 0x80 ) == 0 )
+				{
+					// case 2
+                    byte secondByte = ctx.ReadByte();
+					int count = ( ( i & 0x70 ) >> 4 ) + 3;
+					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
+
+					ReplicatePrevious( dest, destIndex, destIndex - rpos, count );
+					destIndex += count;
+				}
+				else if( ( i & 0x40 ) == 0 )
+				{
+					// case 1
+					int count = i & 0x3F;
+					if( count == 0 )
+						return destIndex;
+
+					ctx.CopyTo( dest, destIndex, count );
+					destIndex += count;
+				}
+				else
+				{
+					int count3 = i & 0x3F;
+					if( count3 == 0x3E )
+					{
+						// case 4
+                        int count = ctx.ReadWord();
+                        byte color = ctx.ReadByte();
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = color;
+					}
+					else if( count3 == 0x3F )
+					{
+						// case 5
+                        int count = ctx.ReadWord();
+                        int srcIndex = ctx.ReadWord();
+						if( srcIndex >= destIndex )
+							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = dest[ srcIndex++ ];
+					}
+					else
+					{
+						// case 3
+						int count = count3 + 3;
+                        int srcIndex = ctx.ReadWord();
+						if( srcIndex >= destIndex )
+							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = dest[ srcIndex++ ];
+					}
+				}
+			}
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/IniFile.cs

@@ -1,151 +1,151 @@
-#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;
-using System.IO;
-using System.Text.RegularExpressions;
-
-namespace OpenRA.FileFormats
-{
-	public class IniFile
-	{
-		Dictionary<string, IniSection> sections = new Dictionary<string, IniSection>();
-
-		public IniFile(Stream s)
-		{
-			Load(s);
-		}
-
-		public IniFile(params Stream[] streams)
-		{
-			foreach (var s in streams)
-				Load(s);
-		}
-
-		public void Load(Stream s)
-		{
-			StreamReader reader = new StreamReader(s);
-			IniSection currentSection = null;
-
-			while (!reader.EndOfStream)
-			{
-				var line = reader.ReadLine();
-
-				if (line.Length == 0) continue;
-
-				switch (line[0])
-				{
-				case ';': break;
-				case '[': currentSection = ProcessSection(line); break;
-				default: ProcessEntry(line, currentSection); break;
-				}
-			}
-		}
-
-		Regex sectionPattern = new Regex(@"^\[([^]]*)\]");
-
-		IniSection ProcessSection(string line)
-		{
-			Match m = sectionPattern.Match(line);
-			if (m == null || !m.Success)
-				return null;
-			string sectionName = m.Groups[1].Value.ToLowerInvariant();
-
-			IniSection ret;
-			if (!sections.TryGetValue(sectionName, out ret))
-				sections.Add(sectionName, ret = new IniSection(sectionName));
-			return ret;
-		}
-
-		bool ProcessEntry(string line, IniSection currentSection)
-		{
-			var comment = line.IndexOf(';');
-			if (comment >= 0)
-				line = line.Substring(0, comment);
-
-			line = line.Trim();
-			if (line.Length == 0)
-				return false;
-
-			var key = line;
-			var value = "";
-			int eq = line.IndexOf('=');
-			if (eq >= 0)
-			{
-				key = line.Substring(0, eq);
-				value = line.Substring(eq + 1, line.Length - eq - 1);
-			}
-
-			if (currentSection == null)
-				throw new InvalidOperationException("No current INI section");
-
-			if (!currentSection.Contains(key))
-				currentSection.Add(key, value);
-			return true;
-		}
-
-		public IniSection GetSection(string s)
-		{
-			return GetSection(s, false);
-		}
-
-		public IniSection GetSection(string s, bool allowFail)
-		{
-			IniSection section;
-			if (sections.TryGetValue(s.ToLowerInvariant(), out section))
-				return section;
-
-			if (allowFail)
-				return new IniSection(s);
-			throw new InvalidOperationException("Section does not exist in map or rules: " + s);
-		}
-
-		public IEnumerable<IniSection> Sections { get { return sections.Values; } }
-	}
-
-	public class IniSection : IEnumerable<KeyValuePair<string, string>>
-	{
-		public string Name { get; private set; }
-		Dictionary<string, string> values = new Dictionary<string, string>();
-
-		public IniSection(string name)
-		{
-			Name = name;
-		}
-
-		public void Add(string key, string value)
-		{
-			values[key] = value;
-		}
-
-		public bool Contains(string key)
-		{
-			return values.ContainsKey(key);
-		}
-
-		public string GetValue(string key, string defaultValue)
-		{
-			string s;
-			return values.TryGetValue(key, out s) ? s : defaultValue;
-		}
-
-		public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
-		{
-			return values.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace OpenRA.FileFormats
+{
+	public class IniFile
+	{
+		Dictionary<string, IniSection> sections = new Dictionary<string, IniSection>();
+
+		public IniFile( Stream s )
+		{
+			Load( s );
+		}
+
+		public IniFile( params Stream[] streams )
+		{
+			foreach( var s in streams )
+				Load( s );
+		}
+
+		public void Load( Stream s )
+		{
+			StreamReader reader = new StreamReader( s );
+			IniSection currentSection = null;
+
+			while( !reader.EndOfStream )
+			{
+				string line = reader.ReadLine();
+
+				if( line.Length == 0 ) continue;
+
+				switch( line[ 0 ] )
+				{
+				case ';': break;
+				case '[': currentSection = ProcessSection( line ); break;
+				default: ProcessEntry( line, currentSection ); break;
+				}
+			}
+		}
+
+		Regex sectionPattern = new Regex( @"^\[([^]]*)\]" );
+
+		IniSection ProcessSection( string line )
+		{
+			Match m = sectionPattern.Match( line );
+			if( m == null || !m.Success )
+				return null;
+			string sectionName = m.Groups[ 1 ].Value.ToLowerInvariant();
+
+			IniSection ret;
+			if( !sections.TryGetValue( sectionName, out ret ) )
+				sections.Add( sectionName, ret = new IniSection( sectionName ) );
+			return ret;
+		}
+
+		bool ProcessEntry( string line, IniSection currentSection )
+		{
+			int comment = line.IndexOf( ';' );
+			if( comment >= 0 )
+				line = line.Substring( 0, comment );
+
+			line = line.Trim();
+			if( line.Length == 0 )
+				return false;
+
+			var key = line;
+			var value = "";
+			int eq = line.IndexOf( '=' );
+			if( eq >= 0 )
+			{
+				key = line.Substring( 0, eq );
+				value = line.Substring( eq + 1, line.Length - eq - 1 );
+			}
+
+			if( currentSection == null )
+				throw new InvalidOperationException( "No current INI section" );
+
+			if( !currentSection.Contains( key ) )
+				currentSection.Add( key, value );
+			return true;
+		}
+
+		public IniSection GetSection( string s )
+		{
+			return GetSection( s, false );
+		}
+
+		public IniSection GetSection( string s, bool allowFail )
+		{
+			IniSection section;
+			if( sections.TryGetValue( s.ToLowerInvariant(), out section ) )
+				return section;
+
+			if( allowFail )
+				return new IniSection( s );
+			throw new InvalidOperationException( "Section does not exist in map or rules: " + s );
+		}
+
+		public IEnumerable<IniSection> Sections { get { return sections.Values; } }
+	}
+
+	public class IniSection : IEnumerable<KeyValuePair<string, string>>
+	{
+		public string Name { get; private set; }
+		Dictionary<string, string> values = new Dictionary<string, string>();
+
+		public IniSection( string name )
+		{
+			Name = name;
+		}
+
+		public void Add( string key, string value )
+		{
+			values[key] = value;
+		}
+
+		public bool Contains( string key )
+		{
+			return values.ContainsKey( key );
+		}
+
+		public string GetValue( string key, string defaultValue )
+		{
+			string s;
+			return values.TryGetValue( key, out s ) ? s : defaultValue;
+		}
+
+		public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+		{
+			return values.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/WavLoader.cs

@@ -1,75 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-using System.Text;
-
-namespace OpenRA.FileFormats
-{
-	public class WavLoader
-	{
-		public readonly int FileSize;
-		public readonly string Format;
-
-		public readonly int FmtChunkSize;
-		public readonly int AudioFormat;
-		public readonly int Channels;
-		public readonly int SampleRate;
-		public readonly int ByteRate;
-		public readonly int BlockAlign;
-		public readonly int BitsPerSample;
-
-		public readonly int DataSize;
-		public readonly byte[] RawOutput;
-
-		public WavLoader(Stream s)
-		{
-			while (s.Position < s.Length)
-			{
-				if ((s.Position & 1) == 1)
-					s.ReadByte(); // Alignment
-
-				var type = s.ReadASCII(4);
-				switch (type)
-				{
-					case "RIFF":
-						FileSize = s.ReadInt32();
-						Format = s.ReadASCII(4);
-						if (Format != "WAVE")
-							throw new NotSupportedException("Not a canonical WAVE file.");
-						break;
-					case "fmt ":
-						FmtChunkSize = s.ReadInt32();
-						if (FmtChunkSize != 16)
-							throw new NotSupportedException("{0} fmt chunk size is not a supported encoding scheme.".F(FmtChunkSize));
-						AudioFormat = s.ReadInt16();
-						if (AudioFormat != 1)
-							throw new NotSupportedException("Non-PCM compression is not supported.");
-						Channels = s.ReadInt16();
-						SampleRate = s.ReadInt32();
-						ByteRate = s.ReadInt32();
-						BlockAlign = s.ReadInt16();
-						BitsPerSample = s.ReadInt16();
-						break;
-					case "data":
-						DataSize = s.ReadInt32();
-						RawOutput = s.ReadBytes(DataSize);
-						break;
-					default:
-						// Ignore unknown chunks
-						var chunkSize = s.ReadInt32();
-						s.ReadBytes(chunkSize);
-						break;
-				}
-			}
-		}
-	}
-}

OpenRA.FileFormats/FileFormats/XccGlobalDatabase.cs

@@ -1,44 +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.IO;
-
-namespace OpenRA.FileFormats
-{
-	public class XccGlobalDatabase
-	{
-		public readonly string[] Entries;
-		public XccGlobalDatabase(Stream s)
-		{
-			var entries = new List<string>();
-			var reader = new BinaryReader(s);
-			while (reader.PeekChar() > -1)
-			{
-				var count = reader.ReadInt32();
-				for (var i = 0; i < count; i++)
-				{
-					var chars = new List<char>();
-					char c;
-
-					// Read filename
-					while ((c = reader.ReadChar()) != 0)
-						chars.Add(c);
-					entries.Add(new string(chars.ToArray()));
-
-					// Skip comment
-					while ((c = reader.ReadChar()) != 0);
-				}
-			}
-
-			Entries = entries.ToArray();
-		}
-	}
-}

OpenRA.FileFormats/FileFormats/XccLocalDatabase.cs

@@ -1,67 +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.IO;
-using System.Linq;
-using System.Text;
-
-namespace OpenRA.FileFormats
-{
-	public class XccLocalDatabase
-	{
-		public readonly string[] Entries;
-		public XccLocalDatabase(Stream s)
-		{
-			// Skip unnecessary header data
-			s.Seek(48, SeekOrigin.Begin);
-			var reader = new BinaryReader(s);
-			var count = reader.ReadInt32();
-			Entries = new string[count];
-			for (var i = 0; i < count; i++)
-			{
-				var chars = new List<char>();
-				char c;
-				while ((c = reader.ReadChar()) != 0)
-					chars.Add(c);
-
-				Entries[i] = new string(chars.ToArray());
-			}
-		}
-
-		public XccLocalDatabase(IEnumerable<string> filenames)
-		{
-			Entries = filenames.ToArray();
-		}
-
-		public byte[] Data()
-		{
-			var data = new MemoryStream();
-			using (var writer = new BinaryWriter(data))
-			{
-				writer.Write(Encoding.ASCII.GetBytes("XCC by Olaf van der Spek"));
-				writer.Write(new byte[] {0x1A,0x04,0x17,0x27,0x10,0x19,0x80,0x00});
-
-				writer.Write((int)(Entries.Aggregate(Entries.Length, (a,b) => a + b.Length) + 52)); // Size
-				writer.Write((int)0); // Type
-				writer.Write((int)0); // Version
-				writer.Write((int)0); // Game/Format (0 == TD)
-				writer.Write((int)Entries.Length); // Entries
-				foreach (var e in Entries)
-				{
-					writer.Write(Encoding.ASCII.GetBytes(e));
-					writer.Write((byte)0);
-				}
-			}
-
-			return data.ToArray();
-		}
-	}
-}

OpenRA.FileFormats/FileSystem.cs

@@ -0,0 +1,159 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+namespace OpenRA.FileFormats
+{
+	public static class FileSystem
+	{
+		static List<IFolder> mountedFolders = new List<IFolder>();
+
+		static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
+
+		static void MountInner(IFolder folder)
+		{
+			mountedFolders.Add(folder);
+
+			foreach( var hash in folder.AllFileHashes() )
+			{
+				var l = allFiles[hash];
+				if( !l.Contains( folder ) )
+					l.Add( folder );
+			}
+		}
+
+		static IFolder OpenPackage(string filename)
+		{
+			if (filename.EndsWith(".mix"))
+				return new Package(filename);
+			else if (filename.EndsWith(".zip"))
+				return new CompressedPackage(filename);
+			else
+				return new Folder(filename);
+		}
+
+		public static void Mount(string name)
+		{
+			name = name.ToLowerInvariant();
+			var optional = name.StartsWith("~");
+			if (optional) name = name.Substring(1);
+
+			var a = (Action)(() => FileSystem.MountInner(OpenPackage(name)));
+
+			if (optional)
+				try { a(); }
+				catch { }
+			else
+				a();
+		}
+
+		public static void UnmountAll()
+		{
+			mountedFolders.Clear();
+			allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
+		}
+
+		public static void LoadFromManifest( Manifest manifest )
+		{
+			UnmountAll();
+			foreach (var dir in manifest.Folders) Mount(dir);
+			foreach (var pkg in manifest.Packages) Mount(pkg);
+		}
+
+		static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
+		{
+			foreach( var folder in index[ PackageEntry.HashFilename( filename ) ] )
+				if (folder.Exists(filename))
+					return folder.GetContent(filename);
+			return null;
+		}
+
+		public static Stream Open(string filename)
+		{
+			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
+			{
+				var ret = GetFromCache( allFiles, filename );
+				if( ret != null )
+					return ret;
+			}
+
+			foreach( IFolder folder in mountedFolders )
+			{
+				if (folder.Exists(filename))
+					return folder.GetContent(filename);
+			}
+
+			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+		}
+
+		public static Stream OpenWithExts( string filename, params string[] exts )
+		{
+			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
+			{
+				foreach( var ext in exts )
+				{
+					var s = GetFromCache( allFiles, filename + ext );
+					if( s != null )
+						return s;
+				}
+			}
+
+			foreach( var ext in exts )
+			{
+				foreach( IFolder folder in mountedFolders )
+					if (folder.Exists(filename + ext))
+						return folder.GetContent( filename + ext );
+			}
+
+			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+		}
+
+		public static bool Exists(string filename)
+		{
+			foreach (var folder in mountedFolders)
+				if (folder.Exists(filename))
+				    return true;
+			return false;
+		}
+
+		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
+
+		public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
+		{
+			foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+			{
+				if (assembly.FullName == e.Name)
+					return assembly;
+			}
+
+			string[] frags = e.Name.Split(',');
+			var filename = frags[0] + ".dll";
+			Assembly a;
+			if (assemblyCache.TryGetValue(filename, out a))
+				return a;
+
+			if (FileSystem.Exists(filename))
+				using (Stream s = FileSystem.Open(filename))
+				{
+					byte[] buf = new byte[s.Length];
+					s.Read(buf, 0, buf.Length);
+					a = Assembly.Load(buf);
+					assemblyCache.Add(filename, a);
+					return a;
+				}
+			
+			return null;
+		}
+	}
+}

OpenRA.FileFormats/Filesystem/D2kSoundResources.cs

@@ -1,102 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public class D2kSoundResources : IFolder
-	{
-		readonly Stream s;
-
-		readonly string filename;
-		readonly List<string> filenames;
-		readonly int priority;
-
-		readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
-
-		public D2kSoundResources(string filename, int priority)
-		{
-			this.filename = filename;
-			this.priority = priority;
-
-			s = FileSystem.Open(filename);
-			s.Seek(0, SeekOrigin.Begin);
-
-			filenames = new List<string>();
-
-			var headerLength = s.ReadUInt32();
-			while (s.Position < headerLength + 4)
-			{
-				var name = s.ReadASCIIZ();
-				var offset = s.ReadUInt32();
-				var length = s.ReadUInt32();
-
-				var hash = PackageEntry.HashFilename(name, PackageHashType.Classic);
-				if (!index.ContainsKey(hash))
-					index.Add(hash, new PackageEntry(hash, offset, length));
-
-				filenames.Add(name);
-			}
-		}
-
-		public Stream GetContent(uint hash)
-		{
-			PackageEntry e;
-			if (!index.TryGetValue(hash, out e))
-				return null;
-
-			s.Seek(e.Offset, SeekOrigin.Begin);
-			var data = new byte[e.Length];
-			s.Read(data, 0, (int)e.Length);
-
-			return new MemoryStream(data);
-		}
-
-		public Stream GetContent(string filename)
-		{
-			return GetContent(PackageEntry.HashFilename(filename, PackageHashType.Classic));
-		}
-
-		public bool Exists(string filename)
-		{
-			return index.ContainsKey(PackageEntry.HashFilename(filename, PackageHashType.Classic));
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			return filenames;
-		}
-
-		public string Name { get { return filename; } }
-
-		public int Priority { get { return 1000 + priority; }}
-
-		public IEnumerable<uint> ClassicHashes()
-		{
-			return index.Keys;
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			yield break;
-		}
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			throw new NotImplementedException("Cannot save Dune 2000 Sound Resources.");
-		}
-	}
-}

OpenRA.FileFormats/Filesystem/FileSystem.cs

@@ -1,212 +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.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace OpenRA.FileFormats
-{
-	public static class FileSystem
-	{
-		public static List<IFolder> MountedFolders = new List<IFolder>();
-		static Cache<uint, List<IFolder>> classicHashIndex = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
-		static Cache<uint, List<IFolder>> crcHashIndex = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
-
-		public static List<string> FolderPaths = new List<string>();
-
-		static void MountInner(IFolder folder)
-		{
-			MountedFolders.Add(folder);
-
-			foreach (var hash in folder.ClassicHashes())
-			{
-				var l = classicHashIndex[hash];
-				if (!l.Contains(folder))
-					l.Add(folder);
-			}
-
-			foreach (var hash in folder.CrcHashes())
-			{
-				var l = crcHashIndex[hash];
-				if (!l.Contains(folder))
-					l.Add(folder);
-			}
-		}
-
-		static int order = 0;
-
-		public static IFolder CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
-		{
-			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-				return new MixFile(filename, order, content);
-			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order, content);
-			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order, content);
-			else if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("Creating .RS archives is unsupported");
-			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("Creating .Z archives is unsupported");
-			else
-				return new Folder(filename, order, content);
-		}
-
-		public static IFolder OpenPackage(string filename, string annotation, int order)
-		{
-			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-			{
-				var type = string.IsNullOrEmpty(annotation) ? PackageHashType.Classic :
-					FieldLoader.GetValue<PackageHashType>("(value)", annotation);
-				return new MixFile(filename, type, order);
-			}
-			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order);
-			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order);
-			else if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
-				return new D2kSoundResources(filename, order);
-			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				return new InstallShieldPackage(filename, order);
-			else
-				return new Folder(filename, order);
-		}
-
-		public static void Mount(string name)
-		{
-			Mount(name, null);
-		}
-
-		public static void Mount(string name, string annotation)
-		{
-			var optional = name.StartsWith("~");
-			if (optional) name = name.Substring(1);
-
-			// paths starting with ^ are relative to the support dir
-			if (name.StartsWith("^"))
-				name = Platform.SupportDir+name.Substring(1);
-
-			FolderPaths.Add(name);
-			Action a = () => FileSystem.MountInner(OpenPackage(name, annotation, order++));
-
-			if (optional)
-				try { a(); }
-				catch { }
-			else
-				a();
-		}
-
-		public static void UnmountAll()
-		{
-			MountedFolders.Clear();
-			FolderPaths.Clear();
-			classicHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
-			crcHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
-		}
-
-		public static bool Unmount(IFolder mount)
-		{
-			return (MountedFolders.RemoveAll(f => f == mount) > 0);
-		}
-
-		public static void Mount(IFolder mount)
-		{
-			if (!MountedFolders.Contains(mount)) MountedFolders.Add(mount);
-		}
-
-		public static void LoadFromManifest(Manifest manifest)
-		{
-			UnmountAll();
-			foreach (var dir in manifest.Folders)
-				Mount(dir);
-
-			foreach (var pkg in manifest.Packages)
-				Mount(pkg.Key, pkg.Value);
-		}
-
-		static Stream GetFromCache(PackageHashType type, string filename)
-		{
-			var index = type == PackageHashType.CRC32 ? crcHashIndex : classicHashIndex;
-			var folder = index[PackageEntry.HashFilename(filename, type)]
-				.Where(x => x.Exists(filename))
-				.OrderBy(x => x.Priority)
-				.FirstOrDefault();
-
-			if (folder != null)
-				return folder.GetContent(filename);
-
-			return null;
-		}
-
-		public static Stream Open(string filename) { return OpenWithExts(filename, ""); }
-
-		public static Stream OpenWithExts(string filename, params string[] exts)
-		{
-			if (filename.IndexOfAny(new char[] { '/', '\\' } ) == -1)
-			{
-				foreach (var ext in exts)
-				{
-					var s = GetFromCache(PackageHashType.Classic, filename + ext);
-					if (s != null)
-						return s;
-
-					s = GetFromCache(PackageHashType.CRC32, filename + ext);
-					if (s != null)
-						return s;
-				}
-			}
-
-			foreach (var ext in exts)
-			{
-				var folder = MountedFolders
-					.Where(x => x.Exists(filename + ext))
-					.OrderByDescending(x => x.Priority)
-					.FirstOrDefault();
-
-				if (folder != null)
-					return folder.GetContent(filename + ext);
-			}
-
-			throw new FileNotFoundException("File not found: {0}".F(filename), filename);
-		}
-
-		public static bool Exists(string filename) { return MountedFolders.Any(f => f.Exists(filename)); }
-
-		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
-
-		public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
-		{
-			foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-				if (assembly.FullName == e.Name)
-					return assembly;
-
-			var frags = e.Name.Split(',');
-			var filename = frags[0] + ".dll";
-
-			Assembly a;
-			if (assemblyCache.TryGetValue(filename, out a))
-				return a;
-
-			if (FileSystem.Exists(filename))
-				using (var s = FileSystem.Open(filename))
-				{
-					var buf = new byte[s.Length];
-					s.Read(buf, 0, buf.Length);
-					a = Assembly.Load(buf);
-					assemblyCache.Add(filename, a);
-					return a;
-				}
-
-			return null;
-		}
-	}
-}

OpenRA.FileFormats/Filesystem/Folder.cs

@@ -1,83 +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;
-
-namespace OpenRA.FileFormats
-{
-	public class Folder : IFolder
-	{
-		readonly string path;
-		readonly int priority;
-
-		// Create a new folder package
-		public Folder(string path, int priority, Dictionary<string, byte[]> contents)
-		{
-			this.path = path;
-			this.priority = priority;
-			if (Directory.Exists(path))
-				Directory.Delete(path, true);
-
-			Write(contents);
-		}
-
-		public Folder(string path, int priority)
-		{
-			this.path = path;
-			this.priority = priority;
-			if (!Directory.Exists(path))
-				Directory.CreateDirectory(path);
-		}
-
-		public Stream GetContent(string filename)
-		{
-			try { return File.OpenRead( Path.Combine( path, filename ) ); }
-			catch { return null; }
-		}
-
-		public IEnumerable<uint> ClassicHashes()
-		{
-			foreach (var filename in Directory.GetFiles(path, "*", SearchOption.TopDirectoryOnly))
-				yield return PackageEntry.HashFilename(Path.GetFileName(filename), PackageHashType.Classic);
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			yield break;
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			foreach (var filename in Directory.GetFiles(path, "*", SearchOption.TopDirectoryOnly))
-				yield return Path.GetFileName(filename);
-		}
-
-		public bool Exists(string filename)
-		{
-			return File.Exists(Path.Combine(path, filename));
-		}
-
-		public int Priority { get { return priority; } }
-		public string Name { get { return path; } }
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			if (!Directory.Exists(path))
-				Directory.CreateDirectory(path);
-
-			foreach (var file in contents)
-				using (var dataStream = File.Create(Path.Combine(path, file.Key)))
-					using (var writer = new BinaryWriter(dataStream))
-					   writer.Write(file.Value);
-		}
-	}
-}

OpenRA.FileFormats/Filesystem/InstallShieldPackage.cs

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

OpenRA.FileFormats/Filesystem/MixFile.cs

@@ -1,274 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	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;
-		readonly long dataStart;
-		readonly Stream s;
-		readonly int priority;
-		readonly string filename;
-		readonly PackageHashType type;
-
-		// Save a mix to disk with the given contents
-		public MixFile(string filename, int priority, Dictionary<string, byte[]> contents)
-		{
-			this.filename = filename;
-			this.priority = priority;
-			this.type = PackageHashType.Classic;
-
-			if (File.Exists(filename))
-				File.Delete(filename);
-
-			s = File.Create(filename);
-			index = new Dictionary<uint, PackageEntry>();
-			contents.Add("local mix database.dat", new XccLocalDatabase(contents.Keys.Append("local mix database.dat")).Data());
-			Write(contents);
-		}
-
-		public MixFile(string filename, PackageHashType type, int priority)
-		{
-			this.filename = filename;
-			this.priority = priority;
-			this.type = type;
-			s = FileSystem.Open(filename);
-
-			// Detect format type
-			s.Seek(0, SeekOrigin.Begin);
-			var isCncMix = s.ReadUInt16() != 0;
-
-			// The C&C mix format doesn't contain any flags or encryption
-			var isEncrypted = false;
-			if (!isCncMix)
-				isEncrypted = (s.ReadUInt16() & 0x2) != 0;
-
-			List<PackageEntry> entries;
-			if (isEncrypted)
-			{
-				long unused;
-				entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out unused);
-			}
-			else
-				entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
-
-			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
-				"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, (isCncMix ? "C&C" : "RA/TS/RA2"), isEncrypted, dataStart),
-			    null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
-			);
-		}
-
-		List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
-		{
-			s.Seek(offset, SeekOrigin.Begin);
-			var numFiles = s.ReadUInt16();
-			/*uint dataSize = */s.ReadUInt32();
-
-			var items = new List<PackageEntry>();
-			for (var i = 0; i < numFiles; i++)
-				items.Add(new PackageEntry(s));
-
-			headerEnd = offset + 6 + numFiles*PackageEntry.Size;
-			return items;
-		}
-
-		MemoryStream DecryptHeader(Stream s, long offset, out long headerEnd)
-		{
-			s.Seek(offset, SeekOrigin.Begin);
-
-			// Decrypt blowfish key
-			var keyblock = s.ReadBytes(80);
-			var blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
-			var fish = new Blowfish(blowfishKey);
-
-			// Decrypt first block to work out the header length
-			var ms = Decrypt(ReadBlocks(s, offset + 80, 1), fish);
-			var numFiles = ms.ReadUInt16();
-
-			// Decrypt the full header - round bytes up to a full block
-			var blockCount = (13 + numFiles*PackageEntry.Size)/8;
-			headerEnd = offset + 80 + blockCount*8;
-
-			return Decrypt(ReadBlocks(s, offset + 80, blockCount), fish);
-		}
-
-		static MemoryStream Decrypt(uint[] h, Blowfish fish)
-		{
-			var decrypted = fish.Decrypt(h);
-
-			var ms = new MemoryStream();
-			var writer = new BinaryWriter(ms);
-			foreach(var t in decrypted)
-				writer.Write(t);
-			writer.Flush();
-
-			ms.Seek(0, SeekOrigin.Begin);
-			return ms;
-		}
-
-		uint[] ReadBlocks(Stream s, long offset, int count)
-		{
-			s.Seek(offset, SeekOrigin.Begin);
-
-			// A block is a single encryption unit (represented as two 32-bit integers)
-			var ret = new uint[2*count];
-			for (var i = 0; i < ret.Length; i++)
-				ret[i] = s.ReadUInt32();
-
-			return ret;
-		}
-
-		uint? FindMatchingHash(string filename)
-		{
-			var hash = PackageEntry.HashFilename(filename, type);
-			if (index.ContainsKey(hash))
-				return hash;
-
-			// Maybe we were given a raw hash?
-			uint raw;
-			if (!uint.TryParse(filename, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out raw))
-			    return null;
-
-			if ("{0:X}".F(raw) == filename && index.ContainsKey(raw))
-				return raw;
-
-			return null;
-		}
-
-		public Stream GetContent(uint hash)
-		{
-			PackageEntry e;
-			if (!index.TryGetValue(hash, out e))
-				return null;
-
-			s.Seek(dataStart + e.Offset, SeekOrigin.Begin);
-			var data = new byte[e.Length];
-			s.Read(data, 0, (int)e.Length);
-			return new MemoryStream(data);
-		}
-
-		public Stream GetContent(string filename)
-		{
-			var hash = FindMatchingHash(filename);
-			return hash.HasValue ? GetContent(hash.Value) : null;
-		}
-
-		static readonly uint[] Nothing = {};
-		public IEnumerable<uint> ClassicHashes()
-		{
-			if (type == PackageHashType.Classic)
-				return index.Keys;
-
-			return Nothing;
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			if (type == PackageHashType.CRC32)
-				return index.Keys;
-
-			return Nothing;
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			var lookup = new Dictionary<uint, string>();
-			if (Exists("local mix database.dat"))
-			{
-				var db = new XccLocalDatabase(GetContent("local mix database.dat"));
-				foreach (var e in db.Entries)
-				{
-					var hash = PackageEntry.HashFilename(e, type);
-					if (!lookup.ContainsKey(hash))
-						lookup.Add(hash, e);
-				}
-			}
-
-			if (FileSystem.Exists("global mix database.dat"))
-			{
-				var db = new XccGlobalDatabase(FileSystem.Open("global mix database.dat"));
-				foreach (var e in db.Entries)
-				{
-					var hash = PackageEntry.HashFilename(e, type);
-					if (!lookup.ContainsKey(hash))
-						lookup.Add(hash, e);
-				}
-			}
-
-			return index.Keys.Select(k => lookup.ContainsKey(k) ? lookup[k] : "{0:X}".F(k));
-		}
-
-		public bool Exists(string filename)
-		{
-			return FindMatchingHash(filename).HasValue;
-		}
-
-		public int Priority { get { return 1000 + priority; } }
-		public string Name { get { return filename; } }
-		
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			// Cannot modify existing mixfile - rename existing file and
-			// create a new one with original content plus modifications
-			FileSystem.Unmount(this);
-
-			// TODO: Add existing data to the contents list
-			if (index.Count > 0)
-				throw new NotImplementedException("Updating mix files unfinished");
-
-			// Construct a list of entries for the file header
-			uint dataSize = 0;
-			var items = new List<PackageEntry>();
-			foreach (var kv in contents)
-			{
-				var length = (uint)kv.Value.Length;
-				var hash = PackageEntry.HashFilename(Path.GetFileName(kv.Key), type);
-				items.Add(new PackageEntry(hash, dataSize, length));
-				dataSize += length;
-			}
-
-			// Write the new file
-			s.Seek(0, SeekOrigin.Begin);
-			using (var writer = new BinaryWriter(s))
-			{
-				// Write file header
-				writer.Write((ushort)items.Count);
-				writer.Write(dataSize);
-				foreach (var item in items)
-					item.Write(writer);
-
-				writer.Flush();
-
-				// Copy file data
-				foreach (var file in contents)
-					s.Write(file.Value);
-			}
-		}
-	}
-}

OpenRA.FileFormats/Filesystem/ZipFile.cs

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

OpenRA.FileFormats/Folder.cs

@@ -0,0 +1,39 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class Folder : IFolder
+	{
+		readonly string path;
+
+		public Folder(string path) { this.path = path; }
+
+		public Stream GetContent(string filename)
+		{
+			try { return File.OpenRead( Path.Combine( path, filename ) ); }
+			catch { return null; }
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
+				yield return PackageEntry.HashFilename( filename );
+		}
+		
+		public bool Exists(string filename)
+		{
+			return File.Exists(Path.Combine(path,filename));
+		}
+	}
+}

OpenRA.FileFormats/Graphics/Dune2ShpReader.cs

@@ -1,144 +1,146 @@
-#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();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections;
+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(BinaryReader reader)
+		{
+			Flags = (Dune2ImageFlags)reader.ReadUInt16();
+			Slices = reader.ReadByte();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadByte();
+			FileSize = reader.ReadUInt16();
+			DataSize = reader.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 ? reader.ReadByte() : (byte)16;
+				LookupTable = new byte[n];
+				for (int i = 0; i < n; i++)
+					LookupTable[i] = reader.ReadByte();
+			}
+			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 stream)
+		{
+			BinaryReader reader = new BinaryReader(stream);
+
+			ImageCount = reader.ReadUInt16();
+			
+			//Last offset is pointer to end of file.
+			uint[] offsets = new uint[ImageCount + 1];
+
+			uint temp = reader.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 ? reader.ReadUInt16() : reader.ReadUInt32()) + 2;
+
+			for (int i = 0; i < ImageCount; i++)
+			{
+				reader.BaseStream.Seek(offsets[i], SeekOrigin.Begin);
+				Dune2ImageHeader header = new Dune2ImageHeader(reader);
+				byte[] imgData = reader.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/HvaReader.cs

@@ -1,57 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-
-#endregion
-
-using System;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public class HvaReader
-	{
-		public readonly uint FrameCount;
-		public readonly uint LimbCount;
-		public readonly float[] Transforms;
-
-		public HvaReader(Stream s)
-		{
-			// Index swaps for transposing a matrix
-			var ids = new byte[]{0,4,8,12,1,5,9,13,2,6,10,14};
-
-			s.Seek(16, SeekOrigin.Begin);
-			FrameCount = s.ReadUInt32();
-			LimbCount = s.ReadUInt32();
-
-			// Skip limb names
-			s.Seek(16*LimbCount, SeekOrigin.Current);
-			Transforms = new float[16*FrameCount*LimbCount];
-			for (var j = 0; j < FrameCount; j++)
-				for (var i = 0; i < LimbCount; i++)
-			{
-				// Convert to column-major matrices and add the final matrix row
-				var c = 16*(LimbCount*j + i);
-				Transforms[c + 3] = 0;
-				Transforms[c + 7] = 0;
-				Transforms[c + 11] = 0;
-				Transforms[c + 15] = 1;
-
-				for (var k = 0; k < 12; k++)
-					Transforms[c + ids[k]] = s.ReadFloat();
-			}
-		}
-
-		public static HvaReader Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return new HvaReader(s);
-		}
-	}
-}

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -1,117 +1,98 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.IO;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	[AttributeUsage( AttributeTargets.Assembly )]
-	public class RendererAttribute : Attribute
-	{
-		public readonly Type Type;
-
-		public RendererAttribute( Type graphicsDeviceType )
-		{
-			if( !typeof( IDeviceFactory ).IsAssignableFrom( graphicsDeviceType ) )
-				throw new InvalidOperationException( "Incorrect type in RendererAttribute" );
-			Type = graphicsDeviceType;
-		}
-	}
-
-	public interface IDeviceFactory
-	{
-		IGraphicsDevice Create( Size size, WindowMode windowMode );
-	}
-
-	public enum BlendMode { None, Alpha, Additive }
-
-	public interface IGraphicsDevice
-	{
-		IVertexBuffer<Vertex> CreateVertexBuffer( int length );
-		ITexture CreateTexture( Bitmap bitmap );
-		ITexture CreateTexture();
-		IFrameBuffer CreateFrameBuffer(Size s);
-		IShader CreateShader( string name );
-
-		Size WindowSize { get; }
-
-		void Clear();
-		void Present();
-		void PumpInput(IInputHandler inputHandler);
-
-		void DrawPrimitives( PrimitiveType type, int firstVertex, int numVertices );
-
-		void SetLineWidth( float width );
-		void EnableScissor( int left, int top, int width, int height );
-		void DisableScissor();
-
-		void EnableDepthBuffer();
-		void DisableDepthBuffer();
-
-		void SetBlendMode(BlendMode mode);
-
-		void Quit();
-	}
-
-	public interface IVertexBuffer<T>
-	{
-		void Bind();
-		void SetData( T[] vertices, int length );
-	}
-
-	public interface IShader
-	{
-		void SetVec(string name, float x);
-		void SetVec(string name, float x, float y);
-		void SetVec(string name, float[] vec, int length);
-		void SetTexture(string param, ITexture texture);
-		void SetMatrix(string param, float[] mtx);
-		void Render(Action a);
-	}
-
-	public interface ITexture
-	{
-		void SetData(Bitmap bitmap);
-		void SetData(uint[,] colors);
-		void SetData(byte[] colors, int width, int height);
-		byte[] GetData();
-		Size Size { get; }
-	}
-
-	public interface IFrameBuffer
-	{
-		void Bind();
-		void Unbind();
-		ITexture Texture { get; }
-	}
-
-	public enum PrimitiveType
-	{
-		PointList,
-		LineList,
-		TriangleList,
-		QuadList,
-	}
-
-	public struct Range<T>
-	{
-		public readonly T Start, End;
-		public Range( T start, T end ) { Start = start; End = end; }
-	}
-
-	public enum WindowMode
-	{
-		Windowed,
-		Fullscreen,
-		PseudoFullscreen,
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	[AttributeUsage( AttributeTargets.Assembly )]
+	public class RendererAttribute : Attribute
+	{
+		public readonly Type Type;
+
+		public RendererAttribute( Type graphicsDeviceType )
+		{
+			if( !typeof( IGraphicsDevice ).IsAssignableFrom( graphicsDeviceType ) )
+				throw new InvalidOperationException( "Incorrect type in RendererAttribute" );
+			Type = graphicsDeviceType;
+		}
+	}
+
+	public interface IGraphicsDevice
+	{
+		IVertexBuffer<Vertex> CreateVertexBuffer( int length );
+		IIndexBuffer CreateIndexBuffer( int length );
+		ITexture CreateTexture( Bitmap bitmap );
+		ITexture CreateTexture();
+		IShader CreateShader( Stream stream );
+
+		Size WindowSize { get; }
+
+		void Begin();
+		void End();
+		void Clear( Color color );
+		void Present();
+
+		void DrawIndexedPrimitives( PrimitiveType type, Range<int> vertexRange, Range<int> indexRange );
+		void DrawIndexedPrimitives( PrimitiveType type, int vertexPool, int numPrimitives );
+
+		void EnableScissor( int left, int top, int width, int height );
+		void DisableScissor();
+	}
+
+	public interface IVertexBuffer<T>
+	{
+		void Bind();
+		void SetData( T[] vertices, int length );
+	}
+
+	public interface IIndexBuffer
+	{
+		void Bind();
+		void SetData( ushort[] indices, int length );
+	}
+
+	public interface IShader
+	{
+		void SetValue( string name, float x, float y );
+		void SetValue( string param, ITexture texture );
+		void Commit();
+		void Render( Action a );
+	}
+
+	public interface ITexture
+	{
+		void SetData(Bitmap bitmap);
+		void SetData(uint[,] colors);
+		void SetData(byte[] colors, int width, int height);
+	}
+
+    public enum PrimitiveType
+    {
+        PointList, 
+        LineList, 
+        TriangleList,
+    }
+
+	public struct Range<T>
+	{
+		public readonly T Start, End;
+		public Range( T start, T end ) { Start = start; End = end; }
+	}
+	
+	public enum WindowMode
+	{
+		Windowed,
+		Fullscreen,
+		PseudoFullscreen,
+	}
+}

OpenRA.FileFormats/Graphics/IInputHandler.cs

@@ -1,74 +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;
-
-namespace OpenRA
-{
-	public interface IInputHandler
-	{
-		void ModifierKeys( Modifiers mods );
-		void OnKeyInput( KeyInput input );
-		void OnMouseInput( MouseInput input );
-	}
-
-	public struct MouseInput
-	{
-		public MouseInputEvent Event;
-		public MouseButton Button;
-		public int2 Location;
-		public Modifiers Modifiers;
-		public int MultiTapCount;
-
-		public MouseInput( MouseInputEvent ev, MouseButton button, int2 location, Modifiers mods, int multiTapCount )
-		{
-			this.Event = ev;
-			this.Button = button;
-			this.Location = location;
-			this.Modifiers = mods;
-			this.MultiTapCount = multiTapCount;
-		}
-	}
-
-	public enum MouseInputEvent { Down, Move, Up };
-
-	[Flags]
-	public enum MouseButton
-	{
-		None = 0,
-		Left = 1,
-		Right = 2,
-		Middle = 4,
-		WheelDown = 8,
-		WheelUp = 16
-	}
-
-	[Flags]
-	public enum Modifiers
-	{
-		None = 0,
-		Shift = 1,
-		Alt = 2,
-		Ctrl = 4,
-		Meta = 8,
-	}
-
-	public enum KeyInputEvent { Down, Up };
-	public struct KeyInput
-	{
-		public KeyInputEvent Event;
-		public Keycode Key;
-		public Modifiers Modifiers;
-		public int MultiTapCount;
-		public char UnicodeChar;
-	}
-}

OpenRA.FileFormats/Graphics/PngLoader.cs

@@ -1,182 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.IO.Compression;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	public static class PngLoader
-	{
-		public static Bitmap Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return Load(s);
-		}
-
-		public static Bitmap Load(Stream s)
-		{
-			using (var br = new BinaryReader(s))
-			{
-				var signature = new byte[] { 137, 80, 78, 71, 13, 10, 26, 10 };
-				foreach (var b in signature)
-					if (br.ReadByte() != b)
-						throw new InvalidDataException("PNG Signature is bogus");
-
-				Bitmap bitmap = null;
-				Color[] palette = null;
-				List<byte> data = new List<byte>();
-
-				for (; ; )
-				{
-					var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
-					var type = Encoding.UTF8.GetString(br.ReadBytes(4));
-					var content = br.ReadBytes(length);
-					/*var crc = */br.ReadInt32();
-
-					using (var ms = new MemoryStream(content))
-					using (var cr = new BinaryReader(ms))
-						switch (type)
-						{
-							case "IHDR":
-								{
-
-									var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-									var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-									var bitDepth = cr.ReadByte();
-									var colorType = (PngColorType)cr.ReadByte();
-									var compression = cr.ReadByte();
-									/*var filter = */cr.ReadByte();
-									var interlace = cr.ReadByte();
-
-									if (compression != 0) throw new InvalidDataException("Compression method not supported");
-									if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
-
-									bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
-
-								}
-								break;
-
-							case "PLTE":
-								{
-									palette = new Color[256];
-									for (var i = 0; i < 256; i++)
-									{
-										var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
-										palette[i] = Color.FromArgb(r, g, b);
-									}
-								}
-								break;
-
-							case "tRNS":
-								{
-									for (var i = 0; i < length; i++)
-										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
-								}
-								break;
-
-							case "IDAT":
-								{
-									data.AddRange(content);
-								}
-								break;
-
-							case "IEND":
-								{
-									var bits = bitmap.LockBits(bitmap.Bounds(),
-										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-									using (var ns = new MemoryStream(data.ToArray()))
-									{
-										// 'zlib' flags bytes; confuses the DeflateStream.
-										/*var flags = (byte)*/ns.ReadByte();
-										/*var moreFlags = (byte)*/ns.ReadByte();
-
-										using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
-										using (var dr = new BinaryReader(ds))
-										{
-											var prevLine = new byte[bitmap.Width];	// all zero
-											for (var y = 0; y < bitmap.Height; y++)
-											{
-												var filter = (PngFilter)dr.ReadByte();
-												var line = dr.ReadBytes(bitmap.Width);
-
-												for (var i = 0; i < bitmap.Width; i++)
-													line[i] = i > 0
-														? UnapplyFilter(filter, line[i], line[i - 1], prevLine[i], prevLine[i - 1])
-														: UnapplyFilter(filter, line[i], 0, prevLine[i], 0);
-
-												Marshal.Copy(line, 0, new IntPtr(bits.Scan0.ToInt64() + y * bits.Stride), line.Length);
-												prevLine = line;
-											}
-										}
-									}
-
-									bitmap.UnlockBits(bits);
-
-									using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-									{
-										var cp = temp.Palette;
-										for (var i = 0; i < 256; i++)
-											cp.Entries[i] = palette[i];		// finalize the palette.
-										bitmap.Palette = cp;
-										return bitmap;
-									}
-								}
-						}
-				}
-			}
-		}
-
-		static byte UnapplyFilter(PngFilter f, byte x, byte a, byte b, byte c)
-		{
-			switch (f)
-			{
-				case PngFilter.None: return x;
-				case PngFilter.Sub: return (byte)(x + a);
-				case PngFilter.Up: return (byte)(x + b);
-				case PngFilter.Average: return (byte)(x + (a + b) / 2);
-				case PngFilter.Paeth: return (byte)(x + Paeth(a, b, c));
-				default:
-					throw new InvalidOperationException("Unsupported Filter");
-			}
-		}
-
-		static byte Paeth(byte a, byte b, byte c)
-		{
-			var p = a + b - c;
-			var pa = Math.Abs(p - a);
-			var pb = Math.Abs(p - b);
-			var pc = Math.Abs(p - c);
-
-			return (pa <= pb && pa <= pc) ? a :
-				(pb <= pc) ? b : c;
-		}
-
-		[Flags]
-		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 };
-		enum PngFilter { None, Sub, Up, Average, Paeth };
-
-		static PixelFormat MakePixelFormat(byte bitDepth, PngColorType colorType)
-		{
-			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
-				return PixelFormat.Format8bppIndexed;
-
-			throw new InvalidDataException("Unknown pixelformat");
-		}
-	}
-}

OpenRA.FileFormats/Graphics/R8Reader.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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public class R8Image
-	{
-		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 R8Image(Stream s)
-		{
-			// Scan forward until we find some data
-			var type = s.ReadUInt8();
-			while (type == 0)
-				type = s.ReadUInt8();
-
-			var width = s.ReadInt32();
-			var height = s.ReadInt32();
-			var x = s.ReadInt32();
-			var y = s.ReadInt32();
-
-			Size = new Size(width, height);
-			Offset = new int2(width/2 - x, height/2 - y);
-
-			/*var imageOffset = */s.ReadInt32();
-			var paletteOffset = s.ReadInt32();
-			var bpp = s.ReadUInt8();
-			if (bpp != 8)
-				throw new InvalidDataException("Error: {0} bits per pixel are not supported.".F(bpp));
-
-			var frameHeight = s.ReadUInt8();
-			var frameWidth = s.ReadUInt8();
-			FrameSize = new Size(frameWidth, frameHeight);
-
-			// Skip alignment byte
-			s.ReadUInt8();
-
-			// Ignore palette header
-			if (type == 1 && paletteOffset != 0)
-				s.Seek(8, SeekOrigin.Current);
-
-			Image = s.ReadBytes(width*height);
-
-			// Ignore palette data
-			if (type == 1 && paletteOffset != 0)
-				s.Seek(512, SeekOrigin.Current);
-		}
-	}
-
-	public class R8Reader : IEnumerable<R8Image>
-	{
-		readonly List<R8Image> headers = new List<R8Image>();
-
-		public readonly int Frames;
-		public R8Reader(Stream stream)
-		{
-			while (stream.Position < stream.Length)
-			{
-				headers.Add(new R8Image(stream));
-				Frames++;
-			}
-		}
-
-		public R8Image this[int index]
-		{
-			get { return headers[index]; }
-		}
-
-		public IEnumerator<R8Image> GetEnumerator()
-		{
-			return headers.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-	}
-}

OpenRA.FileFormats/Graphics/ShpReader.cs

@@ -1,167 +1,167 @@
-#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);
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+
+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( BinaryReader reader )
+		{
+			Offset = reader.ReadUInt32();
+			Format = (Format)( Offset >> 24 );
+			Offset &= 0xFFFFFF;
+
+			RefOffset = reader.ReadUInt16();
+			RefFormat = (Format)reader.ReadUInt16();
+		}
+	}
+
+	public enum Format
+	{
+		Format20 = 0x20,
+		Format40 = 0x40,
+		Format80 = 0x80,
+	}
+
+	public class ShpReader : IEnumerable<ImageHeader>
+	{
+		public readonly int ImageCount;
+		public readonly ushort Width;
+		public readonly ushort Height;
+
+		public Size Size { get { return new Size(Width, Height); } }
+
+		private readonly List<ImageHeader> headers = new List<ImageHeader>();
+
+		int recurseDepth = 0;
+
+		public ShpReader( Stream stream )
+		{
+			BinaryReader 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
+
+			Dictionary<uint, ImageHeader> offsets = new Dictionary<uint, ImageHeader>();
+			foreach( ImageHeader h in headers )
+				offsets.Add( h.Offset, h );
+
+			for( int i = 0 ; i < ImageCount ; i++ )
+			{
+				ImageHeader 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( string.Format( "Reference doesnt point to image data {0}->{1}", 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:
+					{
+						byte[] 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;
+			// Actually, far too big. There's no length field with the correct length though :(
+			int compressedLength = (int)( stream.Length - stream.Position );
+
+			byte[] compressedBytes = new byte[ compressedLength ];
+			stream.Read( compressedBytes, 0, compressedLength );
+
+			//MemoryStream ms = new MemoryStream( compressedBytes );
+			return compressedBytes;
+		}
+
+		private byte[] CopyImageData( byte[] baseImage )
+		{
+			byte[] imageData = new byte[ Width * Height ];
+			for( int i = 0 ; i < Width * Height ; i++ )
+				imageData[ i ] = baseImage[ i ];
+
+			return imageData;
+		}
+
+		public IEnumerator<ImageHeader> GetEnumerator()
+		{
+			return headers.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}

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/Graphics/Vertex.cs

@@ -1,35 +1,28 @@
-#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.Runtime.InteropServices;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	[StructLayout(LayoutKind.Sequential)]
-	public struct Vertex
-	{
-		public float x, y, z, u, v;
-		public float p, c;
-
-		public Vertex(float2 xy, float2 uv, float2 pc)
-		{
-			this.x = xy.X; this.y = xy.Y; this.z = 0;
-			this.u = uv.X; this.v = uv.Y;
-			this.p = pc.X; this.c = pc.Y;
-		}
-
-		public Vertex(float[] xyz, float2 uv, float2 pc)
-		{
-			this.x = xyz[0]; this.y = xyz[1]; this.z = xyz[2];
-			this.u = uv.X; this.v = uv.Y;
-			this.p = pc.X; this.c = pc.Y;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Runtime.InteropServices;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	[StructLayout(LayoutKind.Sequential)]
+	public struct Vertex
+	{
+		public float x, y, z, u, v;
+		public float p, c;
+
+		public Vertex(float2 xy, float2 uv, float2 pc)
+		{
+			this.x = xy.X; this.y = xy.Y; this.z = 0;
+			this.u = uv.X; this.v = uv.Y;
+			this.p = pc.X; this.c = pc.Y;
+		}
+	}
+}

OpenRA.FileFormats/Graphics/VqaReader.cs

@@ -1,16 +1,16 @@
 #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
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * see LICENSE.
  */
-#endregion
-
-using System;
-using System.IO;
-
+#endregion
+
+using System;
+using System.IO;
+
 namespace OpenRA.FileFormats
 {
 	public class VqaReader
@@ -19,7 +19,7 @@ namespace OpenRA.FileFormats
 		public readonly byte Framerate;
 		public readonly ushort Width;
 		public readonly ushort Height;
-
+		
 		Stream stream;
 		int currentFrame;
 		ushort numColors;
@@ -32,189 +32,191 @@ namespace OpenRA.FileFormats
 
 		// Stores a list of subpixels, referenced by the VPTZ chunk
 		byte[] cbf;
-		byte[] cbp;
+		byte[] cbp;			
 		int cbChunk = 0;
 		int cbOffset = 0;
-
+		
 		// Top half contains block info, bottom half contains references to cbf array
 		byte[] origData;
-
+		
 		// Final frame output
-		uint[,] frameData;
-		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
-
-		public byte[] AudioData { get { return audioData; } }
+		uint[,] frameData;
+		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
+
+		public byte[] AudioData { get { return audioData; } }
 		public int CurrentFrame { get { return currentFrame; } }
-
-		public VqaReader(Stream stream)
+		
+		public VqaReader( Stream stream )
 		{
 			this.stream = stream;
-
+			BinaryReader reader = new BinaryReader( stream );
+			
 			// Decode FORM chunk
-			if (stream.ReadASCII(4) != "FORM")
+			if (new String(reader.ReadChars(4)) != "FORM")
 				throw new InvalidDataException("Invalid vqa (invalid FORM section)");
-			/*var length = */ stream.ReadUInt32();
-
-			if (stream.ReadASCII(8) != "WVQAVQHD")
+			/*var length = */ reader.ReadUInt32();
+			
+			if (new String(reader.ReadChars(8)) != "WVQAVQHD")
 				throw new InvalidDataException("Invalid vqa (not WVQAVQHD)");
-			/* var length = */stream.ReadUInt32();
-
-			/*var version = */stream.ReadUInt16();
-			/*var flags = */stream.ReadUInt16();
-			Frames = stream.ReadUInt16();
-			Width = stream.ReadUInt16();
-			Height = stream.ReadUInt16();
-
-			blockWidth = stream.ReadUInt8();
-			blockHeight = stream.ReadUInt8();
-			Framerate = stream.ReadUInt8();
-			cbParts = stream.ReadUInt8();
+			/* var length = */reader.ReadUInt32();
+			
+			/*var version = */reader.ReadUInt16();
+			/*var flags = */reader.ReadUInt16();
+			Frames = reader.ReadUInt16();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadUInt16();
+			
+			blockWidth = reader.ReadByte();
+			blockHeight = reader.ReadByte();
+			Framerate = reader.ReadByte();
+			cbParts = reader.ReadByte();
 			blocks = new int2(Width / blockWidth, Height / blockHeight);
-
-			numColors = stream.ReadUInt16();
-			/*var maxBlocks = */stream.ReadUInt16();
-			/*var unknown1 = */stream.ReadUInt16();
-			/*var unknown2 = */stream.ReadUInt32();
-
+			
+			numColors = reader.ReadUInt16();
+			/*var maxBlocks = */reader.ReadUInt16();
+			/*var unknown1 = */reader.ReadUInt16();
+			/*var unknown2 = */reader.ReadUInt32();
+			
 			// Audio
-			/*var freq = */stream.ReadUInt16();
-			/*var channels = */stream.ReadByte();
-			/*var bits = */stream.ReadByte();
-			/*var unknown3 = */stream.ReadBytes(14);
-
-			var frameSize = Exts.NextPowerOf2(Math.Max(Width, Height));
+			/*var freq = */reader.ReadUInt16();
+			/*var channels = */reader.ReadByte();
+			/*var bits = */reader.ReadByte();
+			/*var unknown3 = */reader.ReadChars(14);
+			
+			
+			var frameSize = NextPowerOf2(Math.Max(Width,Height));
 			cbf = new byte[Width*Height];
 			cbp = new byte[Width*Height];
 			palette = new uint[numColors];
 			origData = new byte[2*blocks.X*blocks.Y];
-			frameData = new uint[frameSize, frameSize];
-
-			var type = stream.ReadASCII(4);
+			frameData = new uint[frameSize,frameSize];
+			
+			var type = new String(reader.ReadChars(4));
 			if (type != "FINF")
 			{
-				stream.Seek(27, SeekOrigin.Current);
-				type = stream.ReadASCII(4);
+				reader.ReadBytes(27);
+				type = new String(reader.ReadChars(4));
 			}
-
-			/*var length = */stream.ReadUInt16();
-			/*var unknown4 = */stream.ReadUInt16();
-
+			
+			/*var length = */reader.ReadUInt16();
+			/*var unknown4 = */reader.ReadUInt16();
+			
 			// Frame offsets
 			offsets = new UInt32[Frames];
 			for (int i = 0; i < Frames; i++)
 			{
-				offsets[i] = stream.ReadUInt32();
-				if (offsets[i] > 0x40000000)
-					offsets[i] -= 0x40000000;
+				offsets[i] = reader.ReadUInt32();
+				if (offsets[i] > 0x40000000) offsets[i] -= 0x40000000;
 				offsets[i] <<= 1;
-			}
-
+			}
+
 			CollectAudioData();
-
+			
 			Reset();
-		}
+		}
 
 		public void Reset()
 		{
 			currentFrame = cbOffset = cbChunk = 0;
 			LoadFrame();
 		}
+		
+		void CollectAudioData()
+		{
+			var ms = new MemoryStream();
+			var adpcmIndex = 0;
 
-		void CollectAudioData()
-		{
-			var ms = new MemoryStream();
-			var adpcmIndex = 0;
-
-			bool compressed = false;
-			for (var i = 0; i < Frames; i++)
-			{
-				stream.Seek(offsets[i], SeekOrigin.Begin);
-				var end = (i < Frames - 1) ? offsets[i + 1] : stream.Length;
-
-				while (stream.Position < end)
-				{
-					var type = stream.ReadASCII(4);
-					var length = int2.Swap(stream.ReadUInt32());
-
-					switch (type)
-					{
+			bool compressed = false;
+			for (var i = 0; i < Frames; i++)
+			{
+				stream.Seek(offsets[i], SeekOrigin.Begin);
+				BinaryReader reader = new BinaryReader(stream);
+				var end = (i < Frames - 1) ? offsets[i + 1] : stream.Length;
+
+				while (reader.BaseStream.Position < end)
+				{
+					var type = new String(reader.ReadChars(4));
+					var length = int2.Swap(reader.ReadUInt32());
+
+					switch (type)
+					{
 						case "SND0":
 						case "SND2":
-							var rawAudio = stream.ReadBytes((int)length);
+							var rawAudio = reader.ReadBytes((int)length);
 							ms.Write(rawAudio);
 							compressed = (type == "SND2");
-							break;
-						default:
-							stream.ReadBytes((int)length);
-							break;
-					}
-
-					// Chunks are aligned on even bytes; advance by a byte if the next one is null
-					if (stream.Peek() == 0) stream.ReadByte();
-				}
-			}
-
-			audioData = (compressed) ? AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex) : ms.ToArray();
-		}
+							break;
+						default:
+							reader.ReadBytes((int)length);
+							break;
+					}
+
+					if (reader.PeekChar() == 0) reader.ReadByte();
+				}
+			}
+
+			audioData = (compressed) ? AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex) : ms.ToArray();
+		}
 
 		public void AdvanceFrame()
 		{
 			currentFrame++;
 			LoadFrame();
 		}
-
+		
 		void LoadFrame()
-		{
+		{			
 			if (currentFrame >= Frames)
 				return;
-
+			
 			// Seek to the start of the frame
 			stream.Seek(offsets[currentFrame], SeekOrigin.Begin);
+			BinaryReader reader = new BinaryReader(stream);
 			var end = (currentFrame < Frames - 1) ? offsets[currentFrame+1] : stream.Length;
-
-			while (stream.Position < end)
+	
+			while(reader.BaseStream.Position < end)
 			{
-				var type = stream.ReadASCII(4);
-				var length = int2.Swap(stream.ReadUInt32());
+				var type = new String(reader.ReadChars(4));
+				var length = int2.Swap(reader.ReadUInt32());
 
 				switch(type)
-				{
+				{
 					case "VQFR":
-						DecodeVQFR(stream);
+						DecodeVQFR(reader);
 					break;
 					default:
 						// Don't parse sound here.
-						stream.ReadBytes((int)length);
+						reader.ReadBytes((int)length);
 						break;
 				}
-
+				
 				// Chunks are aligned on even bytes; advance by a byte if the next one is null
-				if (stream.Peek() == 0) stream.ReadByte();
+				if (reader.PeekChar() == 0) reader.ReadByte();
 			}
 		}
-
+		
 		// VQA Frame
-		public void DecodeVQFR(Stream s)
-		{
-			while (true)
-			{
+		public void DecodeVQFR(BinaryReader reader)
+		{			
+			while(true)
+			{				
 				// Chunks are aligned on even bytes; may be padded with a single null
-				if (s.Peek() == 0) s.ReadByte();
-				var type = s.ReadASCII(4);
-				int subchunkLength = (int)int2.Swap(s.ReadUInt32());
+				if (reader.PeekChar() == 0) reader.ReadByte();
+				var type = new String(reader.ReadChars(4));
+				int subchunkLength = (int)int2.Swap(reader.ReadUInt32());
 
 				switch(type)
 				{
 					// Full frame-modifier
 					case "CBFZ":
-						Format80.DecodeInto(s.ReadBytes(subchunkLength), cbf);
+						Format80.DecodeInto( reader.ReadBytes(subchunkLength), cbf );
 					break;
 					case "CBF0":
-						cbf = s.ReadBytes(subchunkLength);
+						cbf = reader.ReadBytes(subchunkLength);
 					break;
-
+					
 					// frame-modifier chunk
-					case "CBP0":
+					case "CBP0":	
 					case "CBPZ":
 						// Partial buffer is full; dump and recreate
 						if (cbChunk == cbParts)
@@ -222,31 +224,31 @@ namespace OpenRA.FileFormats
 							if (type == "CBP0")
 								cbf = (byte[])cbp.Clone();
 							else
-								Format80.DecodeInto(cbp, cbf);
-
+								Format80.DecodeInto( cbp, cbf );
+							
 							cbOffset = cbChunk = 0;
 						}
-
-						var bytes = s.ReadBytes(subchunkLength);
+						
+						var bytes = reader.ReadBytes(subchunkLength);
 						bytes.CopyTo(cbp,cbOffset);
 						cbOffset += subchunkLength;
 						cbChunk++;
 					break;
-
+					
 					// Palette
 					case "CPL0":
 						for (int i = 0; i < numColors; i++)
 						{
-							byte r = (byte)(s.ReadUInt8() << 2);
-							byte g = (byte)(s.ReadUInt8() << 2);
-							byte b = (byte)(s.ReadUInt8() << 2);
+							byte r = (byte)(reader.ReadByte() << 2);
+							byte g = (byte)(reader.ReadByte() << 2);
+							byte b = (byte)(reader.ReadByte() << 2);
 							palette[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 						}
 					break;
-
+					
 					// Frame data
 					case "VPTZ":
-						Format80.DecodeInto(s.ReadBytes(subchunkLength), origData);
+						Format80.DecodeInto( reader.ReadBytes(subchunkLength), origData );
 						// This is the last subchunk
 						return;
 					default:
@@ -254,36 +256,39 @@ namespace OpenRA.FileFormats
 				}
 			}
 		}
-
+		
 		int cachedFrame = -1;
-
-		void DecodeFrameData( int frame )
+		public uint[,] FrameData	{ get
 		{
-			cachedFrame = currentFrame;
-			for (var y = 0; y < blocks.Y; y++)
-				for (var x = 0; x < blocks.X; x++)
-				{
-					var px = origData[x + y*blocks.X];
-					var mod = origData[x + (y + blocks.Y)*blocks.X];
-					for (var j = 0; j < blockHeight; j++)
-						for (var i = 0; i < blockWidth; i++)
-						{
-							var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
-							byte color = (mod == 0x0f) ? px : cbf[cbfi];
-							frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
-						}
-				}
-		}
-
-		public uint[,] FrameData
-		{
-			get
+			if (cachedFrame != currentFrame)
 			{
-				if (cachedFrame != currentFrame)
-					DecodeFrameData(currentFrame);
-
-				return frameData;
+				cachedFrame = currentFrame;
+				for (var y = 0; y < blocks.Y; y++)
+					for (var x = 0; x < blocks.X; x++)
+					{
+						var px = origData[x + y*blocks.X];
+						var mod = origData[x + (y + blocks.Y)*blocks.X];
+						for (var j = 0; j < blockHeight; j++)
+							for (var i = 0; i < blockWidth; i++)
+							{
+								var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
+								byte color = (mod == 0x0f) ? px : cbf[cbfi];
+								frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
+							}
+					}
 			}
+			return frameData;
+		}}
+		
+		int NextPowerOf2(int v)
+		{
+			--v;
+			v |= v >> 1;
+			v |= v >> 2;
+			v |= v >> 4;
+			v |= v >> 8;
+			++v;
+			return v;
 		}
 	}
 }

OpenRA.FileFormats/Graphics/VxlReader.cs

@@ -1,158 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public enum NormalType { TiberianSun = 2, RedAlert2 = 4 }
-	public class VxlElement
-	{
-		public byte Color;
-		public byte Normal;
-	}
-
-	public class VxlLimb
-	{
-		public string Name;
-		public float Scale;
-		public float[] Bounds;
-		public byte[] Size;
-		public NormalType Type;
-
-		public uint VoxelCount;
-		public Dictionary<byte, VxlElement>[,] VoxelMap;
-	}
-
-	public class VxlReader
-	{
-		public readonly uint LimbCount;
-		public VxlLimb[] Limbs;
-
-		uint BodySize;
-
-		void ReadVoxelData(Stream s, VxlLimb l)
-		{
-			var baseSize = l.Size[0]*l.Size[1];
-			var colStart = new int[baseSize];
-			for (var i = 0; i < baseSize; i++)
-				colStart[i] = s.ReadInt32();
-			s.Seek(4*baseSize, SeekOrigin.Current);
-			var dataStart = s.Position;
-
-			// Count the voxels in this limb
-			l.VoxelCount = 0;
-			for (var i = 0; i < baseSize; i++)
-			{
-				// Empty column
-				if (colStart[i] == -1)
-					continue;
-
-				s.Seek(dataStart + colStart[i], SeekOrigin.Begin);
-				var z = 0;
-				do
-				{
-					z += s.ReadUInt8();
-					var count = s.ReadUInt8();
-					z += count;
-					l.VoxelCount += count;
-					s.Seek(2*count + 1, SeekOrigin.Current);
-				} while (z < l.Size[2]);
-			}
-
-			// Read the data
-			l.VoxelMap = new Dictionary<byte, VxlElement>[l.Size[0],l.Size[1]];
-			for (var i = 0; i < baseSize; i++)
-			{
-				// Empty column
-				if (colStart[i] == -1)
-					continue;
-
-				s.Seek(dataStart + colStart[i], SeekOrigin.Begin);
-
-				byte x = (byte)(i % l.Size[0]);
-				byte y = (byte)(i / l.Size[0]);
-				byte z = 0;
-				l.VoxelMap[x,y] = new Dictionary<byte, VxlElement>();
-				do
-				{
-					z += s.ReadUInt8();
-					var count = s.ReadUInt8();
-					for (var j = 0; j < count; j++)
-					{
-						var v = new VxlElement();
-						v.Color = s.ReadUInt8();
-						v.Normal = s.ReadUInt8();
-
-						l.VoxelMap[x,y].Add(z, v);
-						z++;
-					}
-					// Skip duplicate count
-					s.ReadUInt8();
-				} while (z < l.Size[2]);
-			}
-		}
-
-		public VxlReader(Stream s)
-		{
-
-			if (!s.ReadASCII(16).StartsWith("Voxel Animation"))
-				throw new InvalidDataException("Invalid vxl header");
-
-			s.ReadUInt32();
-			LimbCount = s.ReadUInt32();
-			s.ReadUInt32();
-			BodySize = s.ReadUInt32();
-			s.Seek(770, SeekOrigin.Current);
-
-			// Read Limb headers
-			Limbs = new VxlLimb[LimbCount];
-			for (var i = 0; i < LimbCount; i++)
-			{
-				Limbs[i] = new VxlLimb();
-				Limbs[i].Name = s.ReadASCII(16);
-				s.Seek(12, SeekOrigin.Current);
-			}
-
-			// Skip to the Limb footers
-			s.Seek(802 + 28*LimbCount + BodySize, SeekOrigin.Begin);
-
-			var LimbDataOffset = new uint[LimbCount];
-			for (var i = 0; i < LimbCount; i++)
-			{
-				LimbDataOffset[i] = s.ReadUInt32();
-				s.Seek(8, SeekOrigin.Current);
-				Limbs[i].Scale = s.ReadFloat();
-				s.Seek(48, SeekOrigin.Current);
-
-				Limbs[i].Bounds = new float[6];
-				for (var j = 0; j < 6; j++)
-					Limbs[i].Bounds[j] = s.ReadFloat();
-				Limbs[i].Size = s.ReadBytes(3);
-				Limbs[i].Type = (NormalType)s.ReadByte();
-			}
-
-			for (var i = 0; i < LimbCount; i++)
-			{
-				s.Seek(802 + 28*LimbCount + LimbDataOffset[i], SeekOrigin.Begin);
-				ReadVoxelData(s, Limbs[i]);
-			}
-		}
-
-		public static VxlReader Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return new VxlReader(s);
-		}
-	}
-}

OpenRA.FileFormats/HSLColor.cs

@@ -1,105 +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.Drawing;
-
-namespace OpenRA.FileFormats
-{
-	public struct HSLColor
-	{
-		public readonly byte H;
-		public readonly byte S;
-		public readonly byte L;
-		public readonly Color RGB;
-
-		public static HSLColor FromHSV(float h, float s, float v)
-		{
-			var ll = 0.5f * (2 - s) * v;
-			var ss = (ll >= 1 || v <= 0) ? 0 : 0.5f * s * v / (ll <= 0.5f ? ll : 1 - ll);
-			return new HSLColor((byte)(255 * h), (byte)(255 * ss), (byte)(255 * ll));
-		}
-
-		public static HSLColor FromRGB(int r, int g, int b)
-		{
-			var c = Color.FromArgb(r, g, b);
-			var h = (byte)((c.GetHue() / 360.0f) * 255);
-			var s = (byte)(c.GetSaturation() * 255);
-			var l = (byte)(c.GetBrightness() * 255);
-			return new HSLColor(h, s, l);
-		}
-
-		public static Color RGBFromHSL(float h, float s, float l)
-		{
-			// Convert from HSL to RGB
-			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
-			var p = 2 * l - q;
-
-			float[] trgb = { h + 1 / 3.0f, h, h - 1 / 3.0f };
-			float[] rgb = { 0, 0, 0 };
-
-			for (int k = 0; k < 3; k++)
-			{
-				while (trgb[k] < 0) trgb[k] += 1.0f;
-				while (trgb[k] > 1) trgb[k] -= 1.0f;
-			}
-
-			for (int k = 0; k < 3; k++)
-			{
-				if (trgb[k] < 1 / 6.0f) { rgb[k] = p + ((q - p) * 6 * trgb[k]); }
-				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
-				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = p + ((q - p) * 6 * (2.0f / 3 - trgb[k])); }
-				else { rgb[k] = p; }
-			}
-
-			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
-		}
-
-		public static bool operator ==(HSLColor me, HSLColor other)
-		{
-			return me.H == other.H && me.S == other.S && me.L == other.L;
-		}
-
-		public static bool operator !=(HSLColor me, HSLColor other) { return !(me == other); }
-
-		public HSLColor(byte h, byte s, byte l)
-		{
-			H = h;
-			S = s;
-			L = l;
-			RGB = RGBFromHSL(H / 255f, S / 255f, L / 255f);
-		}
-
-		public void ToHSV(out float h, out float s, out float v)
-		{
-			var ll = 2 * L / 255f;
-			var ss = S / 255f * ((ll <= 1) ? ll : 2 - ll);
-
-			h = H / 255f;
-			s = (2 * ss) / (ll + ss);
-			v = (ll + ss) / 2;
-		}
-
-		public override string ToString()
-		{
-			return "{0},{1},{2}".F(H, S, L);
-		}
-
-		public override int GetHashCode() { return H.GetHashCode() ^ S.GetHashCode() ^ L.GetHashCode(); }
-
-		public override bool Equals(object obj)
-		{
-			if (obj == null)
-				return false;
-
-			HSLColor o = (HSLColor)obj;
-			return o == this;
-		}
-	}
-}

OpenRA.FileFormats/Hotkey.cs

@@ -1,119 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.FileFormats;
-
-namespace OpenRA
-{
-	public struct Hotkey
-	{
-		public static Hotkey Invalid = new Hotkey(Keycode.UNKNOWN, Modifiers.None);
-
-		public readonly Keycode Key;
-		public readonly Modifiers Modifiers;
-
-		public static bool TryParse(string s, out Hotkey result)
-		{
-			result = Invalid;
-
-			var parts = s.Split(' ');
-			if (parts.Length >= 2)
-			{
-				if (!Enum.GetNames(typeof(Keycode)).Contains(parts[0]))
-					return false;
-
-				var modString = s.Substring(s.IndexOf(' '));
-				var modParts = modString.Split(',').Select(x => x.Trim());
-				if (modParts.Any(p => !Enum.GetNames(typeof(Modifiers)).Contains(p)))
-					return false;
-
-				var key = (Keycode)Enum.Parse(typeof(Keycode), parts[0]);
-				var mods = (Modifiers)Enum.Parse(typeof(Modifiers), modString);
-
-				result = new Hotkey(key, mods);
-				return true;
-			}
-
-			if (parts.Length == 1)
-			{
-				// HACK: Try parsing as a legacy key name
-				// This is a stop-gap solution to keep backwards
-				// compatibility while outside code is converted
-				var i = 0;
-				for (; i < (int)Keycode.LAST; i++)
-					if (KeycodeExts.DisplayString((Keycode)i) == parts[0])
-						break;
-
-				if (i < (int)Keycode.LAST)
-				{
-					result = new Hotkey((Keycode)i, Modifiers.None);
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		public static Hotkey FromKeyInput(KeyInput ki)
-		{
-			return new Hotkey(ki.Key, ki.Modifiers);
-		}
-
-		public Hotkey(Keycode virtKey, Modifiers mod)
-		{
-			Key = virtKey;
-			Modifiers = mod;
-		}
-
-		public static bool operator !=(Hotkey a, Hotkey b) { return !(a == b); }
-		public static bool operator ==(Hotkey a, Hotkey b)
-		{
-			// Unknown keys are never equal
-			if (a.Key == Keycode.UNKNOWN)
-				return false;
-
-			return a.Key == b.Key && a.Modifiers == b.Modifiers;
-		}
-
-		public override int GetHashCode() { return Key.GetHashCode() ^ Modifiers.GetHashCode(); }
-
-		public override bool Equals(object obj)
-		{
-			if (obj == null)
-				return false;
-
-			return (Hotkey)obj == this;
-		}
-
-		public override string ToString() { return "{0} {1}".F(Key, Modifiers.ToString("F")); }
-
-		public string DisplayString()
-		{
-			var ret = KeycodeExts.DisplayString(Key).ToUpper();
-
-			if (Modifiers.HasModifier(Modifiers.Shift))
-				ret = "Shift + " + ret;
-
-			if (Modifiers.HasModifier(Modifiers.Alt))
-				ret = "Alt + " + ret;
-
-			if (Modifiers.HasModifier(Modifiers.Ctrl))
-				ret = "Ctrl + " + ret;
-
-			if (Modifiers.HasModifier(Modifiers.Meta))
-				ret = (Platform.CurrentPlatform == PlatformType.OSX ? "Cmd + " : "Meta + ") + ret;
-
-			return ret;
-		}
-	}
-}

OpenRA.FileFormats/InstallUtils.cs

@@ -1,135 +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.IO;
-using System.Linq;
-using ICSharpCode.SharpZipLib;
-using ICSharpCode.SharpZipLib.Zip;
-
-namespace OpenRA.FileFormats
-{
-	public static class InstallUtils
-	{
-		static IEnumerable<ZipEntry> GetEntries(this ZipInputStream z)
-		{
-			for (;;)
-			{
-				var e = z.GetNextEntry();
-				if (e != null) yield return e; else break;
-			}
-		}
-
-		public static string GetMountedDisk(Func<string, bool> isValidDisk)
-		{
-			var volumes = DriveInfo.GetDrives()
-				.Where(v => v.DriveType == DriveType.CDRom && v.IsReady)
-				.Select(v => v.RootDirectory.FullName);
-
-			return volumes.FirstOrDefault(v => isValidDisk(v));
-		}
-
-		// TODO: The package should be mounted into its own context to avoid name collisions with installed files
-		public static bool ExtractFromPackage(string srcPath, string package, string[] files, string destPath, Action<string> onProgress, Action<string> onError)
-		{
-			if (!Directory.Exists(destPath))
-				Directory.CreateDirectory(destPath);
-
-			if (!Directory.Exists(srcPath)) { onError("Cannot find " + package); return false; }
-			FileSystem.Mount(srcPath);
-			if (!FileSystem.Exists(package)) { onError("Cannot find " + package); return false; }
-			FileSystem.Mount(package);
-
-			foreach (string s in files)
-			{
-				var destFile = Path.Combine(destPath, s);
-				using (var sourceStream = FileSystem.Open(s))
-				using (var destStream = File.Create(destFile))
-				{
-					onProgress("Extracting " + s);
-					destStream.Write(sourceStream.ReadAllBytes());
-				}
-			}
-
-			return true;
-		}
-
-		public static bool CopyFiles(string srcPath, string[] files, string destPath, Action<string> onProgress, Action<string> onError)
-		{
-			foreach (var file in files)
-			{
-				var fromPath = Path.Combine(srcPath, file);
-				if (!File.Exists(fromPath))
-				{
-					onError("Cannot find " + file);
-					return false;
-				}
-
-				var destFile = Path.GetFileName(file).ToLowerInvariant();
-				onProgress("Extracting " + destFile);
-				File.Copy(fromPath,	Path.Combine(destPath, destFile), true);
-			}
-
-			return true;
-		}
-
-		public static bool ExtractZip(string zipFile, string dest, Action<string> onProgress, Action<string> onError)
-		{
-			if (!File.Exists(zipFile))
-			{
-				onError("Invalid path: " + zipFile);
-				return false;
-			}
-
-			List<string> extracted = new List<string>();
-			try
-			{
-				var z = new ZipInputStream(File.OpenRead(zipFile));
-				z.ExtractZip(dest, extracted, s => onProgress("Extracting " + s));
-			}
-			catch (SharpZipBaseException)
-			{
-				foreach (var f in extracted)
-					File.Delete(f);
-
-				onError("Invalid archive");
-				return false;
-			}
-
-			return true;
-		}
-
-		// TODO: this belongs in FileSystem/ZipFile
-		static void ExtractZip(this ZipInputStream z, string destPath, List<string> extracted, Action<string> onProgress)
-		{
-			foreach (var entry in z.GetEntries())
-			{
-				if (!entry.IsFile) continue;
-
-				onProgress(entry.Name);
-
-				Directory.CreateDirectory(Path.Combine(destPath, Path.GetDirectoryName(entry.Name)));
-				var path = Path.Combine(destPath, entry.Name);
-				extracted.Add(path);
-
-				using (var f = File.Create(path))
-				{
-					int bufSize = 2048;
-					byte[] buf = new byte[bufSize];
-					while ((bufSize = z.Read(buf, 0, buf.Length)) > 0)
-					f.Write(buf, 0, bufSize);
-				}
-			}
-
-			z.Close();
-		}
-	}
-}

OpenRA.FileFormats/Keycode.cs

@@ -1,500 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA
-{
-	public enum Keycode
-	{
-		UNKNOWN = 0,
-		FIRST = 0,
-		BACKSPACE = 8,
-		TAB = 9,
-		CLEAR = 12,
-		RETURN = 13,
-		PAUSE = 19,
-		ESCAPE = 27,
-		SPACE = 32,
-		EXCLAIM = 33,
-		QUOTEDBL = 34,
-		HASH = 35,
-		DOLLAR = 36,
-		AMPERSAND = 38,
-		QUOTE = 39,
-		LEFTPAREN = 40,
-		RIGHTPAREN = 41,
-		ASTERISK = 42,
-		PLUS = 43,
-		COMMA = 44,
-		MINUS = 45,
-		PERIOD = 46,
-		SLASH = 47,
-		NUMBER_0 = 48,
-		NUMBER_1 = 49,
-		NUMBER_2 = 50,
-		NUMBER_3 = 51,
-		NUMBER_4 = 52,
-		NUMBER_5 = 53,
-		NUMBER_6 = 54,
-		NUMBER_7 = 55,
-		NUMBER_8 = 56,
-		NUMBER_9 = 57,
-		COLON = 58,
-		SEMICOLON = 59,
-		LESS = 60,
-		EQUALS = 61,
-		GREATER = 62,
-		QUESTION = 63,
-		AT = 64,
-		LEFTBRACKET = 91,
-		BACKSLASH = 92,
-		RIGHTBRACKET = 93,
-		CARET = 94,
-		UNDERSCORE = 95,
-		BACKQUOTE = 96,
-		A = 97,
-		B = 98,
-		C = 99,
-		D = 100,
-		E = 101,
-		F = 102,
-		G = 103,
-		H = 104,
-		I = 105,
-		J = 106,
-		K = 107,
-		L = 108,
-		M = 109,
-		N = 110,
-		O = 111,
-		P = 112,
-		Q = 113,
-		R = 114,
-		S = 115,
-		T = 116,
-		U = 117,
-		V = 118,
-		W = 119,
-		X = 120,
-		Y = 121,
-		Z = 122,
-		DELETE = 127,
-		WORLD_0 = 160,
-		WORLD_1 = 161,
-		WORLD_2 = 162,
-		WORLD_3 = 163,
-		WORLD_4 = 164,
-		WORLD_5 = 165,
-		WORLD_6 = 166,
-		WORLD_7 = 167,
-		WORLD_8 = 168,
-		WORLD_9 = 169,
-		WORLD_10 = 170,
-		WORLD_11 = 171,
-		WORLD_12 = 172,
-		WORLD_13 = 173,
-		WORLD_14 = 174,
-		WORLD_15 = 175,
-		WORLD_16 = 176,
-		WORLD_17 = 177,
-		WORLD_18 = 178,
-		WORLD_19 = 179,
-		WORLD_20 = 180,
-		WORLD_21 = 181,
-		WORLD_22 = 182,
-		WORLD_23 = 183,
-		WORLD_24 = 184,
-		WORLD_25 = 185,
-		WORLD_26 = 186,
-		WORLD_27 = 187,
-		WORLD_28 = 188,
-		WORLD_29 = 189,
-		WORLD_30 = 190,
-		WORLD_31 = 191,
-		WORLD_32 = 192,
-		WORLD_33 = 193,
-		WORLD_34 = 194,
-		WORLD_35 = 195,
-		WORLD_36 = 196,
-		WORLD_37 = 197,
-		WORLD_38 = 198,
-		WORLD_39 = 199,
-		WORLD_40 = 200,
-		WORLD_41 = 201,
-		WORLD_42 = 202,
-		WORLD_43 = 203,
-		WORLD_44 = 204,
-		WORLD_45 = 205,
-		WORLD_46 = 206,
-		WORLD_47 = 207,
-		WORLD_48 = 208,
-		WORLD_49 = 209,
-		WORLD_50 = 210,
-		WORLD_51 = 211,
-		WORLD_52 = 212,
-		WORLD_53 = 213,
-		WORLD_54 = 214,
-		WORLD_55 = 215,
-		WORLD_56 = 216,
-		WORLD_57 = 217,
-		WORLD_58 = 218,
-		WORLD_59 = 219,
-		WORLD_60 = 220,
-		WORLD_61 = 221,
-		WORLD_62 = 222,
-		WORLD_63 = 223,
-		WORLD_64 = 224,
-		WORLD_65 = 225,
-		WORLD_66 = 226,
-		WORLD_67 = 227,
-		WORLD_68 = 228,
-		WORLD_69 = 229,
-		WORLD_70 = 230,
-		WORLD_71 = 231,
-		WORLD_72 = 232,
-		WORLD_73 = 233,
-		WORLD_74 = 234,
-		WORLD_75 = 235,
-		WORLD_76 = 236,
-		WORLD_77 = 237,
-		WORLD_78 = 238,
-		WORLD_79 = 239,
-		WORLD_80 = 240,
-		WORLD_81 = 241,
-		WORLD_82 = 242,
-		WORLD_83 = 243,
-		WORLD_84 = 244,
-		WORLD_85 = 245,
-		WORLD_86 = 246,
-		WORLD_87 = 247,
-		WORLD_88 = 248,
-		WORLD_89 = 249,
-		WORLD_90 = 250,
-		WORLD_91 = 251,
-		WORLD_92 = 252,
-		WORLD_93 = 253,
-		WORLD_94 = 254,
-		WORLD_95 = 255,
-		KP0 = 256,
-		KP1 = 257,
-		KP2 = 258,
-		KP3 = 259,
-		KP4 = 260,
-		KP5 = 261,
-		KP6 = 262,
-		KP7 = 263,
-		KP8 = 264,
-		KP9 = 265,
-		KP_PERIOD = 266,
-		KP_DIVIDE = 267,
-		KP_MULTIPLY = 268,
-		KP_MINUS = 269,
-		KP_PLUS = 270,
-		KP_ENTER = 271,
-		KP_EQUALS = 272,
-		UP = 273,
-		DOWN = 274,
-		RIGHT = 275,
-		LEFT = 276,
-		INSERT = 277,
-		HOME = 278,
-		END = 279,
-		PAGEUP = 280,
-		PAGEDOWN = 281,
-		F1 = 282,
-		F2 = 283,
-		F3 = 284,
-		F4 = 285,
-		F5 = 286,
-		F6 = 287,
-		F7 = 288,
-		F8 = 289,
-		F9 = 290,
-		F10 = 291,
-		F11 = 292,
-		F12 = 293,
-		F13 = 294,
-		F14 = 295,
-		F15 = 296,
-		NUMLOCK = 300,
-		CAPSLOCK = 301,
-		SCROLLOCK = 302,
-		RSHIFT = 303,
-		LSHIFT = 304,
-		RCTRL = 305,
-		LCTRL = 306,
-		RALT = 307,
-		LALT = 308,
-		RMETA = 309,
-		LMETA = 310,
-		LSUPER = 311,
-		RSUPER = 312,
-		MODE = 313,
-		COMPOSE = 314,
-		HELP = 315,
-		PRINT = 316,
-		SYSREQ = 317,
-		BREAK = 318,
-		MENU = 319,
-		POWER = 320,
-		EURO = 321,
-		UNDO = 322,
-		LAST
-	}
-
-	public static class KeycodeExts
-	{
-		static readonly Dictionary<Keycode, string> KeyNames = new Dictionary<Keycode, string>
-		{
-			{ Keycode.UNKNOWN, "unknown" },
-			{ Keycode.BACKSPACE, "backspace" },
-			{ Keycode.TAB, "tab" },
-			{ Keycode.CLEAR, "clear" },
-			{ Keycode.RETURN, "return" },
-			{ Keycode.PAUSE, "pause" },
-			{ Keycode.ESCAPE, "escape" },
-			{ Keycode.SPACE, "space" },
-			{ Keycode.EXCLAIM, "!" },
-			{ Keycode.QUOTEDBL, "\"" },
-			{ Keycode.HASH, "#" },
-			{ Keycode.DOLLAR, "$" },
-			{ Keycode.AMPERSAND, "&" },
-			{ Keycode.QUOTE, "'" },
-			{ Keycode.LEFTPAREN, "(" },
-			{ Keycode.RIGHTPAREN, ")" },
-			{ Keycode.ASTERISK, "*" },
-			{ Keycode.PLUS, "+" },
-			{ Keycode.COMMA, "," },
-			{ Keycode.MINUS, "-" },
-			{ Keycode.PERIOD, "." },
-			{ Keycode.SLASH, "/" },
-			{ Keycode.NUMBER_0, "0" },
-			{ Keycode.NUMBER_1, "1" },
-			{ Keycode.NUMBER_2, "2" },
-			{ Keycode.NUMBER_3, "3" },
-			{ Keycode.NUMBER_4, "4" },
-			{ Keycode.NUMBER_5, "5" },
-			{ Keycode.NUMBER_6, "6" },
-			{ Keycode.NUMBER_7, "7" },
-			{ Keycode.NUMBER_8, "8" },
-			{ Keycode.NUMBER_9, "9" },
-			{ Keycode.COLON, ":" },
-			{ Keycode.SEMICOLON, " }," },
-			{ Keycode.LESS, "<" },
-			{ Keycode.EQUALS, "=" },
-			{ Keycode.GREATER, ">" },
-			{ Keycode.QUESTION, "?" },
-			{ Keycode.AT, "@" },
-			{ Keycode.LEFTBRACKET, "[" },
-			{ Keycode.BACKSLASH, "\\" },
-			{ Keycode.RIGHTBRACKET, "]" },
-			{ Keycode.CARET, "^" },
-			{ Keycode.UNDERSCORE, "_" },
-			{ Keycode.BACKQUOTE, "`" },
-			{ Keycode.A, "a" },
-			{ Keycode.B, "b" },
-			{ Keycode.C, "c" },
-			{ Keycode.D, "d" },
-			{ Keycode.E, "e" },
-			{ Keycode.F, "f" },
-			{ Keycode.G, "g" },
-			{ Keycode.H, "h" },
-			{ Keycode.I, "i" },
-			{ Keycode.J, "j" },
-			{ Keycode.K, "k" },
-			{ Keycode.L, "l" },
-			{ Keycode.M, "m" },
-			{ Keycode.N, "n" },
-			{ Keycode.O, "o" },
-			{ Keycode.P, "p" },
-			{ Keycode.Q, "q" },
-			{ Keycode.R, "r" },
-			{ Keycode.S, "s" },
-			{ Keycode.T, "t" },
-			{ Keycode.U, "u" },
-			{ Keycode.V, "v" },
-			{ Keycode.W, "w" },
-			{ Keycode.X, "x" },
-			{ Keycode.Y, "y" },
-			{ Keycode.Z, "z" },
-			{ Keycode.DELETE, "delete" },
-			{ Keycode.WORLD_0, "world 0" },
-			{ Keycode.WORLD_1, "world 1" },
-			{ Keycode.WORLD_2, "world 2" },
-			{ Keycode.WORLD_3, "world 3" },
-			{ Keycode.WORLD_4, "world 4" },
-			{ Keycode.WORLD_5, "world 5" },
-			{ Keycode.WORLD_6, "world 6" },
-			{ Keycode.WORLD_7, "world 7" },
-			{ Keycode.WORLD_8, "world 8" },
-			{ Keycode.WORLD_9, "world 9" },
-			{ Keycode.WORLD_10, "world 10" },
-			{ Keycode.WORLD_11, "world 11" },
-			{ Keycode.WORLD_12, "world 12" },
-			{ Keycode.WORLD_13, "world 13" },
-			{ Keycode.WORLD_14, "world 14" },
-			{ Keycode.WORLD_15, "world 15" },
-			{ Keycode.WORLD_16, "world 16" },
-			{ Keycode.WORLD_17, "world 17" },
-			{ Keycode.WORLD_18, "world 18" },
-			{ Keycode.WORLD_19, "world 19" },
-			{ Keycode.WORLD_20, "world 20" },
-			{ Keycode.WORLD_21, "world 21" },
-			{ Keycode.WORLD_22, "world 22" },
-			{ Keycode.WORLD_23, "world 23" },
-			{ Keycode.WORLD_24, "world 24" },
-			{ Keycode.WORLD_25, "world 25" },
-			{ Keycode.WORLD_26, "world 26" },
-			{ Keycode.WORLD_27, "world 27" },
-			{ Keycode.WORLD_28, "world 28" },
-			{ Keycode.WORLD_29, "world 29" },
-			{ Keycode.WORLD_30, "world 30" },
-			{ Keycode.WORLD_31, "world 31" },
-			{ Keycode.WORLD_32, "world 32" },
-			{ Keycode.WORLD_33, "world 33" },
-			{ Keycode.WORLD_34, "world 34" },
-			{ Keycode.WORLD_35, "world 35" },
-			{ Keycode.WORLD_36, "world 36" },
-			{ Keycode.WORLD_37, "world 37" },
-			{ Keycode.WORLD_38, "world 38" },
-			{ Keycode.WORLD_39, "world 39" },
-			{ Keycode.WORLD_40, "world 40" },
-			{ Keycode.WORLD_41, "world 41" },
-			{ Keycode.WORLD_42, "world 42" },
-			{ Keycode.WORLD_43, "world 43" },
-			{ Keycode.WORLD_44, "world 44" },
-			{ Keycode.WORLD_45, "world 45" },
-			{ Keycode.WORLD_46, "world 46" },
-			{ Keycode.WORLD_47, "world 47" },
-			{ Keycode.WORLD_48, "world 48" },
-			{ Keycode.WORLD_49, "world 49" },
-			{ Keycode.WORLD_50, "world 50" },
-			{ Keycode.WORLD_51, "world 51" },
-			{ Keycode.WORLD_52, "world 52" },
-			{ Keycode.WORLD_53, "world 53" },
-			{ Keycode.WORLD_54, "world 54" },
-			{ Keycode.WORLD_55, "world 55" },
-			{ Keycode.WORLD_56, "world 56" },
-			{ Keycode.WORLD_57, "world 57" },
-			{ Keycode.WORLD_58, "world 58" },
-			{ Keycode.WORLD_59, "world 59" },
-			{ Keycode.WORLD_60, "world 60" },
-			{ Keycode.WORLD_61, "world 61" },
-			{ Keycode.WORLD_62, "world 62" },
-			{ Keycode.WORLD_63, "world 63" },
-			{ Keycode.WORLD_64, "world 64" },
-			{ Keycode.WORLD_65, "world 65" },
-			{ Keycode.WORLD_66, "world 66" },
-			{ Keycode.WORLD_67, "world 67" },
-			{ Keycode.WORLD_68, "world 68" },
-			{ Keycode.WORLD_69, "world 69" },
-			{ Keycode.WORLD_70, "world 70" },
-			{ Keycode.WORLD_71, "world 71" },
-			{ Keycode.WORLD_72, "world 72" },
-			{ Keycode.WORLD_73, "world 73" },
-			{ Keycode.WORLD_74, "world 74" },
-			{ Keycode.WORLD_75, "world 75" },
-			{ Keycode.WORLD_76, "world 76" },
-			{ Keycode.WORLD_77, "world 77" },
-			{ Keycode.WORLD_78, "world 78" },
-			{ Keycode.WORLD_79, "world 79" },
-			{ Keycode.WORLD_80, "world 80" },
-			{ Keycode.WORLD_81, "world 81" },
-			{ Keycode.WORLD_82, "world 82" },
-			{ Keycode.WORLD_83, "world 83" },
-			{ Keycode.WORLD_84, "world 84" },
-			{ Keycode.WORLD_85, "world 85" },
-			{ Keycode.WORLD_86, "world 86" },
-			{ Keycode.WORLD_87, "world 87" },
-			{ Keycode.WORLD_88, "world 88" },
-			{ Keycode.WORLD_89, "world 89" },
-			{ Keycode.WORLD_90, "world 90" },
-			{ Keycode.WORLD_91, "world 91" },
-			{ Keycode.WORLD_92, "world 92" },
-			{ Keycode.WORLD_93, "world 93" },
-			{ Keycode.WORLD_94, "world 94" },
-			{ Keycode.WORLD_95, "world 95" },
-			{ Keycode.KP0, "[0]" },
-			{ Keycode.KP1, "[1]" },
-			{ Keycode.KP2, "[2]" },
-			{ Keycode.KP3, "[3]" },
-			{ Keycode.KP4, "[4]" },
-			{ Keycode.KP5, "[5]" },
-			{ Keycode.KP6, "[6]" },
-			{ Keycode.KP7, "[7]" },
-			{ Keycode.KP8, "[8]" },
-			{ Keycode.KP9, "[9]" },
-			{ Keycode.KP_PERIOD, "[.]" },
-			{ Keycode.KP_DIVIDE, "[/]" },
-			{ Keycode.KP_MULTIPLY, "[*]" },
-			{ Keycode.KP_MINUS, "[-]" },
-			{ Keycode.KP_PLUS, "[+]" },
-			{ Keycode.KP_ENTER, "enter" },
-			{ Keycode.KP_EQUALS, "equals" },
-			{ Keycode.UP, "up" },
-			{ Keycode.DOWN, "down" },
-			{ Keycode.RIGHT, "right" },
-			{ Keycode.LEFT, "left" },
-			{ Keycode.INSERT, "insert" },
-			{ Keycode.HOME, "home" },
-			{ Keycode.END, "end" },
-			{ Keycode.PAGEUP, "page up" },
-			{ Keycode.PAGEDOWN, "page down" },
-			{ Keycode.F1, "f1" },
-			{ Keycode.F2, "f2" },
-			{ Keycode.F3, "f3" },
-			{ Keycode.F4, "f4" },
-			{ Keycode.F5, "f5" },
-			{ Keycode.F6, "f6" },
-			{ Keycode.F7, "f7" },
-			{ Keycode.F8, "f8" },
-			{ Keycode.F9, "f9" },
-			{ Keycode.F10, "f10" },
-			{ Keycode.F11, "f11" },
-			{ Keycode.F12, "f12" },
-			{ Keycode.F13, "f13" },
-			{ Keycode.F14, "f14" },
-			{ Keycode.F15, "f15" },
-			{ Keycode.NUMLOCK, "numlock" },
-			{ Keycode.CAPSLOCK, "caps lock" },
-			{ Keycode.SCROLLOCK, "scroll lock" },
-			{ Keycode.RSHIFT, "right shift" },
-			{ Keycode.LSHIFT, "left shift" },
-			{ Keycode.RCTRL, "right ctrl" },
-			{ Keycode.LCTRL, "left ctrl" },
-			{ Keycode.RALT, "right alt" },
-			{ Keycode.LALT, "left alt" },
-			{ Keycode.RMETA, "right meta" },
-			{ Keycode.LMETA, "left meta" },
-			{ Keycode.LSUPER, "left super" },
-			{ Keycode.RSUPER, "right super" },
-			{ Keycode.MODE, "alt gr" },
-			{ Keycode.COMPOSE, "compose" },
-			{ Keycode.HELP, "help" },
-			{ Keycode.PRINT, "print screen" },
-			{ Keycode.SYSREQ, "sys req" },
-			{ Keycode.BREAK, "break" },
-			{ Keycode.MENU, "menu" },
-			{ Keycode.POWER, "power" },
-			{ Keycode.EURO, "euro" },
-			{ Keycode.UNDO, "undo" }
-		};
-
-		public static string DisplayString(Keycode k)
-		{
-			var ret = "unknown";
-			KeyNames.TryGetValue(k, out ret);
-			return ret;
-		}
-	}
-}

OpenRA.FileFormats/Manifest.cs

@@ -1,79 +1,65 @@
-#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, 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");
-			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();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	/* describes what is to be loaded in order to run a set of mods */
+
+	public class Manifest
+	{
+		public readonly string[]
+			Folders, Packages, Rules,
+			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
+			Weapons, Voices, Music, Movies, TileSets;
+
+		public readonly string ShellmapUid, LoadScreen;
+		public readonly int TileSize = 24;
+
+		public Manifest(string[] mods)
+		{
+			var yaml = mods
+				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
+				.Aggregate(MiniYaml.Merge);
+			
+			// Todo: Use fieldloader
+			Folders = YamlList(yaml, "Folders");
+			Packages = YamlList(yaml, "Packages");
+			Rules = YamlList(yaml, "Rules");
+			Sequences = YamlList(yaml, "Sequences");
+			Cursors = YamlList(yaml, "Cursors");
+			Chrome = YamlList(yaml, "Chrome");
+			Assemblies = YamlList(yaml, "Assemblies");
+			ChromeLayout = YamlList(yaml, "ChromeLayout");
+			Weapons = YamlList(yaml, "Weapons");
+			Voices = YamlList(yaml, "Voices");
+			Music = YamlList(yaml, "Music");
+			Movies = YamlList(yaml, "Movies");
+			TileSets = YamlList(yaml, "TileSets");
+
+			ShellmapUid = yaml.First( x => x.Key == "ShellmapUid" ).Value.Value;
+			LoadScreen = yaml.First( x => x.Key == "LoadScreen" ).Value.Value;
+			
+			if (yaml.FirstOrDefault( x => x.Key == "TileSize" ) != null)
+				TileSize = int.Parse(yaml.First( x => x.Key == "TileSize" ).Value.Value);
+		}
+
+		static string[] YamlList(List<MiniYamlNode> ys, string key)
+		{
+			var y = ys.FirstOrDefault( x => x.Key == key );
+			if( y == null )
+				return new string[ 0 ];
+
+			return y.Value.NodesDict.Keys.ToArray();
+		}
+	}
+}