X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fflower.cpp;h=d07f71f4fe23f00325f88ef9bb9f5e2def821867;hb=eb87b07de097463cf91cf76be9bbc6b9fc0cad98;hp=d4805553b59ea2182230ee9f4d8747d375c66cb2;hpb=9599042661b468aae7bd34dca05441c0ebc93ad7;p=supertux.git

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index d4805553b..d07f71f4f 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -1,3 +1,22 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  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>
@@ -6,8 +25,7 @@
 #include "camera.h"
 #include "sector.h"
 #include "player.h"
-#include "app/globals.h"
-#include "special/sprite_manager.h"
+#include "sprite/sprite_manager.h"
 
 Flower::Flower(const Vector& pos, Type _type)
   : type(_type)
@@ -45,10 +63,11 @@ Flower::collision(GameObject& other, const CollisionHit& )
     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;
-  SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
+    player->set_bonus(ICE_BONUS, true);
+  
+  sound_manager->play_sound("fire-flower");
   remove_me();
   return ABORT_MOVE;
 }