From 92da94ca2a541717aab30f34f251e28ba7942a4c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 28 Jun 2017 01:43:26 -0500 Subject: [PATCH] [MIRROR] Fixes mapmerge (#1296) * Fixes mapmerge * Update mapmerger.py * Delete mapmerger.py.rej --- tools/mapmerge/mapmerger.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/mapmerge/mapmerger.py b/tools/mapmerge/mapmerger.py index 2b679cb131..f0206a9b6c 100644 --- a/tools/mapmerge/mapmerger.py +++ b/tools/mapmerge/mapmerger.py @@ -4,7 +4,7 @@ import shutil #main("../../_maps/") def main(map_folder, tgm=0): - valid_indices = map_helpers.prompt_maps(map_folder, "merge", tgm) + maps = map_helpers.prompt_maps(map_folder, "merge", tgm) print("\nMerging these maps:") for i in maps.indices: @@ -15,8 +15,8 @@ def main(map_folder, tgm=0): print("\nAborted map merge.") sys.exit() else: - for i in valid_indices: - path_str = str(list_of_files[i]) + for i in maps.indices: + path_str = str(maps.files[i]) shutil.copyfile(path_str, path_str + ".before") path_str_pretty = path_str[len(map_folder):] try: