X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fflower.cpp;h=aaccbb3eb8767f26c1192bb0e79a6e286b6dfd9b;hb=c1277f5b7db9f55d1d28f658b4e804f32b76f0ce;hp=8235eb13919a22394a1968aa02084a6cb804af52;hpb=ca7b29592acc3891b6b473a30824a70719d7b2a9;p=supertux.git

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 8235eb139..aaccbb3eb 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -1,47 +1,46 @@
-//  $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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  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 3 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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <math.h>
-#include "flower.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "audio/sound_manager.h"
-#include "sprite/sprite_manager.h"
+#include "audio/sound_manager.hpp"
+#include "object/flower.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite_manager.hpp"
 
-Flower::Flower(Type _type)
-  : type(_type)
+Flower::Flower(BonusType _type) :
+  type(_type),
+  sprite()
 {
   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()
 {
-  delete sprite;
 }
 
 void
@@ -62,13 +61,12 @@ 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);
-  
+  if(!player->add_bonus(type, true))
+    return FORCE_MOVE;
+
   sound_manager->play("sounds/fire-flower.wav");
   remove_me();
   return ABORT_MOVE;
 }
 
+/* EOF */