-Worldmap cleanups (use DrawingContext transformstack)

[supertux.git] / src / object / oneup.cpp

diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp
index 5a027a0..313efdf 100644 (file)
--- 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;
   }