X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fflower.cpp;h=04623a983d6acbfcb2a0d4bba61fee787a20f086;hb=b158cdbc7139bcc35fd4c37a5cf640bf9f744998;hp=4f52a2ba2b969900ea6cdfb3ec4a1b262bb78bd7;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 4f52a2ba2..04623a983 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -17,28 +17,28 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
 #include <math.h>
-#include "flower.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "app/globals.h"
-#include "sprite/sprite_manager.h"
+#include "flower.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "player.hpp"
+#include "audio/sound_manager.hpp"
+#include "sprite/sprite_manager.hpp"
 
-Flower::Flower(const Vector& pos, Type _type)
+Flower::Flower(Type _type)
   : type(_type)
 {
-  bbox.set_pos(pos);
   bbox.set_size(32, 32);
 
   if(_type == FIREFLOWER)
-    sprite = sprite_manager->create("fireflower");
+    sprite = sprite_manager->create("images/powerups/fireflower/fireflower.sprite");
   else
-    sprite = sprite_manager->create("iceflower"); 
+    sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite"); 
+
+  set_group(COLGROUP_TOUCHABLE);
 }
 
 Flower::~Flower()
@@ -47,7 +47,7 @@ Flower::~Flower()
 }
 
 void
-Flower::action(float )
+Flower::update(float )
 {
 }
 
@@ -69,7 +69,7 @@ Flower::collision(GameObject& other, const CollisionHit& )
   else
     player->set_bonus(ICE_BONUS, true);
   
-  sound_manager->play_sound("fire-flower");
+  sound_manager->play("sounds/fire-flower.wav");
   remove_me();
   return ABORT_MOVE;
 }