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
/
weak_block.hpp
diff --git
a/src/object/weak_block.hpp
b/src/object/weak_block.hpp
index
cc5baf8
..
01e2464
100644
(file)
--- a/
src/object/weak_block.hpp
+++ b/
src/object/weak_block.hpp
@@
-26,10
+26,10
@@
#include "physic.hpp"
#include "timer.hpp"
#include "physic.hpp"
#include "timer.hpp"
-/**
+/**
* A block that can be destroyed by Bullet hits
*/
* A block that can be destroyed by Bullet hits
*/
-class WeakBlock : public MovingSprite
+class WeakBlock : public MovingSprite
, public UsesPhysic
{
public:
WeakBlock(const lisp::Lisp& lisp);
{
public:
WeakBlock(const lisp::Lisp& lisp);
@@
-55,9
+55,6
@@
private:
STATE_DISINTEGRATING /**< crumbling to dust, no longer solid */
};
State state;
STATE_DISINTEGRATING /**< crumbling to dust, no longer solid */
};
State state;
-
- Physic physic;
};
#endif
};
#endif
-