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

diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp
index 5a027a0f2..bdbaa5e9a 100644
--- a/src/object/oneup.cpp
+++ b/src/object/oneup.cpp
@@ -1,46 +1,54 @@
+//  $Id$
+//
+//  SuperTux
+//  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
+//  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 "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)
+OneUp::OneUp(const Vector& pos, Direction direction)
+	: 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((direction == LEFT)?-100:100, -400);
 }
 
 void
-OneUp::action(float elapsed_time)
+OneUp::update(float elapsed_time)
 {
-  movement = physic.get_movement(elapsed_time); 
-}
+  if(!Sector::current()->inside(bbox))
+    remove_me();
 
-void
-OneUp::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  movement = physic.get_movement(elapsed_time);
 }
 
 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()->add_coins(100);
     remove_me();
     return ABORT_MOVE;
   }
   return FORCE_MOVE;
 }
-