Mercurial > touhou

diff pytouhou/game/game.py @ 220:0595315d3880

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix SHT handling; change a few things to be closer to ZUN’s mind; and first stub of PCB support.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Sun, 18 Dec 2011 14:14:32 +0100
parents 577f45454402
children 2d35565b5608
line wrap: on
line diff
--- a/pytouhou/game/game.py
+++ b/pytouhou/game/game.py
@@ -216,8 +216,8 @@ class Game(object):
             for bullet in self.bullets:
                 half_size = bullet.hitbox_half_size
                 bx, by = bullet.x, bullet.y
-                bx1, bx2 = bx - half_size, bx + half_size
-                by1, by2 = by - half_size, by + half_size
+                bx1, bx2 = bx - half_size[0], bx + half_size[0]
+                by1, by2 = by - half_size[1], by + half_size[1]
 
                 if not (bx2 < px1 or bx1 > px2
                         or by2 < py1 or by1 > py2):
@@ -247,7 +247,7 @@ class Game(object):
 
                 if not (bx2 < px1 or bx1 > px2
                         or by2 < py1 or by1 > py2):
-                    item.on_collect(player.state)
+                    item.on_collect(player)
 
 
     def cleanup(self):