Changeset 658


Ignore:
Timestamp:
11/05/10 16:48:56 (9 years ago)
Author:
beliar
Message:

Patch by Beliar.

  • Changes to make PARPG work with the newest fife revision (r3491)
Location:
trunk/game
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/game/scripts/gamemodel.py

    r648 r658  
    2222 
    2323from fife import fife 
     24from fife.extensions.serializers.xmlobject import XMLObjectLoader  
    2425 
    2526from gamestate import GameState 
     
    7980        self.agent_import_files = {} 
    8081        self.settings = settings 
     82        self.obj_loader = XMLObjectLoader( 
     83                                          self.engine.getImagePool(),  
     84                                          self.engine.getAnimationPool(),  
     85                                          self.engine.getModel(), 
     86                                          self.engine.getVFS()  
     87                                          ) 
    8188 
    8289    def checkAttributes(self, attributes): 
     
    358365        @param agent: The agent to be added 
    359366        @type agent: dict """ 
    360         from fife.extensions.loaders import loadImportFile 
     367        from fife.extensions.serializers.xml_loader_tools import loadImportFile 
    361368        if not self.agents.has_key(namespace): 
    362369            self.agents[namespace] = {} 
     
    377384            object_model = self.object_db[agent_values["ObjectType"]]["gfx"] 
    378385        import_file = self.agent_import_files[object_model] 
    379         loadImportFile(import_file, self.engine) 
     386        loadImportFile(self.obj_loader, import_file, self.engine) 
    380387         
    381388    def readAgentsOfMap(self, map_name): 
  • trunk/game/settings-dist.xml

    r627 r658  
    2121                <Setting name="ProfilingOn" type="bool">False</Setting> 
    2222        <Setting name="ImageChunkSize" type="int">256</Setting> 
     23        <Setting name="Lighting" type="int"> 0 </Setting>  
    2324   </Module> 
    2425  <Module name="PARPG"> 
    25     <Setting name="SettingsVersion" type="str">2010-08-06</Setting> 
     26    <Setting name="SettingsVersion" type="str">2010-11-05</Setting> 
    2627    <Setting name="Map" type="str">Mall</Setting> 
    2728    <Setting name="ObjectDatabaseFile" type="str">objects/object_database.yaml</Setting> 
Note: See TracChangeset for help on using the changeset viewer.