comparison eosd @ 372:704bea2e4360

Use a future-proof ECL parser.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Mon, 06 Aug 2012 22:52:22 +0200
parents 74471afbac37
children 6deab6ad8be8
comparison
equal deleted inserted replaced
371:6702bc0215dc 372:704bea2e4360
47 if not skip: 47 if not skip:
48 break 48 break
49 49
50 50
51 def cleanup(self): 51 def cleanup(self):
52 if not (self.boss or self.msg_wait or self.ecl_runner.boss_wait): 52 boss_wait = any(ecl_runner.boss_wait for ecl_runner in self.ecl_runners)
53 if not (self.boss or self.msg_wait or boss_wait):
53 self.enemies = [enemy for enemy in self.enemies 54 self.enemies = [enemy for enemy in self.enemies
54 if enemy.boss_callback != -1 or enemy.frame > 1] 55 if enemy.boss_callback != -1 or enemy.frame > 1]
55 self.lasers = [laser for laser in self.lasers if laser.frame > 1] 56 self.lasers = [laser for laser in self.lasers if laser.frame > 1]
56 self.effects = [effect for effect in self.effects 57 self.effects = [effect for effect in self.effects
57 if not hasattr(effect, '_laser') 58 if not hasattr(effect, '_laser')