stopped infoblocks from ringing, since they're not telephones anymore - code is only...

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

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 8235eb1..04623a9 100644 (file)
--- 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()