From 72c8956351f898721faa07be659be6ca70c1e99f Mon Sep 17 00:00:00 2001
From: Drake53 <49623303+Drake53@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:02:12 +0200
Subject: [PATCH 1/2] Fix because MpqArchiveBuilder.AddFile(MpqFile) overwrites
target flags.
---
src/War3App.MapAdapter/ArchiveProcessor.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/War3App.MapAdapter/ArchiveProcessor.cs b/src/War3App.MapAdapter/ArchiveProcessor.cs
index 1c1c437..9328c75 100644
--- a/src/War3App.MapAdapter/ArchiveProcessor.cs
+++ b/src/War3App.MapAdapter/ArchiveProcessor.cs
@@ -252,7 +252,7 @@ public static void SaveArchive(
}
else if (child.TryGetModifiedMpqFile(out var nestedArchiveAdaptedFile))
{
- nestedArchiveBuilder.AddFile(nestedArchiveAdaptedFile);
+ nestedArchiveBuilder.AddFile(nestedArchiveAdaptedFile, nestedArchiveAdaptedFile.TargetFlags);
progressReporter.ReportProgress(0, progress);
}
@@ -268,7 +268,7 @@ public static void SaveArchive(
adaptedNestedArchiveStream.Position = 0;
var adaptedFile = MpqFile.New(adaptedNestedArchiveStream, mapFile.CurrentFileName, false);
adaptedFile.TargetFlags = mapFile.MpqEntry.Flags;
- archiveBuilder.AddFile(adaptedFile);
+ archiveBuilder.AddFile(adaptedFile, adaptedFile.TargetFlags);
progressReporter.ReportProgress(0, progress);
}
@@ -279,7 +279,7 @@ public static void SaveArchive(
}
else if (mapFile.TryGetModifiedMpqFile(out var adaptedFile))
{
- archiveBuilder.AddFile(adaptedFile);
+ archiveBuilder.AddFile(adaptedFile, adaptedFile.TargetFlags);
progressReporter.ReportProgress(0, progress);
}
From 3278c9814f8667fcbf33f0da9376cd59e178df2a Mon Sep 17 00:00:00 2001
From: Drake53 <49623303+Drake53@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:03:31 +0200
Subject: [PATCH 2/2] Update map adapter to v1.6.1
---
.../War3App.MapAdapter.EtoForms.Gtk.csproj | 2 +-
.../War3App.MapAdapter.EtoForms.csproj | 2 +-
.../War3App.MapAdapter.WinForms.csproj | 2 +-
src/War3App.MapAdapter/War3App.MapAdapter.csproj | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/War3App.MapAdapter.EtoForms.Gtk/War3App.MapAdapter.EtoForms.Gtk.csproj b/src/War3App.MapAdapter.EtoForms.Gtk/War3App.MapAdapter.EtoForms.Gtk.csproj
index d50744d..54a54b6 100644
--- a/src/War3App.MapAdapter.EtoForms.Gtk/War3App.MapAdapter.EtoForms.Gtk.csproj
+++ b/src/War3App.MapAdapter.EtoForms.Gtk/War3App.MapAdapter.EtoForms.Gtk.csproj
@@ -5,7 +5,7 @@
9.0
enable
WinExe
- 1.6.0
+ 1.6.1
diff --git a/src/War3App.MapAdapter.EtoForms/War3App.MapAdapter.EtoForms.csproj b/src/War3App.MapAdapter.EtoForms/War3App.MapAdapter.EtoForms.csproj
index 11dfcc5..42cf5cd 100644
--- a/src/War3App.MapAdapter.EtoForms/War3App.MapAdapter.EtoForms.csproj
+++ b/src/War3App.MapAdapter.EtoForms/War3App.MapAdapter.EtoForms.csproj
@@ -4,7 +4,7 @@
net6.0
9.0
enable
- 1.6.0
+ 1.6.1
diff --git a/src/War3App.MapAdapter.WinForms/War3App.MapAdapter.WinForms.csproj b/src/War3App.MapAdapter.WinForms/War3App.MapAdapter.WinForms.csproj
index 716b4d7..e2be506 100644
--- a/src/War3App.MapAdapter.WinForms/War3App.MapAdapter.WinForms.csproj
+++ b/src/War3App.MapAdapter.WinForms/War3App.MapAdapter.WinForms.csproj
@@ -7,7 +7,7 @@
enable
true
WinExe
- 1.6.0
+ 1.6.1
diff --git a/src/War3App.MapAdapter/War3App.MapAdapter.csproj b/src/War3App.MapAdapter/War3App.MapAdapter.csproj
index f16fe51..7171abd 100644
--- a/src/War3App.MapAdapter/War3App.MapAdapter.csproj
+++ b/src/War3App.MapAdapter/War3App.MapAdapter.csproj
@@ -4,7 +4,7 @@
net6.0
9.0
enable
- 1.6.0
+ 1.6.1