Revert "Internal: not copying all lumps manually anymore on 'Save As'. The WAD is copied with File.Copy anyway."

This reverts commit ec90554cf4.

Source/Core/General/MapManager.cs

@@ -948,21 +948,53 @@ namespace CodeImp.DoomBuilder
 					if(File.Exists(settingsfile)) File.Delete(settingsfile);
 				}
 
-                // [ZZ] We really want to tell apart saving into current archive from saving into a new one.
-                //      Treat "save as" into the current archive as normal save.
-                bool isSaveAs = (purpose == SavePurpose.AsNewFile) && (newfilepathname != filepathname);
 				// On Save AS we have to copy the previous file to the new file
-				if(isSaveAs) 
+				if((purpose == SavePurpose.AsNewFile) && (!String.IsNullOrEmpty(filepathname))) 
 				{
 					// Copy if original file still exists
 					if(File.Exists(filepathname)) File.Copy(filepathname, newfilepathname, true);
 				}
 
 				// If the target file exists, we need to rebuild it
-                // [ZZ] The original code here would do some weird trickery with tempfiles.
+				if(File.Exists(newfilepathname)) 
-                //      I'm just finding the map lumps and deleting them on later stages.
+				{
+					// Move the target file aside
+					origwadfile = newfilepathname + ".temp";
+					File.Move(newfilepathname, origwadfile);
+
+					// Open original file
+					WAD origwad = new WAD(origwadfile, true);
+
+					// Create new target file
+					targetwad = new WAD(newfilepathname) { IsIWAD = origwad.IsIWAD }; //mxd. Let's preserve wad type
+
+					// Copy all lumps, except the original map
+					GameConfiguration origcfg; //mxd
+					if(origmapconfigname == configinfo.Filename) 
+					{
+						origcfg = config;
+					} 
+					else 
+					{
+						ConfigurationInfo ci = General.GetConfigurationInfo(origmapconfigname);
+						origcfg = new GameConfiguration(ci.Configuration);
+
+						// Needed only once!
+						origmapconfigname = configinfo.Filename;
+					}
+
+					mapheaderindex = CopyAllLumpsExceptMap(origwad, targetwad, origcfg, origmapname);
+
+					// Close original file and delete it
+					origwad.Dispose();
+					File.Delete(origwadfile);
+				}
+				else 
+				{
+					// Create new target file
 					targetwad = new WAD(newfilepathname);
 				}
+			} 
 			catch(Exception e) 
 			{
 				General.ShowErrorMessage("Unable to write the map to target file \"" + newfilepathname + "\":\n" + e.Message, MessageBoxButtons.OK);
@@ -1561,7 +1593,6 @@ namespace CodeImp.DoomBuilder
 				}
 
 				target.WriteHeaders(); //mxd
-                target.Compress(); // [ZZ]
 			}
 		}
 

Source/Core/IO/WAD.cs

@@ -280,9 +280,6 @@ namespace CodeImp.DoomBuilder.IO
 		// This writes the WAD header and lumps table
 		public void WriteHeaders()
 		{
-            // [ZZ] don't allow any edit actions on readonly archive
-            if (isreadonly) return;
-
 			// Seek to beginning
 			file.Seek(0, SeekOrigin.Begin);
 
@@ -372,9 +369,6 @@ namespace CodeImp.DoomBuilder.IO
 		public Lump Insert(string name, int position, int datalength) { return Insert(name, position, datalength, true); } //mxd
 		public Lump Insert(string name, int position, int datalength, bool writeheaders)
 		{
-            // [ZZ] don't allow any edit actions on readonly archive
-            if (isreadonly) return null;
-
 			// We will be adding a lump
 			numlumps++;
 			
@@ -398,9 +392,6 @@ namespace CodeImp.DoomBuilder.IO
 		// This removes a lump from the WAD file by index
 		public void RemoveAt(int index)
 		{
-            // [ZZ] don't allow any edit actions on readonly archive
-            if (isreadonly) return;
-
 			// Remove from list
 			Lump l = lumps[index];
 			lumps.RemoveAt(index);
@@ -414,9 +405,6 @@ namespace CodeImp.DoomBuilder.IO
 		// This removes a lump from the WAD file
 		public void Remove(Lump lump)
 		{
-            // [ZZ] don't allow any edit actions on readonly archive
-            if (isreadonly) return;
-
 			// Remove from list
 			lumps.Remove(lump);
 			lump.Dispose();