Changeset 658

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:

• scripts/gamemodel.py (modified) (4 diffs)
• settings-dist.xml (modified) (1 diff)

trunk/game/scripts/gamemodel.py

@@ -22 +22 @@
 
 from fife import fife
+from fife.extensions.serializers.xmlobject import XMLObjectLoader 
 
 from gamestate import GameState
@@ -79 +80 @@
         self.agent_import_files = {}
         self.settings = settings
+        self.obj_loader = XMLObjectLoader(
+                                          self.engine.getImagePool(), 
+                                          self.engine.getAnimationPool(), 
+                                          self.engine.getModel(),
+                                          self.engine.getVFS() 
+                                          )
 
     def checkAttributes(self, attributes):
@@ -358 +365 @@
         @param agent: The agent to be added
         @type agent: dict """
-        from fife.extensions.loaders import loadImportFile
+        from fife.extensions.serializers.xml_loader_tools import loadImportFile
         if not self.agents.has_key(namespace):
             self.agents[namespace] = {}
@@ -377 +384 @@
             object_model = self.object_db[agent_values["ObjectType"]]["gfx"]
         import_file = self.agent_import_files[object_model]
-        loadImportFile(import_file, self.engine)
+        loadImportFile(self.obj_loader, import_file, self.engine)
         
     def readAgentsOfMap(self, map_name):

trunk/game/settings-dist.xml

@@ -21 +21 @@
                 <Setting name="ProfilingOn" type="bool">False</Setting>
         <Setting name="ImageChunkSize" type="int">256</Setting>
+        <Setting name="Lighting" type="int"> 0 </Setting> 
    </Module>
   <Module name="PARPG">
-    <Setting name="SettingsVersion" type="str">2010-08-06</Setting>
+    <Setting name="SettingsVersion" type="str">2010-11-05</Setting>
     <Setting name="Map" type="str">Mall</Setting>
     <Setting name="ObjectDatabaseFile" type="str">objects/object_database.yaml</Setting>