projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch by mathnerd314 <man.is.allan@gmail.com> resolves issue 0000302: Mr. Ice Block...
[supertux.git]
/
src
/
object
/
growup.hpp
diff --git
a/src/object/growup.hpp
b/src/object/growup.hpp
index
2405914
..
ec7484b
100644
(file)
--- a/
src/object/growup.hpp
+++ b/
src/object/growup.hpp
@@
-22,19
+22,18
@@
#include "object/moving_sprite.hpp"
#include "physic.hpp"
#include "object/moving_sprite.hpp"
#include "physic.hpp"
+#include "direction.hpp"
-class GrowUp : public MovingSprite
+class GrowUp : public MovingSprite
, private UsesPhysic
{
public:
{
public:
- GrowUp();
+ GrowUp(
Direction direction = RIGHT
);
virtual GrowUp* clone() const { return new GrowUp(*this); }
virtual void update(float elapsed_time);
virtual GrowUp* clone() const { return new GrowUp(*this); }
virtual void update(float elapsed_time);
+ virtual void collision_solid(const CollisionHit& hit);
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
-
-private:
- Physic physic;
+ void do_jump();
};
#endif
};
#endif
-