From b06c96e4d2d9e365544f8abba9392752178a8fcd Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 12 Jun 2013 14:38:38 -0400 Subject: [PATCH] gfx: palette checking in to_png --- extras/gfx.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/gfx.py b/extras/gfx.py index 262270746..4be7b877f 100644 --- a/extras/gfx.py +++ b/extras/gfx.py @@ -1269,6 +1269,9 @@ def to_png(filein, fileout=None, pal_file=None, height=None, width=None): lines = to_lines(flatten(image), width) + if pal_file == None: + if os.path.exists(os.path.splitext(fileout)[0]+'.pal'): + pal_file = os.path.splitext(fileout)[0]+'.pal' if pal_file == None: palette = None @@ -1437,10 +1440,7 @@ def mass_to_colored_png(debug=False): for name in files: if debug: print os.path.splitext(name), os.path.join(root, name) if os.path.splitext(name)[1] == '.2bpp': - if os.path.splitext(name)[0]+'.pal' in files: - to_png(os.path.join(root, name), None, os.path.join(root, os.path.splitext(name)[0]+'.pal')) - else: - to_png(os.path.join(root, name)) + to_png(os.path.join(root, name)) os.utime(os.path.join(root, name), None) # only monster and trainer pics for now @@ -1458,7 +1458,7 @@ def mass_to_colored_png(debug=False): for name in files: if debug: print os.path.splitext(name), os.path.join(root, name) if os.path.splitext(name)[1] == '.2bpp': - to_png(os.path.join(root, name), None, os.path.join(root, name[:-5]+'.pal')) + to_png(os.path.join(root, name)) os.utime(os.path.join(root, name), None)