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

Patch by Aspidites:

  • disabled options button as functionality was previously defined in fife's Setting object. Rather than reimplement in settings.py, I think it would be wiser to implement in the gui package or similar.
  • continued further integration of settings.py in rest of project
File:
1 edited

Legend:

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

    r752 r753  
    123123        #self.engine.getModel(self) 
    124124        self.model = GameModel(self.engine, setting) 
    125         self.model.maps_file = self._setting.get("PARPG", "MapsFile") 
     125        self.model.maps_file = self._setting.parpg.MapsFile 
    126126        self.model.readMapFiles() 
    127         self.model.object_db_file = self._setting.get("PARPG",  
    128                                                       "ObjectDatabaseFile")  
     127        self.model.object_db_file = self._setting.parpg.ObjectDatabaseFile 
    129128        self.model.readObjectDB() 
    130         self.model.agents_directory = self._setting.get("PARPG", 
    131                                                         "AgentsDirectory")  
     129        self.model.agents_directory = self._setting.parpg.AgentsDirectory 
    132130        self.model.getAgentImportFiles() 
    133         self.model.all_agents_file = self._setting.get("PARPG", "AllAgentsFile") 
     131        self.model.all_agents_file = self._setting.parpg.AllAgentsFile 
    134132        self.model.readAllAgents() 
    135         self.model.dialogues_directory = self._setting.get("PARPG",  
    136                                                            "DialoguesDirectory") 
     133        self.model.dialogues_directory = self._setting.parpg.DialoguesDirectory 
    137134        self.model.getDialogues() 
    138135        self.view = MainMenuView(self.engine, self.model) 
     
    161158                pychan.loadFonts(file_name) 
    162159 
    163 ======= 
    164 >>>>>>> Patch by Aspidites: 
    165160    def loadSettings(self): 
    166161        """ 
Note: See TracChangeset for help on using the changeset viewer.