Use proper OS-specific path uris in many more places

also move path.join into local_path and output_path to simplify use
This commit is contained in:
Fabian Dill
2020-08-25 13:22:47 +02:00
parent 08f8677433
commit 2096d6ae5b
7 changed files with 33 additions and 30 deletions

8
Gui.py
View File

@@ -1566,22 +1566,22 @@ class SpriteSelector(object):
@property
def alttpr_sprite_dir(self):
if is_bundled():
return output_path("sprites/alttpr")
return output_path("sprites", "alttpr")
return self.local_alttpr_sprite_dir
@property
def local_alttpr_sprite_dir(self):
return local_path("data/sprites/alttpr")
return local_path("data", "sprites", "alttpr")
@property
def custom_sprite_dir(self):
if is_bundled():
return output_path("sprites/custom")
return output_path("sprites", "custom")
return self.local_custom_sprite_dir
@property
def local_custom_sprite_dir(self):
return local_path("data/sprites/custom")
return local_path("data", "sprites", "custom")
def get_image_for_sprite(sprite):