X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgrowup.cpp;h=32e3674e587a0cd36eeb07055a95ba8e2122bc60;hb=0787a91b484e283316770f19896a4406090450d7;hp=3b413e430f921a6e519c002dfddc6ed48bb8472e;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/growup.cpp b/src/object/growup.cpp index 3b413e430..32e3674e5 100644 --- a/src/object/growup.cpp +++ b/src/object/growup.cpp @@ -26,21 +26,13 @@ #include "sector.hpp" #include "player.hpp" #include "audio/sound_manager.hpp" -#include "sprite/sprite_manager.hpp" GrowUp::GrowUp() + : MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING) { - bbox.set_size(32, 32); - - sprite = sprite_manager->create("images/powerups/egg/egg.sprite"); physic.enable_gravity(true); physic.set_velocity_x(100); - set_group(COLGROUP_MOVING); -} - -GrowUp::~GrowUp() -{ - delete sprite; + sound_manager->preload("sounds/grow.wav"); } void @@ -64,7 +56,7 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit) Player* player = dynamic_cast(&other); if(player != 0) { - player->set_bonus(GROWUP_BONUS, true); + player->add_bonus(GROWUP_BONUS, true); sound_manager->play("sounds/grow.wav"); remove_me(); @@ -74,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); -} -