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

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index a7f748214..32e3674e5 100644
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -1,32 +1,42 @@
+//  $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 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>
 
 #include <math.h>
-#include "growup.h"
-#include "defines.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "app/globals.h"
-#include "special/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);
 }
@@ -35,7 +45,7 @@ HitResponse
 GrowUp::collision(GameObject& other, const CollisionHit& hit)
 {
   if(other.get_flags() & FLAG_SOLID) {
-    if(fabsf(hit.normal.y) > .5) { // roof
+    if(fabsf(hit.normal.y) > .5) { // roof or ground
       physic.set_velocity_y(0);
     } else { // bumped left or right
       physic.set_velocity_x(-physic.get_velocity_x());
@@ -46,8 +56,8 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit)
   
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
-    player->grow();
-    SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT));
+    player->add_bonus(GROWUP_BONUS, true);
+    sound_manager->play("sounds/grow.wav");
     remove_me();
     
     return ABORT_MOVE;
@@ -56,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);
-}
-