projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separated EndSequence logic from GameSession. This will allow for nice hierarchy...
[supertux.git]
/
src
/
object
/
player.hpp
diff --git
a/src/object/player.hpp
b/src/object/player.hpp
index
0fecfef
..
fec7007
100644
(file)
--- a/
src/object/player.hpp
+++ b/
src/object/player.hpp
@@
-81,7
+81,7
@@
extern TuxBodyParts* big_tux;
extern TuxBodyParts* fire_tux;
extern TuxBodyParts* ice_tux;
extern TuxBodyParts* fire_tux;
extern TuxBodyParts* ice_tux;
-class Player : public MovingObject, public Scripting::Player, public ScriptInterface
+class Player : public MovingObject, public
UsesPhysic, public
Scripting::Player, public ScriptInterface
{
public:
enum FallMode { ON_GROUND, JUMPING, TRAMPOLINE_JUMP, FALLING };
{
public:
enum FallMode { ON_GROUND, JUMPING, TRAMPOLINE_JUMP, FALLING };
@@
-119,7
+119,6
@@
public:
Timer growing_timer;
Timer idle_timer;
Timer backflip_timer;
Timer growing_timer;
Timer idle_timer;
Timer backflip_timer;
- Physic physic;
public:
Player(PlayerStatus* player_status, const std::string& name);
public:
Player(PlayerStatus* player_status, const std::string& name);
@@
-160,6
+159,7
@@
public:
virtual bool add_bonus(const std::string& bonus);
virtual void add_coins(int count);
virtual bool add_bonus(const std::string& bonus);
virtual void add_coins(int count);
+ virtual int get_coins();
/**
* picks up a bonus, taking care not to pick up lesser bonus items than we already have
/**
* picks up a bonus, taking care not to pick up lesser bonus items than we already have
@@
-251,6
+251,11
@@
public:
*/
bool adjust_height(float new_height);
*/
bool adjust_height(float new_height);
+ /**
+ * Orders the current GameSession to start a sequence
+ */
+ void trigger_sequence(std::string sequence_name);
+
private:
void handle_input();
void handle_input_ghost(); /**< input handling while in ghost mode */
private:
void handle_input();
void handle_input_ghost(); /**< input handling while in ghost mode */
@@
-278,9
+283,10
@@
private:
Sprite* smalltux_star;
Sprite* bigtux_star;
Sprite* smalltux_star;
Sprite* bigtux_star;
+ std::auto_ptr<Surface> airarrow; /**< arrow indicating Tux' position when he's above the camera */
+
Vector floor_normal;
Vector floor_normal;
- bool try_grab;
- Direction grab_dir;
+ void try_grab();
bool ghost_mode; /**< indicates if Tux should float around and through solid objects */
bool ghost_mode; /**< indicates if Tux should float around and through solid objects */