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

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 8c68307a9..04623a983 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -20,13 +20,13 @@
 #include <config.h>
 
 #include <math.h>
-#include "flower.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "audio/sound_manager.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(Type _type)
   : type(_type)
@@ -34,9 +34,11 @@ Flower::Flower(Type _type)
   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()
@@ -67,7 +69,7 @@ Flower::collision(GameObject& other, const CollisionHit& )
   else
     player->set_bonus(ICE_BONUS, true);
   
-  sound_manager->play("fire-flower");
+  sound_manager->play("sounds/fire-flower.wav");
   remove_me();
   return ABORT_MOVE;
 }