X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.hpp;h=d82740ffdc29547109a8f7ace48f89c25b08cccb;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=7e78c52663f2db85e3ade92436df386e9ae234d1;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git diff --git a/src/badguy/flyingsnowball.hpp b/src/badguy/flyingsnowball.hpp index 7e78c5266..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,16 +37,10 @@ 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 */ }; #endif -