Mercurial > parpg-source
comparison objects/action.py @ 101:824f3068ef2a
Fixed Saving and Loading.
author | KarstenBock@gmx.net |
---|---|
date | Thu, 29 Sep 2011 18:09:56 +0200 |
parents | a9cc5559ec2a |
children | c9afad46091b |
comparison
equal
deleted
inserted
replaced
100:485d866a847f | 101:824f3068ef2a |
---|---|
380 self.item = item | 380 self.item = item |
381 self.view = controller.view | 381 self.view = controller.view |
382 | 382 |
383 def execute(self): | 383 def execute(self): |
384 real_item = self.item.containable | 384 real_item = self.item.containable |
385 self.item.fifeagent = None | |
385 player = self.model.game_state.getObjectById("PlayerCharacter") | 386 player = self.model.game_state.getObjectById("PlayerCharacter") |
386 self.model.moveObject(self.item.general.identifier, None) | 387 self.model.moveObject(self.item.general.identifier, None) |
387 container.put_item(player.container, real_item) | 388 container.put_item(player.container, real_item) |
388 super(PickUpAction, self).execute() | 389 super(PickUpAction, self).execute() |
389 | 390 |