diff --git a/MapViewer/MapViewer.csproj b/MapViewer/MapViewer.csproj
deleted file mode 100644
index 32af505b89..0000000000
--- a/MapViewer/MapViewer.csproj
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}
- Exe
- Properties
- MapViewer
- MapViewer
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}
- OpenRa.FileFormats
-
-
-
-
-
\ No newline at end of file
diff --git a/MapViewer/Program.cs b/MapViewer/Program.cs
deleted file mode 100644
index fec4f54a55..0000000000
--- a/MapViewer/Program.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Windows.Forms;
-using OpenRa.FileFormats;
-
-namespace MapViewer
-{
- class Program
- {
- static Stream GetFile()
- {
- OpenFileDialog ofd = new OpenFileDialog();
- ofd.RestoreDirectory = true;
- ofd.Filter = "Map files (*.ini;*.mpr)|*.ini;*.mpr";
-
- return (DialogResult.OK == ofd.ShowDialog()) ? ofd.OpenFile() : null;
- }
-
- static byte ReadByte( Stream s )
- {
- int ret = s.ReadByte();
- if( ret == -1 )
- throw new NotImplementedException ();
- return (byte)ret;
- }
-
- static void Main(string[] args)
- {
- Stream s = GetFile();
- if (s == null)
- {
- Console.WriteLine("Fail");
- return;
- }
-
- IniFile iniFile = new IniFile(s);
- Console.WriteLine("Done.");
-
- Map map = new Map( iniFile );
-
- Console.WriteLine( "Name: {0}", map.Title );
-
- IniSection basic = iniFile.GetSection( "Basic" );
- Console.WriteLine( "Official: {0}", basic.GetValue( "Official", "no" ) );
-
- Console.WriteLine( "Theater: {0}", map.Theater );
- Console.WriteLine( "X: {0} Y: {1} Width: {2} Height: {3}",
- map.XOffset, map.YOffset, map.Width, map.Height );
-
- foreach( TileReference r in map.MapTiles )
- Console.WriteLine( "{0:x4}.{1:x2} ", r.tile, r.image );
- }
- }
-}
diff --git a/MapViewer/Properties/AssemblyInfo.cs b/MapViewer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4f6b86d980..0000000000
--- a/MapViewer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-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("MapViewer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MapViewer")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
-[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("3d06bcba-b9e2-412c-829c-a8458d883fee")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MixBrowser/MM.DAT b/MixBrowser/MM.DAT
deleted file mode 100644
index 8a30317924..0000000000
Binary files a/MixBrowser/MM.DAT and /dev/null differ
diff --git a/MixBrowser/MixBrowser.csproj b/MixBrowser/MixBrowser.csproj
deleted file mode 100644
index 5b5f851a9d..0000000000
--- a/MixBrowser/MixBrowser.csproj
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {E183D00B-FD2C-4001-8336-DF345DE281DA}
- Exe
- Properties
- MixBrowser
- MixBrowser
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
- {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}
- OpenRa.FileFormats
-
-
-
-
-
\ No newline at end of file
diff --git a/MixBrowser/Program.cs b/MixBrowser/Program.cs
deleted file mode 100644
index fb2b6f87c9..0000000000
--- a/MixBrowser/Program.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-
-using OpenRa.FileFormats;
-
-namespace MixBrowser
-{
- class Program
- {
- static string GetFilename(string[] args)
- {
- if (args.Length == 0)
- {
- OpenFileDialog ofd = new OpenFileDialog();
- ofd.RestoreDirectory = true;
- ofd.Filter = "MIX files (*.mix)|*.mix|All Files (*.*)|*.*";
-
- return DialogResult.OK == ofd.ShowDialog() ? ofd.FileName : null;
- }
-
- return args[0];
- }
-
- static void Main(string[] args)
- {
- string fn = GetFilename(args);
- if (fn == null)
- {
- Console.WriteLine("FAIL");
- return;
- }
-
- Package file = new Package(fn);
-
- if (File.Exists("files.txt"))
- foreach (string filename in File.ReadAllLines("files.txt"))
- PackageEntry.AddStandardName(filename);
- else
- Console.WriteLine("-- files.txt doesnt exist --");
-
- foreach (PackageEntry e in file.Content)
- Console.WriteLine(e);
- }
- }
-}
diff --git a/MixBrowser/Properties/AssemblyInfo.cs b/MixBrowser/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2d8b5504c6..0000000000
--- a/MixBrowser/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-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("MixBrowser")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MixBrowser")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
-[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("0a21156d-3412-410c-977c-8b7e494881eb")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenRa.FileFormats/ShpReader.cs b/OpenRa.FileFormats/ShpReader.cs
index 1e756b2603..1387a40047 100644
--- a/OpenRa.FileFormats/ShpReader.cs
+++ b/OpenRa.FileFormats/ShpReader.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.Drawing;
using System.IO;
+using System.Collections;
namespace OpenRa.FileFormats
{
@@ -151,7 +152,7 @@ namespace OpenRa.FileFormats
return headers.GetEnumerator();
}
- System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+ IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
diff --git a/OpenRa.sln b/OpenRa.sln
index cb93fd91ef..a7f66a1eb9 100644
--- a/OpenRa.sln
+++ b/OpenRa.sln
@@ -1,8 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MixBrowser", "MixBrowser\MixBrowser.csproj", "{E183D00B-FD2C-4001-8336-DF345DE281DA}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MixDecrypt", "MixDecrypt\MixDecrypt.vcproj", "{6F5D4280-3D23-41FF-AE2A-511B5553E377}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShpViewer", "ShpViewer\ShpViewer.csproj", "{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}"
@@ -11,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.FileFormats", "OpenR
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Core", "OpenRa.Core\OpenRa.Core.csproj", "{1B60782F-B2DD-43F1-B51D-B798485F317C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer", "MapViewer\MapViewer.csproj", "{3942F56A-F427-4DE0-928A-89DEA952FF5F}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -23,16 +19,6 @@ Global
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Release|Any CPU.Build.0 = Release|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {E183D00B-FD2C-4001-8336-DF345DE281DA}.Release|Win32.ActiveCfg = Release|Any CPU
{6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Any CPU.ActiveCfg = Debug|Win32
{6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -73,16 +59,6 @@ Global
{1B60782F-B2DD-43F1-B51D-B798485F317C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{1B60782F-B2DD-43F1-B51D-B798485F317C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{1B60782F-B2DD-43F1-B51D-B798485F317C}.Release|Win32.ActiveCfg = Release|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Release|Any CPU.Build.0 = Release|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {3942F56A-F427-4DE0-928A-89DEA952FF5F}.Release|Win32.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE