projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed jump behaviour: Tux will now jump even if the button was pressed (up to)...
[supertux.git]
/
src
/
object
/
trampoline.hpp
diff --git
a/src/object/trampoline.hpp
b/src/object/trampoline.hpp
index
c534f54
..
6e94f76
100644
(file)
--- a/
src/object/trampoline.hpp
+++ b/
src/object/trampoline.hpp
@@
-1,6
+1,6
@@
// $Id$
//
// $Id$
//
-// SuperTux - Trampolin
+// SuperTux - Trampolin
e
// Copyright (C) 2006 Wolfgang Becker <uafr@gmx.de>
//
// This program is free software; you can redistribute it and/or
// Copyright (C) 2006 Wolfgang Becker <uafr@gmx.de>
//
// This program is free software; you can redistribute it and/or
@@
-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
e
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);
@@
-42,10
+41,8
@@
public:
bool is_portable() const;
private:
bool is_portable() const;
private:
- Physic physic;
- bool on_ground;
bool portable;
bool portable;
- bool grabbed;
+
};
#endif
};
#endif