dispenser can now drop random badguys

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

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 8230f76..d406592 100644 (file)
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -2,7 +2,6 @@
 
 #include <math.h>
 #include "flower.h"
-#include "defines.h"
 #include "resources.h"
 #include "camera.h"
 #include "sector.h"
@@ -39,16 +38,17 @@ Flower::draw(DrawingContext& context)
 }
 
 HitResponse
-Flower::collision(GameObject& other, const CollisionHit& hit)
+Flower::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*>(&other);
   if(!player)
     return ABORT_MOVE;
 
   if(type == FIREFLOWER)
-    player->got_power = Player::FIRE_POWER;
+    player->set_bonus(FIRE_BONUS, true);
   else
-    player->got_power = Player::ICE_POWER;
+    player->set_bonus(ICE_BONUS, true);
+  
   SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
   remove_me();
   return ABORT_MOVE;