Mercurial > touhou

diff pytouhou/game/player.pxd @ 494:6be9c99a3a24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge PlayerState into Player, fix player respawn position.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Mon, 14 Oct 2013 12:11:01 +0200
parents 887de1309491
children a6af3ff86612
line wrap: on
line diff
--- a/pytouhou/game/player.pxd
+++ b/pytouhou/game/player.pxd
@@ -1,8 +1,9 @@
 from pytouhou.game.element cimport Element
 from pytouhou.game.game cimport Game
 
-cdef class PlayerState:
-    cdef public double x, y
+cdef class Player(Element):
+    cdef public Game _game
+    cdef public long death_time
     cdef public bint touchable, focused
     cdef public long character, score, effective_score, lives, bombs, power
     cdef public long graze, points
@@ -11,12 +12,6 @@ cdef class PlayerState:
     cdef long invulnerable_time, power_bonus, continues, continues_used, miss,
     cdef long bombs_used
 
-
-cdef class Player(Element):
-    cdef public PlayerState state
-    cdef public long death_time
-    cdef public Game _game
-
     cdef object anm
     cdef tuple speeds
     cdef long fire_time, bomb_time, direction