X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Foneup.cpp;h=a0dc071043fee2cd14b1ed530466140b07035a16;hb=ae7bd4f460fdd93934fc0abc9589758a49309bda;hp=d449daf76bd4e75e029e2629f70cd2d13a02a481;hpb=15c5a91ee89272dfda3666e2fed67e06d650d0bf;p=supertux.git diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp index d449daf76..a0dc07104 100644 --- a/src/object/oneup.cpp +++ b/src/object/oneup.cpp @@ -24,12 +24,14 @@ #include "player.hpp" #include "player_status.hpp" #include "sector.hpp" +#include "level.hpp" +#include "statistics.hpp" #include "video/drawing_context.hpp" -OneUp::OneUp(const Vector& pos) - : MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE) +OneUp::OneUp(const Vector& pos, Direction direction) + : MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE) { - physic.set_velocity(100, 400); + physic.set_velocity((direction == LEFT)?-100:100, -400); } void @@ -38,7 +40,7 @@ OneUp::update(float elapsed_time) if(!Sector::current()->inside(bbox)) remove_me(); - movement = physic.get_movement(elapsed_time); + movement = physic.get_movement(elapsed_time); } HitResponse @@ -47,9 +49,12 @@ OneUp::collision(GameObject& other, const CollisionHit& ) Player* player = dynamic_cast (&other); if(player) { player->get_status()->add_coins(100); +#if 0 + // FIXME: do we want this? q.v. src/level.cpp + Sector::current()->get_level()->stats.coins += 100; +#endif remove_me(); return ABORT_MOVE; } return FORCE_MOVE; } -