X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fobject%2Fflower.cpp;h=aaccbb3eb8767f26c1192bb0e79a6e286b6dfd9b;hb=c1277f5b7db9f55d1d28f658b4e804f32b76f0ce;hp=71cacf2f87c1c5cea2ed81979dfe5613fd5357c8;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 71cacf2f8..aaccbb3eb 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -1,12 +1,10 @@
-//  $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 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
@@ -14,23 +12,16 @@
 //  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 <assert.h>
-#include "flower.hpp"
-#include "resources.hpp"
-#include "camera.hpp"
-#include "sector.hpp"
-#include "player.hpp"
 #include "audio/sound_manager.hpp"
+#include "object/flower.hpp"
+#include "object/player.hpp"
 #include "sprite/sprite_manager.hpp"
 
-Flower::Flower(BonusType _type)
-  : type(_type)
+Flower::Flower(BonusType _type) :
+  type(_type),
+  sprite()
 {
   bbox.set_size(32, 32);
 
@@ -40,6 +31,7 @@ Flower::Flower(BonusType _type)
   }
   else if(type == ICE_BONUS) {
     sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
+    sound_manager->preload("sounds/fire-flower.wav");
   } else {
     assert(false);
   }
@@ -49,7 +41,6 @@ Flower::Flower(BonusType _type)
 
 Flower::~Flower()
 {
-  delete sprite;
 }
 
 void
@@ -77,3 +68,5 @@ Flower::collision(GameObject& other, const CollisionHit& )
   remove_me();
   return ABORT_MOVE;
 }
+
+/* EOF */