X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Foneup.cpp;h=d1296535607517397d13f02dc552bb69b731ccce;hb=2bfc38ef3208dee885452cfa59a7c7df671eb24d;hp=668bbe28af94a6551b9e96274830d82386b91d2f;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp index 668bbe28a..d12965356 100644 --- a/src/object/oneup.cpp +++ b/src/object/oneup.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // 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 @@ -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 (&other); if(player) { - player->get_status()->incLives(); + player->get_status()->add_coins(100); remove_me(); return ABORT_MOVE; }