X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Foneup.cpp;h=313efdf77bead3bdebc441ab4e3acdf60a729ead;hb=e8a1d89d3d0f4824d3d906ca67149afec0a75e4b;hp=5a027a0f28eb03c2dcdc7c7a220221ecc7c3cd40;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp
index 5a027a0f2..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); 
 }
 
@@ -33,11 +37,11 @@ OneUp::draw(DrawingContext& context)
 }
 
 HitResponse
-OneUp::collision(GameObject& other, const CollisionHit& hit)
+OneUp::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
-    player->get_status().incLives();
+    player->get_status()->incLives();
     remove_me();
     return ABORT_MOVE;
   }