From 50c5948d544f35c66ef4a16b88d3bae64588056a Mon Sep 17 00:00:00 2001 From: chrisf Date: Thu, 5 Jul 2007 21:54:53 +0000 Subject: [PATCH] git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1103 993157c7-ee19-0410-b2c4-bb4e9862e678 --- MapViewer/MapViewer.csproj | 55 ------------------------- MapViewer/Program.cs | 56 -------------------------- MapViewer/Properties/AssemblyInfo.cs | 33 --------------- MixBrowser/MM.DAT | Bin 52838 -> 0 bytes MixBrowser/MixBrowser.csproj | 55 ------------------------- MixBrowser/Program.cs | 48 ---------------------- MixBrowser/Properties/AssemblyInfo.cs | 33 --------------- OpenRa.FileFormats/ShpReader.cs | 3 +- OpenRa.sln | 24 ----------- 9 files changed, 2 insertions(+), 305 deletions(-) delete mode 100644 MapViewer/MapViewer.csproj delete mode 100644 MapViewer/Program.cs delete mode 100644 MapViewer/Properties/AssemblyInfo.cs delete mode 100644 MixBrowser/MM.DAT delete mode 100644 MixBrowser/MixBrowser.csproj delete mode 100644 MixBrowser/Program.cs delete mode 100644 MixBrowser/Properties/AssemblyInfo.cs 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 8a303179242cebd8817215e41f6dee531c21ab2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52838 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 Y|F8NlS6zSd|B;^dGeqd`kIMi5AE8Dlg8%>k 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