Ignore:
Timestamp:
03/01/11 21:30:33 (8 years ago)
Author:
aspidites
Message:

Patch by Aspidites:

+ maps load properly once again
+ obsoleted get/set methods in settings.py

  • pc speed is no longer set, so walk speed is unbearably slow
File:
1 edited

Legend:

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

    r753 r756  
    5555        @type emgome: fife.Engine  
    5656        @param setting: The applications settigns 
    57         @type setting: fife_settings.Setting  
     57        @type setting: parpg.settings.Settings object 
    5858        @return: None""" 
    5959        self.map_change = False 
     
    7373        self.engine = engine 
    7474        self.fife_model = engine.getModel() 
    75         self.game_state.maps_file = "maps/maps.yaml" 
    76         self.all_agents_file = "maps/all_agents.yaml" 
    77         self.object_db_file = "objects/object_database.yaml" 
    78         self.agents_directory = "objects/" 
    79         self.dialogues_directory = "dialogue" 
     75 
     76        # set values from settings 
     77        self.game_state.maps_file = settings.parpg.MapsFile 
     78        self.all_agents_file = settings.parpg.AllAgentsFile 
     79        self.object_db_file = settings.parpg.ObjectDatabaseFile 
     80        self.agents_directory = settings.parpg.AgentsDirectory 
     81        self.dialogues_directory = settings.parpg.DialoguesDirectory 
    8082        self.dialogues = {} 
    8183        self.agent_import_files = {} 
     
    718720    def getAgentImportFiles(self): 
    719721        """Searches the agents directory for import files """ 
    720         print self.agents_directory 
    721722        files = locateFiles("*.xml", self.agents_directory) 
    722723        for xml_file in files: 
Note: See TracChangeset for help on using the changeset viewer.