Mercurial > parpg-core

diff src/parpg/gamescenecontroller.py @ 116:9b5498e3bda0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move the identifier field from the FifeAgent component to the new General component. Added General Entity.
author KarstenBock@gmx.net
date Sat, 24 Sep 2011 15:48:24 +0200
parents c1a6ea47b838
children 29869273f9e1
line wrap: on
line diff
--- a/src/parpg/gamescenecontroller.py	Fri Sep 23 15:09:02 2011 +0200
+++ b/src/parpg/gamescenecontroller.py	Sat Sep 24 15:48:24 2011 +0200
@@ -409,7 +409,7 @@
         # TODO: work more on this when we get NPCData and HeroData straightened
         # out
         npc = self.model.game_state.getObjectById(
-            npc_info.fifeagent.identifier, 
+            npc_info.general.identifier, 
             self.model.game_state.current_map_name
         )
         npc_pos = npc.fifeagent.behaviour.getLocation().getLayerCoordinates()
@@ -430,7 +430,7 @@
                                       self.model.game_state.current_map_name)
         obj_pos = obj.fifeagent.behaviour.getLocation().getLayerCoordinates()
         player = self.model.game_state.getObjectById("PlayerCharacter")
-        is_player = obj.fifeagent.identifier == player.fifeagent.identifier
+        is_player = obj.general.identifier == player.general.identifier
         
         
         #TODO: Check all actions to be compatible with the grease components