Mercurial > touhou
diff pytouhou/game/item.py @ 151:5cf927cbd9c5
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 | 4f46717390aa |
children | 86807b8a63bd |
line wrap: on
line diff
--- a/pytouhou/game/item.py +++ b/pytouhou/game/item.py @@ -17,8 +17,8 @@ from math import cos, sin, atan2, pi class Item(object): - def __init__(self, pos, item_type, angle, speed, player, game_state): - self._game_state = game_state + def __init__(self, pos, item_type, angle, speed, player, game): + self._game = game self._sprite = item_type.sprite self._removed = False self._item_type = item_type