super metroid style camera

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

diff --git a/src/object/oneup.hpp b/src/object/oneup.hpp
index 7729268..1e23841 100644 (file)
--- a/src/object/oneup.hpp
+++ b/src/object/oneup.hpp
@@ -20,23 +20,18 @@
 #ifndef __ONEUP_H__
 #define __ONEUP_H__
 
-#include "moving_object.hpp"
-#include "sprite/sprite.hpp"
+#include "object/moving_sprite.hpp"
 #include "physic.hpp"
+#include "direction.hpp"
 
-class OneUp : public MovingObject
+class OneUp : public MovingSprite, private UsesPhysic
 {
 public:
-  OneUp(const Vector& pos);
-  ~OneUp();
+  OneUp(const Vector& pos, Direction direction = RIGHT);
+  virtual OneUp* clone() const { return new OneUp(*this); }
 
   virtual void update(float elapsed_time);
-  virtual void draw(DrawingContext& context);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
-
-private:
-  Sprite* sprite;
-  Physic physic;
 };
 
 #endif