converted ghost forest music to .ogg because of problems playing the mod file

[supertux.git] / src / object / flower.h

diff --git a/src/object/flower.h b/src/object/flower.h
index 8aa68cb..e91f38b 100644 (file)
--- a/src/object/flower.h
+++ b/src/object/flower.h
@@ -17,15 +17,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #ifndef __FLOWER_H__
 #define __FLOWER_H__
 
 #include "moving_object.h"
 #include "sprite/sprite.h"
-#include "math/physic.h"
-
-using namespace SuperTux;
+#include "physic.h"
 
 class Flower : public MovingObject
 {
@@ -33,10 +30,10 @@ public:
   enum Type {
     FIREFLOWER, ICEFLOWER
   };
-  Flower(const Vector& pos, Type type);
+  Flower(Type type);
   ~Flower();
 
-  virtual void action(float elapsed_time);
+  virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);