Mercurial > touhou

diff pytouhou/game/player.pyx @ 471:06f0eeb519bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make Laser and Orb extension types, and use that where possible.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Mon, 16 Sep 2013 18:42:04 +0200
parents feecdb4a8928
children 8038f1957b71
line wrap: on
line diff
--- a/pytouhou/game/player.pyx
+++ b/pytouhou/game/player.pyx
@@ -19,7 +19,7 @@ from pytouhou.vm.anmrunner import ANMRun
 from pytouhou.game.bullettype import BulletType
 from pytouhou.game.bullet cimport Bullet
 from pytouhou.game.lasertype import LaserType
-from pytouhou.game.laser import PlayerLaser
+from pytouhou.game.laser cimport PlayerLaser
 
 
 class GameOver(Exception):
@@ -247,9 +247,7 @@ cdef class Player(Element):
                     self.state.power -= 16
                 else:
                     self.state.power = 0
-                for laser in self._game.players_lasers:
-                    if laser is not None:
-                        laser.cancel()
+                self._game.cancel_player_lasers()
 
                 self.state.miss += 1
                 self.state.lives -= 1