X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Foneup.cpp;h=d449daf76bd4e75e029e2629f70cd2d13a02a481;hb=113cdbf07f441329690714a53a436503ab1d4b35;hp=d1296535607517397d13f02dc552bb69b731ccce;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp index d12965356..d449daf76 100644 --- a/src/object/oneup.cpp +++ b/src/object/oneup.cpp @@ -24,21 +24,12 @@ #include "player.hpp" #include "player_status.hpp" #include "sector.hpp" -#include "sprite/sprite_manager.hpp" #include "video/drawing_context.hpp" OneUp::OneUp(const Vector& pos) + : MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE) { - bbox.set_pos(pos); - bbox.set_size(32, 32); - sprite = sprite_manager->create("images/powerups/1up/1up.sprite"); physic.set_velocity(100, 400); - set_group(COLGROUP_TOUCHABLE); -} - -OneUp::~OneUp() -{ - delete sprite; } void @@ -50,12 +41,6 @@ OneUp::update(float elapsed_time) movement = physic.get_movement(elapsed_time); } -void -OneUp::draw(DrawingContext& context) -{ - sprite->draw(context, get_pos(), LAYER_OBJECTS); -} - HitResponse OneUp::collision(GameObject& other, const CollisionHit& ) {