Mercurial > skaapsteker
changeset 583:194f71cc0689
don't remove kaneda from the geisha room too early (looks weird, but fixes crash)
| author | Neil Muller <drnlmuller@gmail.com> |
|---|---|
| date | Sun, 10 Apr 2011 15:59:59 +0200 |
| parents | 213f46e787c4 |
| children | b8bed508036f |
| files | skaapsteker/sprites/npcs.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/skaapsteker/sprites/npcs.py Sun Apr 10 15:57:48 2011 +0200 +++ b/skaapsteker/sprites/npcs.py Sun Apr 10 15:59:59 2011 +0200 @@ -73,11 +73,11 @@ super(Kaneda, self).player_action(player) def update(self): - if not self._me.present and self.alive: + super(Kaneda, self).update() + if not self._me.present and self.alive and self._me.level == "tea_house": self.remove() - if self.world.missions.kumiko_disgraced and self.alive: + elif self.world.missions.kumiko_disgraced and self.alive and self._me.level == 'geisha_room': self.remove() - super(Kaneda, self).update() class Tetsuo(NPC):