X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Foneup.cpp;h=313efdf77bead3bdebc441ab4e3acdf60a729ead;hb=495f8b77cb935fe8eff81bec755efca8e34e8a99;hp=0f2a410181bba11da1d7181f2e053c7562af3335;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp index 0f2a41018..313efdf77 100644 --- a/src/object/oneup.cpp +++ b/src/object/oneup.cpp @@ -3,7 +3,8 @@ #include "oneup.h" #include "resources.h" #include "player.h" -#include "scene.h" +#include "player_status.h" +#include "sector.h" #include "special/sprite_manager.h" #include "video/drawing_context.h" @@ -23,6 +24,9 @@ OneUp::~OneUp() void OneUp::action(float elapsed_time) { + if(!Sector::current()->inside(bbox)) + remove_me(); + movement = physic.get_movement(elapsed_time); } @@ -37,7 +41,7 @@ OneUp::collision(GameObject& other, const CollisionHit& ) { Player* player = dynamic_cast (&other); if(player) { - player->get_status().incLives(); + player->get_status()->incLives(); remove_me(); return ABORT_MOVE; }