0

corrected world loading by name to handle renamed worlds

This commit is contained in:
Aaron Griffith
2011-02-23 12:52:21 -05:00
parent 3ce887162b
commit dd01eae9e0
2 changed files with 14 additions and 10 deletions

12
gmap.py
View File

@@ -70,14 +70,16 @@ def main():
if not os.path.exists(worlddir):
# world given is either world number, or name
worlds = world.get_worlds()
try:
worldnum = int(worlddir)
worlddir = world.get_worlds()[worldnum]['path']
worlddir = worlds[worldnum]['path']
except ValueError:
# it wasn't a number, try using it as a name
worlddir = os.path.join(world.get_save_dir(), worlddir)
if not os.path.exists(worlddir):
# still doesn't exist! print help and die.
# it wasn't a number or path, try using it as a name
try:
worlddir = worlds[worlddir]['path']
except KeyError:
# it's not a number, name, or path
print "Invalid world name or path"
parser.print_help()
sys.exit(1)