Mercurial > touhou

comparison 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
comparison
equal deleted inserted replaced
493:26c082870dcf 494:6be9c99a3a24
1 from pytouhou.game.element cimport Element 1 from pytouhou.game.element cimport Element
2 from pytouhou.game.game cimport Game 2 from pytouhou.game.game cimport Game
3 3
4 cdef class PlayerState: 4 cdef class Player(Element):
5 cdef public double x, y 5 cdef public Game _game
6 cdef public long death_time
6 cdef public bint touchable, focused 7 cdef public bint touchable, focused
7 cdef public long character, score, effective_score, lives, bombs, power 8 cdef public long character, score, effective_score, lives, bombs, power
8 cdef public long graze, points 9 cdef public long graze, points
9 10
10 cdef long number 11 cdef long number
11 cdef long invulnerable_time, power_bonus, continues, continues_used, miss, 12 cdef long invulnerable_time, power_bonus, continues, continues_used, miss,
12 cdef long bombs_used 13 cdef long bombs_used
13
14
15 cdef class Player(Element):
16 cdef public PlayerState state
17 cdef public long death_time
18 cdef public Game _game
19 14
20 cdef object anm 15 cdef object anm
21 cdef tuple speeds 16 cdef tuple speeds
22 cdef long fire_time, bomb_time, direction 17 cdef long fire_time, bomb_time, direction
23 18