Changeset 753


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
Location:
branches/active/character_customization/game/parpg
Files:
4 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        """ 
  • branches/active/character_customization/game/parpg/controllerbase.py

    r736 r753  
    8585        """Reset cursor to default image. 
    8686           @return: None""" 
    87         image = self.model.settings.get("PARPG", "CursorDefault") 
     87        image = self.model.settings.parpg.CursorDefault 
    8888        self.setMouseCursor(image, image) 
    8989         
  • branches/active/character_customization/game/parpg/gamemodel.py

    r736 r753  
    6060        self.load_saver = False 
    6161        self.savegame = None 
    62         self.game_state = GameState(quests_dir = settings.get("PARPG", 
    63                                                              "QuestsDirectory")) 
     62        self.game_state = GameState(quests_dir=settings.parpg.QuestsDirectory) 
    6463        #self.game_state.quest_engine =  
    6564        #self.game_state.quest_engine.readQuests() 
     
    719718    def getAgentImportFiles(self): 
    720719        """Searches the agents directory for import files """ 
     720        print self.agents_directory 
    721721        files = locateFiles("*.xml", self.agents_directory) 
    722722        for xml_file in files: 
  • branches/active/character_customization/game/parpg/mainmenuview.py

    r736 r753  
    6666        menu_events["newButton"] = self.newGame 
    6767        menu_events["loadButton"] = self.loadGame 
    68         menu_events["optionsButton"] = self.model.settings.onOptionsPress 
     68        #TODO: reimplement fife's Setting.onoptionsPress in a more suitable place 
     69        #menu_events["optionsButton"] = self.model.settings.onOptionsPress 
     70        menu_events["optionsButton"] = None 
    6971        menu_events["quitButton"] = self.quitGame 
    7072        self.main_menu.mapEvents(menu_events) 
Note: See TracChangeset for help on using the changeset viewer.