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

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index d4805553b..ec2462c70 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -1,24 +1,51 @@
+//  $Id$
+//
+//  SuperTux
+//  Copyright (C) 2006 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 "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 <assert.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(BonusType _type)
   : type(_type)
 {
-  bbox.set_pos(pos);
   bbox.set_size(32, 32);
 
-  if(_type == FIREFLOWER)
-    sprite = sprite_manager->create("fireflower");
-  else
-    sprite = sprite_manager->create("iceflower"); 
+  if(type == FIRE_BONUS) {
+    sprite = sprite_manager->create("images/powerups/fireflower/fireflower.sprite");
+    sound_manager->preload("sounds/fire-flower.wav");
+  }
+  else if(type == ICE_BONUS) {
+    sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
+    sound_manager->preload("sounds/fire-flower.wav");
+  } else {
+    assert(false);
+  }
+
+  set_group(COLGROUP_TOUCHABLE);
 }
 
 Flower::~Flower()
@@ -27,7 +54,7 @@ Flower::~Flower()
 }
 
 void
-Flower::action(float )
+Flower::update(float )
 {
 }
 
@@ -44,12 +71,10 @@ Flower::collision(GameObject& other, const CollisionHit& )
   if(!player)
     return ABORT_MOVE;
 
-  if(type == FIREFLOWER)
-    player->got_power = Player::FIRE_POWER;
-  else
-    player->got_power = Player::ICE_POWER;
-  SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
+  if(!player->add_bonus(type, true))
+    return FORCE_MOVE;
+
+  sound_manager->play("sounds/fire-flower.wav");
   remove_me();
   return ABORT_MOVE;
 }
-