equal
deleted
inserted
replaced
18 |
18 |
19 public: |
19 public: |
20 GameState &state; |
20 GameState &state; |
21 |
21 |
22 protected: |
22 protected: |
|
23 // XXX: not used |
23 bool visible; |
24 bool visible; |
|
25 |
|
26 // our weapons |
24 std::vector<Weapon*> weapons; |
27 std::vector<Weapon*> weapons; |
25 unsigned int selectedWeapon; //unsigned for x%sW not to fail |
|
26 bool changing; |
|
27 |
28 |
|
29 // the index of the currently selected weapon |
|
30 unsigned int selectedWeapon; |
|
31 |
|
32 // we have a rope |
28 Rope rope; |
33 Rope rope; |
|
34 |
|
35 // XXX: hmm... updated where? |
29 int animation_step; |
36 int animation_step; |
30 |
37 |
31 // default constructor for use with virtual inheritance... it's not defined |
38 // default constructor for use with virtual inheritance... it's not defined |
32 Player (void); |
39 Player (void); |
33 Player (GameState &state, Vector position, bool visible); |
40 Player (GameState &state, Vector position, bool visible); |