Tuxdev's patch to fix death by falling when invincible.

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

diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp
index bebe024..3b45a63 100644 (file)
--- a/src/object/oneup.cpp
+++ b/src/object/oneup.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 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
@@ -12,37 +12,28 @@
 //  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.
+//  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 "player_status.h"
-#include "sector.h"
-#include "sprite/sprite_manager.h"
-#include "video/drawing_context.h"
+#include "oneup.hpp"
+#include "resources.hpp"
+#include "player.hpp"
+#include "player_status.hpp"
+#include "sector.hpp"
+#include "video/drawing_context.hpp"
 
 OneUp::OneUp(const Vector& pos)
+       : MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("1up");
-  physic.set_velocity(100, 400);
-}
-
-OneUp::~OneUp()
-{
-  delete sprite;
+  physic.set_velocity(100, -400);
 }
 
 void
-OneUp::action(float elapsed_time)
+OneUp::update(float elapsed_time)
 {
   if(!Sector::current()->inside(bbox))
     remove_me();
@@ -50,18 +41,12 @@ OneUp::action(float elapsed_time)
   movement = physic.get_movement(elapsed_time); 
 }
 
-void
-OneUp::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-
 HitResponse
 OneUp::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
-    player->get_status()->incLives();
+    player->get_status()->add_coins(100);
     remove_me();
     return ABORT_MOVE;
   }