svn merge -c-4932 .

[supertux.git] / src / object / oneup.hpp

diff --git a/src/object/oneup.hpp b/src/object/oneup.hpp
index 7380be0..1e23841 100644 (file)
--- a/src/object/oneup.hpp
+++ b/src/object/oneup.hpp
@@ -22,18 +22,16 @@
 
 #include "object/moving_sprite.hpp"
 #include "physic.hpp"
+#include "direction.hpp"
 
-class OneUp : public MovingSprite
+class OneUp : public MovingSprite, private UsesPhysic
 {
 public:
-  OneUp(const Vector& pos);
+  OneUp(const Vector& pos, Direction direction = RIGHT);
   virtual OneUp* clone() const { return new OneUp(*this); }
 
   virtual void update(float elapsed_time);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
-
-private:
-  Physic physic;
 };
 
 #endif