Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp
index 0d867f1..d48b58d 100644 (file)
--- a/src/object/oneup.cpp
+++ b/src/object/oneup.cpp
@@ -1,44 +1,27 @@
-//  $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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  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 3 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 "player_status.h"
-#include "sector.h"
-#include "sprite/sprite_manager.h"
-#include "video/drawing_context.h"
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-OneUp::OneUp(const Vector& pos)
-{
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("1up");
-  physic.set_velocity(100, 400);
-}
+#include "object/oneup.hpp"
+#include "object/player.hpp"
+#include "supertux/sector.hpp"
 
-OneUp::~OneUp()
+OneUp::OneUp(const Vector& pos, Direction direction) :
+  MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE)
 {
-  delete sprite;
+  physic.set_velocity((direction == LEFT)?-100:100, -400);
 }
 
 void
@@ -47,13 +30,7 @@ OneUp::update(float elapsed_time)
   if(!Sector::current()->inside(bbox))
     remove_me();
 
-  movement = physic.get_movement(elapsed_time); 
-}
-
-void
-OneUp::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  movement = physic.get_movement(elapsed_time);
 }
 
 HitResponse
@@ -61,10 +38,15 @@ OneUp::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
-    player->get_status()->incLives();
+    player->get_status()->add_coins(100);
+#if 0
+    // FIXME: do we want this? q.v. src/level.cpp
+    Sector::current()->get_level()->stats.coins += 100;
+#endif
     remove_me();
     return ABORT_MOVE;
   }
   return FORCE_MOVE;
 }
 
+/* EOF */