X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fflower.hpp;h=e1c06acb4ecad3ab712d0182fc2b8edca161fb2d;hb=7e15c4f871809033278711a6e9327616da00c4c9;hp=637f1a98d26a0806bec94b1c83f99e604bbfcfe7;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/flower.hpp b/src/object/flower.hpp index 637f1a98d..e1c06acb4 100644 --- a/src/object/flower.hpp +++ b/src/object/flower.hpp @@ -22,15 +22,12 @@ #include "moving_object.hpp" #include "sprite/sprite.hpp" -#include "physic.hpp" +#include "player_status.hpp" class Flower : public MovingObject { public: - enum Type { - FIREFLOWER, ICEFLOWER - }; - Flower(Type type); + Flower(BonusType type); ~Flower(); virtual void update(float elapsed_time); @@ -38,9 +35,8 @@ public: virtual HitResponse collision(GameObject& other, const CollisionHit& hit); private: - Type type; + BonusType type; Sprite* sprite; }; #endif -