X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.hpp;h=d82740ffdc29547109a8f7ace48f89c25b08cccb;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=c9fa3fca3126df4c6583c3093881aac216c0e4b0;hpb=16262ff3cac7fdd1de8dc46a967f93cce902ed7f;p=supertux.git

diff --git a/src/badguy/flyingsnowball.hpp b/src/badguy/flyingsnowball.hpp
index c9fa3fca3..d82740ffd 100644
--- a/src/badguy/flyingsnowball.hpp
+++ b/src/badguy/flyingsnowball.hpp
@@ -26,23 +26,21 @@ class FlyingSnowBall : public BadGuy
 {
 public:
   FlyingSnowBall(const lisp::Lisp& reader);
-  FlyingSnowBall(float pos_x, float pos_y);
+  FlyingSnowBall(const Vector& pos);
 
+  void initialize();
   void activate();
   void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
+
+  virtual FlyingSnowBall* clone() const { return new FlyingSnowBall(*this); }
+
 protected:
-  enum FlyingSnowballMode {
-    FLY_UP,
-    FLY_DOWN
-  };
-  FlyingSnowballMode mode;
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
 private:
-  Timer timer;
+  float normal_propeller_speed;
   Timer puff_timer; /**< time until the next smoke puff is spawned */
 };
 
 #endif
-