projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SDL: Implement lightmaps smaller than the screen size. LIGHTMAP_DIV is calculated...
[supertux.git]
/
src
/
object
/
trampoline.hpp
diff --git
a/src/object/trampoline.hpp
b/src/object/trampoline.hpp
index
8f846c6
..
c7653c0
100644
(file)
--- a/
src/object/trampoline.hpp
+++ b/
src/object/trampoline.hpp
@@
-22,29
+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);
HitResponse collision(GameObject& other, const CollisionHit& hit);
{
public:
Trampoline(const lisp::Lisp& reader);
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 );
+ void grab(MovingObject&, const Vector& pos, Direction);
+ void ungrab(MovingObject&, Direction);
+ bool is_portable() const;
private:
private:
-
Physic physic
;
- bool on_ground;
+
bool portable
;
+
};
#endif
};
#endif