projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only draw Tux' arm in front of other objects if he's actually holding something ...
[supertux.git]
/
src
/
object
/
player.hpp
diff --git
a/src/object/player.hpp
b/src/object/player.hpp
index
32d824b
..
f27decd
100644
(file)
--- a/
src/object/player.hpp
+++ b/
src/object/player.hpp
@@
-69,7
+69,7
@@
public:
void set_action(std::string action, int loops = -1);
void one_time_animation();
void set_action(std::string action, int loops = -1);
void one_time_animation();
- void draw(DrawingContext& context, const Vector& pos, int layer);
+ void draw(DrawingContext& context, const Vector& pos, int layer
, Portable* grabbed_object
);
Sprite* head;
Sprite* body;
Sprite* head;
Sprite* body;