X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fflower.cpp;h=71cacf2f87c1c5cea2ed81979dfe5613fd5357c8;hb=a98f7cee9f6a2593c0e1f3442800f159bad410df;hp=4f52a2ba2b969900ea6cdfb3ec4a1b262bb78bd7;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 4f52a2ba2..71cacf2f8 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,33 +12,39 @@
 //  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.
+//  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 "sprite/sprite_manager.h"
+#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(const Vector& pos, Type _type)
+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");
+  } else {
+    assert(false);
+  }
+
+  set_group(COLGROUP_TOUCHABLE);
 }
 
 Flower::~Flower()
@@ -47,7 +53,7 @@ Flower::~Flower()
 }
 
 void
-Flower::action(float )
+Flower::update(float )
 {
 }
 
@@ -64,13 +70,10 @@ Flower::collision(GameObject& other, const CollisionHit& )
   if(!player)
     return ABORT_MOVE;
 
-  if(type == FIREFLOWER)
-    player->set_bonus(FIRE_BONUS, true);
-  else
-    player->set_bonus(ICE_BONUS, true);
-  
-  sound_manager->play_sound("fire-flower");
+  if(!player->add_bonus(type, true))
+    return FORCE_MOVE;
+
+  sound_manager->play("sounds/fire-flower.wav");
   remove_me();
   return ABORT_MOVE;
 }
-