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

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 435be0725..04623a983 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -1,25 +1,44 @@
+//  $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>
-#include "flower.h"
-#include "defines.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "app/globals.h"
-#include "special/sprite_manager.h"
-
-Flower::Flower(const Vector& pos, Type _type)
+#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)
 {
-  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()
@@ -28,7 +47,7 @@ Flower::~Flower()
 }
 
 void
-Flower::action(float )
+Flower::update(float )
 {
 }
 
@@ -46,10 +65,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("sounds/fire-flower.wav");
   remove_me();
   return ABORT_MOVE;
 }