cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-17 13:12:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the batch file method of mapmerge2 and save a .before (#34361)

Browse Source
This commit is contained in:
Tad Hardesty
2018-01-12 07:43:06 -08:00
committed by ShizCalev
parent 91e87c869c
commit 28436f36b5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/mapmerge2/mapmerge.py
View File

@@ -85,9 +85,10 @@ def merge_map(new_map, old_map, delete_unused=False):
def main(settings): def main(settings):
for fname in frontend.process(settings, "merge", backup=True): for fname in frontend.process(settings, "merge", backup=True):
shutil.copyfile(fname, fname + ".before")
old_map = DMM.from_file(fname + ".backup") old_map = DMM.from_file(fname + ".backup")
new_map = DMM.from_file(fname) new_map = DMM.from_file(fname)
merge_map(old_map, new_map).to_file(fname, settings.tgm) merge_map(new_map, old_map).to_file(fname, settings.tgm)
if __name__ == '__main__': if __name__ == '__main__':
main(frontend.read_settings()) main(frontend.read_settings())