Changeset 598 for trunk/game/scripts/gamesceneview.py

Timestamp:

07/24/10 17:48:44 (9 years ago)

Author:

beliar

Message:

Patch by Beliar.

• Fixed crash when picking up items
• changed displayObjectText of GameSceneView?, it now stores the id of the instance instead of the instance.
• getObjectById of GameState? can now be called without a map_id, the method will now use its getMapOfObject method if no map is given.

File:

• trunk/game/scripts/gamesceneview.py (modified) (3 diffs)

trunk/game/scripts/gamesceneview.py

@@ -43 +43 @@
         self.faded_objects = set()
 
-    def displayObjectText(self, obj, text):
+    def displayObjectText(self, obj_id, text):
         """Display on screen the text of the object over the object.
-           @type obj: fife.instance
-           @param obj: object to draw over
+           @type obj_id: id of fife.instance
+           @param obj: id of object to draw over
            @type text: String
            @param text: text to display over object
            @return: None"""
-        obj.say(str(text), 1000)
+        try:
+            if obj_id:
+                obj = self.model.active_map.agent_layer.getInstance(obj_id)
+            else:
+                obj = None
+        except RuntimeError as error:
+            if error.args[0].split(',')[0].strip() == "_[NotFound]_":
+                obj = None
+            else:
+                raise
+        if obj:
+            obj.say(str(text), 1000)
 
     def onWalk(self, click):
@@ -90 +101 @@
 
 
+    #def removeHighlight(self):
+        
+    
     def highlightFrontObject(self, mouse_coords):
         """Highlights the object that is at the 
@@ -99 +113 @@
             if front_obj != None:
                 if self.highlight_obj == None \
-                            or front_obj.getId() != \
-                            self.highlight_obj.getId():
-                    if self.highlight_obj:
-                        self.displayObjectText(self.highlight_obj,"")
+                                    or front_obj.getId() != \
+                                    self.highlight_obj:
+                    if self.model.game_state.hasObject(front_obj.getId()):
+                        self.displayObjectText(self.highlight_obj, "")
                     self.model.active_map.outline_renderer.removeAllOutlines()
-                    self.highlight_obj = front_obj
+                    self.highlight_obj = front_obj.getId()
                     self.model.active_map.outline_renderer.addOutlined(
-                                                    self.highlight_obj, 
+                                                    front_obj, 
                                                     0,
                                                     137, 255, 2)
                     # get the text
-                    item = self.model.objectActive(
-                                                    self.highlight_obj.getId())
+                    item = self.model.objectActive(self.highlight_obj)
                     if item is not None:
                         self.displayObjectText(self.highlight_obj,