projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Magic Blocks. (DrawingContext::get_light is not working yet.)
[supertux.git]
/
src
/
object
/
player.hpp
diff --git
a/src/object/player.hpp
b/src/object/player.hpp
index
866a0bf
..
0fecfef
100644
(file)
--- a/
src/object/player.hpp
+++ b/
src/object/player.hpp
@@
-122,7
+122,7
@@
public:
Physic physic;
public:
Physic physic;
public:
- Player(PlayerStatus* player_status);
+ Player(PlayerStatus* player_status
, const std::string& name
);
virtual ~Player();
virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
virtual ~Player();
virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
@@
-279,6
+279,8
@@
private:
Sprite* bigtux_star;
Vector floor_normal;
Sprite* bigtux_star;
Vector floor_normal;
+ bool try_grab;
+ Direction grab_dir;
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 */