X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgrowup.cpp;h=32e3674e587a0cd36eeb07055a95ba8e2122bc60;hb=0787a91b484e283316770f19896a4406090450d7;hp=948955dce11de0e96a7a120f64ba7a9a1b613a9d;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 948955dce..32e3674e5 100644
--- a/src/object/growup.cpp
+++ b/src/object/growup.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,40 +12,31 @@
 //  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 "growup.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "app/globals.h"
-#include "sprite/sprite_manager.h"
+#include "growup.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "player.hpp"
+#include "audio/sound_manager.hpp"
 
-GrowUp::GrowUp(const Vector& pos)
+GrowUp::GrowUp()
+	: MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  
-  sprite = sprite_manager->create("egg");
   physic.enable_gravity(true);
   physic.set_velocity_x(100);
-}
-
-GrowUp::~GrowUp()
-{
-  delete sprite;
+  sound_manager->preload("sounds/grow.wav");
 }
 
 void
-GrowUp::action(float elapsed_time)
+GrowUp::update(float elapsed_time)
 {
   movement = physic.get_movement(elapsed_time);
 }
@@ -65,8 +56,8 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit)
   
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
-    player->set_bonus(GROWUP_BONUS, true);
-    sound_manager->play_sound("grow");
+    player->add_bonus(GROWUP_BONUS, true);
+    sound_manager->play("sounds/grow.wav");
     remove_me();
     
     return ABORT_MOVE;
@@ -75,9 +66,3 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit)
   return FORCE_MOVE;
 }
 
-void
-GrowUp::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-