projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made buttjump a bit easier to perform
[supertux.git]
/
src
/
object
/
trampoline.hpp
diff --git
a/src/object/trampoline.hpp
b/src/object/trampoline.hpp
index
df751d8
..
c7653c0
100644
(file)
--- a/
src/object/trampoline.hpp
+++ b/
src/object/trampoline.hpp
@@
-22,13
+22,12
@@
#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);
@@
-37,15
+36,13
@@
public:
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
);
+ void grab(
MovingObject&, const Vector& pos, Direction
);
+ void ungrab(MovingObject&
, Direction
);
bool is_portable() const;
private:
bool is_portable() const;
private:
- Physic physic;
- bool on_ground;
bool portable;
bool portable;
- bool grabbed;
+
};
#endif
};
#endif