projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged gravity patch by T. Goya
[supertux.git]
/
src
/
object
/
oneup.hpp
diff --git
a/src/object/oneup.hpp
b/src/object/oneup.hpp
index
415c61c
..
1e23841
100644
(file)
--- a/
src/object/oneup.hpp
+++ b/
src/object/oneup.hpp
@@
-24,7
+24,7
@@
#include "physic.hpp"
#include "direction.hpp"
#include "physic.hpp"
#include "direction.hpp"
-class OneUp : public MovingSprite
+class OneUp : public MovingSprite
, private UsesPhysic
{
public:
OneUp(const Vector& pos, Direction direction = RIGHT);
{
public:
OneUp(const Vector& pos, Direction direction = RIGHT);
@@
-32,9
+32,6
@@
public:
virtual void update(float elapsed_time);
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
virtual void update(float elapsed_time);
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
-
-private:
- Physic physic;
};
#endif
};
#endif