fixed a bug in my last effects removal, improved the algo to determine if a badguy...

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

diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp
index 5a027a0..bebe024 100644 (file)
--- a/src/object/oneup.cpp
+++ b/src/object/oneup.cpp
@@ -1,10 +1,31 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+
 #include <config.h>
 
 #include "oneup.h"
 #include "resources.h"
 #include "player.h"
-#include "scene.h"
-#include "special/sprite_manager.h"
+#include "player_status.h"
+#include "sector.h"
+#include "sprite/sprite_manager.h"
 #include "video/drawing_context.h"
 
 OneUp::OneUp(const Vector& pos)
@@ -23,6 +44,9 @@ OneUp::~OneUp()
 void
 OneUp::action(float elapsed_time)
 {
+  if(!Sector::current()->inside(bbox))
+    remove_me();
+
   movement = physic.get_movement(elapsed_time); 
 }
 
@@ -33,11 +57,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;
   }