Tux can peek to the left and to the right as far as the camera would move in best...

[supertux.git] / src / object / flower.cpp

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 9c2ac91..4e4c878 100644 (file)
--- 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,11 +12,11 @@
 //  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>
@@ -33,10 +33,12 @@ Flower::Flower(Type _type)
 {
   bbox.set_size(32, 32);
 
-  if(_type == FIREFLOWER)
-    sprite = sprite_manager->create("fireflower");
+  if(_type == FIREFLOWER){
+    sprite = sprite_manager->create("images/powerups/fireflower/fireflower.sprite");
+    sound_manager->preload("sounds/fire-flower.wav");
+  }
   else
-    sprite = sprite_manager->create("iceflower"); 
+    sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite"); 
 
   set_group(COLGROUP_TOUCHABLE);
 }
@@ -65,9 +67,9 @@ Flower::collision(GameObject& other, const CollisionHit& )
     return ABORT_MOVE;
 
   if(type == FIREFLOWER)
-    player->set_bonus(FIRE_BONUS, true);
+    player->add_bonus(FIRE_BONUS, true);
   else
-    player->set_bonus(ICE_BONUS, true);
+    player->add_bonus(ICE_BONUS, true);
   
   sound_manager->play("sounds/fire-flower.wav");
   remove_me();