Changeset 825


Ignore:
Timestamp:
04/01/11 21:30:01 (9 years ago)
Author:
aspidites
Message:

Patch by Aspidites:

  • changed the way the -p option runs to work around optparse limitations
  • now possible to only supply a global config location
Location:
branches/active/character_customization/game
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/active/character_customization/game/parpg/settings.py

    r813 r825  
    339339 
    340340# Subdirectory to load icons from (path) 
    341 IconsDirectory = icons 
     341IconsPath = icons 
    342342 
    343343# ? ([R, G, B]) 
     
    357357 
    358358# Subdirectory to load fronts from (path) 
    359 FontsDirectory = fonts 
     359FontsPath = fonts 
    360360 
    361361# Font to load when game starts 
     
    383383 
    384384# System subdirectory to load maps from (path) 
    385 MapsDirectory = maps 
     385MapsPath = maps 
    386386 
    387387# YAML file that contains the available maps (filename) 
     
    395395 
    396396# System subdirectory to load objects from (path) 
    397 ObjectsDirectory = objects 
     397ObjectsPath = objects 
    398398 
    399399# YAML file that contains the database of availabel objects (filename) 
     
    401401 
    402402# System subdirectory to load dialogues from (path) 
    403 DialoguesDirectory = dialogue 
     403DialoguesPath = dialogue 
    404404 
    405405# System subdirectory to load quests from (path) 
    406 QuestsDirectory = quests 
     406QuestsPath = quests 
    407407 
    408408# User subdirectory to save screenshots to 
    409 ScreenshotsDirectory = screenshots 
     409ScreenshotsPath = screenshots 
    410410 
    411411# User subdirectory to save games to 
    412 SavesDirectory = saves 
     412SavesPath = saves 
    413413 
    414414# System subdirectory where gui files are loaded from (path) 
    415 GuiDirectory = gui 
     415GuiPath = gui 
    416416 
    417417# System subdirectory where cursors are loaded from (path) 
    418 CursorDirectory = cursors 
     418CursorPath = cursors 
    419419 
    420420# File to use for default cursor (filename) 
  • branches/active/character_customization/game/run.py

    r810 r825  
    1 #!/usr/bin/env python2 
    2  
     1#!/usr/bin/env python2  
    32#   This program is free software: you can redistribute it and/or modify 
    43#   it under the terms of the GNU General Public License as published by 
     
    2322# Python 2.6 or lower 
    2423parser = OptionParser(description='PARPG Launcher Script') 
    25 parser.add_option('-p', '--paths', nargs=2, 
     24parser.add_option('-p', '--paths', 
    2625                  default='.', 
    27                   help='One or more paths to load settings from') 
     26                  help='One or more paths to load settings from. If more than ' 
     27                       'one path is given, be sure to surround the value in ' 
     28                       'quotes.') 
    2829parser.add_option('-f', '--logfile', 
    2930                  help='Name of log file to save to') 
     
    3334 
    3435# initialize settings 
    35 settings = Settings(*opts.paths) 
     36paths = opts.paths.split(' ') 
     37print paths 
     38settings = Settings(*paths) 
    3639 
    3740levels = {'debug': logging.DEBUG, 
Note: See TracChangeset for help on using the changeset viewer.