#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"
void
OneUp::action(float elapsed_time)
{
+ if(!Sector::current()->inside(bbox))
+ remove_me();
+
movement = physic.get_movement(elapsed_time);
}
{
Player* player = dynamic_cast<Player*> (&other);
if(player) {
- player->get_status().incLives();
+ player->get_status()->incLives();
remove_me();
return ABORT_MOVE;
}