projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Comment out resizable flag because it blue-screens on Windows
[supertux.git]
/
src
/
object
/
powerup.hpp
diff --git
a/src/object/powerup.hpp
b/src/object/powerup.hpp
index
5ed2b49
..
4779db1
100644
(file)
--- a/
src/object/powerup.hpp
+++ b/
src/object/powerup.hpp
@@
-25,7
+25,7
@@
#include "collision_hit.hpp"
#include "physic.hpp"
#include "collision_hit.hpp"
#include "physic.hpp"
-class PowerUp : public MovingSprite
+class PowerUp : public MovingSprite
, private UsesPhysic
{
public:
PowerUp(const lisp::Lisp& lisp);
{
public:
PowerUp(const lisp::Lisp& lisp);
@@
-35,7
+35,6
@@
public:
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
private:
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
private:
- Physic physic;
std::string script;
bool no_physics;
};
std::string script;
bool no_physics;
};