# HG changeset patch
# User Neil Muller <drnlmuller@gmail.com>
# Date 1302443999 -7200
# Node ID 194f71cc0689dd1059b77f7195f4b52197d38ca4
# Parent  213f46e787c4de1020bdf73eeccb4eed73e102de
don't remove kaneda from the geisha room too early (looks weird, but fixes crash)

diff -r 213f46e787c4 -r 194f71cc0689 skaapsteker/sprites/npcs.py
--- 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):