Rewrote Yeti to rely on position instead of ellapsed time

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

diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp
index 668bbe2..d129653 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,11 +12,10 @@
 //  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>
 
@@ -32,8 +31,9 @@ OneUp::OneUp(const Vector& pos)
 {
   bbox.set_pos(pos);
   bbox.set_size(32, 32);
-  sprite = sprite_manager->create("1up");
+  sprite = sprite_manager->create("images/powerups/1up/1up.sprite");
   physic.set_velocity(100, 400);
+  set_group(COLGROUP_TOUCHABLE);
 }
 
 OneUp::~OneUp()
@@ -61,7 +61,7 @@ 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;
   }