diff --git a/OpenRA.Mods.Common/UtilityCommands/UpdateMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/UpdateMapCommand.cs index 54f8cbf9c1..5d1b165f29 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpdateMapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpdateMapCommand.cs @@ -74,6 +74,7 @@ namespace OpenRA.Mods.Common.UtilityCommands static void ApplyRules(ModData modData, IReadWritePackage mapPackage, IEnumerable rules) { + var externalFilenames = new HashSet(); foreach (var rule in rules) { Console.WriteLine("{0}: {1}", rule.GetType().Name, rule.Name); @@ -82,7 +83,6 @@ namespace OpenRA.Mods.Common.UtilityCommands Console.Write(" Updating map... "); - var externalFilenames = new HashSet(); try { manualSteps = UpdateUtils.UpdateMap(modData, mapPackage, rule, out mapFiles, externalFilenames); @@ -105,13 +105,6 @@ namespace OpenRA.Mods.Common.UtilityCommands mapFiles.Save(); Console.WriteLine("COMPLETE"); - if (externalFilenames.Any()) - { - Console.WriteLine(" The following shared yaml files referenced by the map have been ignored:"); - Console.WriteLine(UpdateUtils.FormatMessageList(externalFilenames, 1)); - Console.WriteLine(" These files are assumed to have already been updated by the --update-mod command"); - } - if (manualSteps.Any()) { Console.WriteLine(" Manual changes are required to complete this update:"); @@ -122,6 +115,14 @@ namespace OpenRA.Mods.Common.UtilityCommands Console.WriteLine(); } + if (externalFilenames.Any()) + { + Console.WriteLine("The following shared yaml files referenced by the map have been ignored:"); + Console.WriteLine(UpdateUtils.FormatMessageList(externalFilenames)); + Console.WriteLine("These files are assumed to have already been updated by the --update-mod command"); + Console.WriteLine(); + } + Console.WriteLine("Semi-automated update complete."); Console.WriteLine("Please review the messages above for any manual actions that must be applied."); }