Mercurial > touhou

diff pytouhou/game/bullet.py @ 151:5cf927cbd9c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge GameState into Game. TODO: Merge PlayerState into Player
author Thibaut Girka <thib@sitedethib.com>
date Tue, 04 Oct 2011 23:32:02 +0200
parents 3673d55a8448
children 86807b8a63bd
line wrap: on
line diff
--- a/pytouhou/game/bullet.py
+++ b/pytouhou/game/bullet.py
@@ -21,8 +21,8 @@ from pytouhou.game.sprite import Sprite
 
 class Bullet(object):
     def __init__(self, pos, bullet_type, sprite_idx_offset,
-                       angle, speed, attributes, flags, player, game_state):
-        self._game_state = game_state
+                       angle, speed, attributes, flags, player, game):
+        self._game = game
         self._sprite = None
         self._anmrunner = None
         self._removed = False