Add files via upload

Megamap support

Author: screamingchicken

CnCTDRAMapEditor/CnCTDRAMapEditor.csproj

@@ -57,6 +57,9 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\GameIcon00.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyName>CnCTDRAMapEditorD</AssemblyName>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -577,7 +580,7 @@
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>
     </PackageReference>
-	<Reference Include="netstandard" />
+    <Reference Include="netstandard" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

CnCTDRAMapEditor/MainForm.cs

@@ -799,17 +799,33 @@ private bool LoadFile(string loadFilename)
                         {
                             try
                             {
-                                using (var reader = new StreamReader(loadFilename))
+                                using (var reader2 = new StreamReader(loadFilename))
                                 {
                                     var ini2 = new INI();
-                                    ini2.ParseMapSize(reader);
+                                    ini2.ParseMapSize(reader2);
                                 }
                             }
                             catch (FileNotFoundException)
                             {
                                 return false;
                             }
                         }
+                        if (fileType == FileType.BIN)       // Megamap support, if we've been given a bin, look for the ini, then parse for Megamap flag.
+                        {
+                            try
+                            {
+                                using (var reader3 = new StreamReader(Path.ChangeExtension(loadFilename, ".ini")))
+                                {
+                                    var ini3 = new INI();
+                                    ini3.ParseMapSize(reader3);
+                                }
+                            }
+                            catch (FileNotFoundException)
+                            {
+                                return false;
+                            }
+                        }
+
                         Globals.TheTeamColorManager.Reset();
                         Globals.TheTeamColorManager.Load(@"DATA\XML\CNCTDTEAMCOLORS.XML");
                         plugin = new TiberianDawn.GamePlugin();