projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tux grows faster, stops growing when hit
[supertux.git]
/
src
/
object
/
trampoline.hpp
diff --git
a/src/object/trampoline.hpp
b/src/object/trampoline.hpp
index
f856ca0
..
c7653c0
100644
(file)
--- a/
src/object/trampoline.hpp
+++ b/
src/object/trampoline.hpp
@@
-22,30
+22,27
@@
#include "moving_sprite.hpp"
#include "lisp/lisp.hpp"
#include "moving_sprite.hpp"
#include "lisp/lisp.hpp"
-#include "object/portable.hpp"
-#include "physic.hpp"
+#include "object/rock.hpp"
-/**
+/**
* Jumping on a trampolin makes tux jump higher.
*/
* Jumping on a trampolin makes tux jump higher.
*/
-class Trampoline : public MovingSprite,
- public Portable
-
+class Trampoline : public Rock
{
public:
Trampoline(const lisp::Lisp& reader);
{
public:
Trampoline(const lisp::Lisp& reader);
-
+
HitResponse collision(GameObject& other, const CollisionHit& hit);
HitResponse collision(GameObject& other, const CollisionHit& hit);
- void collision_solid( const CollisionHit& hit );
- void update( float elapsed_time );
+ void collision_solid(const CollisionHit& hit);
+ void update(float elapsed_time);
+
+ void grab(MovingObject&, const Vector& pos, Direction);
+ void ungrab(MovingObject&, Direction);
+ bool is_portable() const;
- void grab( MovingObject&, const Vector& pos, Direction );
- void ungrab(MovingObject& , Direction );
-
private:
private:
-
Physic physic
;
- bool on_ground;
+
bool portable
;
+
};
#endif
};
#endif
-