X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.hpp;h=d82740ffdc29547109a8f7ace48f89c25b08cccb;hb=788a9153f60fb3d25a52fd184387ebbde7636719;hp=9b244347c3045787ccafbab379071d2c3e5f61ed;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/badguy/flyingsnowball.hpp b/src/badguy/flyingsnowball.hpp index 9b244347c..d82740ffd 100644 --- a/src/badguy/flyingsnowball.hpp +++ b/src/badguy/flyingsnowball.hpp @@ -28,6 +28,7 @@ public: FlyingSnowBall(const lisp::Lisp& reader); FlyingSnowBall(const Vector& pos); + void initialize(); void activate(); void write(lisp::Writer& writer); void active_update(float elapsed_time); @@ -36,14 +37,9 @@ public: 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 */ };