From 3d3b8c898582418211373776f15aebbd0ecc2852 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Fri, 8 Jan 2021 02:26:30 -0800 Subject: [PATCH] Just do stuff local --- Utils.py | 6 ++++++ source/classes/SpriteSelector.py | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Utils.py b/Utils.py index de753112..229573f2 100644 --- a/Utils.py +++ b/Utils.py @@ -36,6 +36,9 @@ def is_bundled(): return getattr(sys, 'frozen', False) def local_path(path): + # just do stuff here and bail + return os.path.join(".", path) + if local_path.cached_path is not None: return os.path.join(local_path.cached_path, path) @@ -51,6 +54,9 @@ def local_path(path): local_path.cached_path = None def output_path(path): + # just do stuff here and bail + return os.path.join(".", path) + if output_path.cached_path is not None: return os.path.join(output_path.cached_path, path) diff --git a/source/classes/SpriteSelector.py b/source/classes/SpriteSelector.py index 1ab073ad..c5458f2d 100644 --- a/source/classes/SpriteSelector.py +++ b/source/classes/SpriteSelector.py @@ -231,8 +231,8 @@ class SpriteSelector(object): @property def official_sprite_dir(self): -# if is_bundled(): -# return output_path(os.path.join("sprites","official")) + if is_bundled(): + return output_path(os.path.join("sprites","official")) return self.local_official_sprite_dir @property @@ -241,8 +241,8 @@ class SpriteSelector(object): @property def unofficial_sprite_dir(self): -# if is_bundled(): -# return output_path(os.path.join("sprites","unofficial")) + if is_bundled(): + return output_path(os.path.join("sprites","unofficial")) return self.local_unofficial_sprite_dir @property