X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fblock.cpp;h=6d0c5f4a650dad77e045289e45f4e11a873ce57f;hb=2bfc38ef3208dee885452cfa59a7c7df671eb24d;hp=82f3104884d707fcd467a31390af2a6da65e4434;hpb=e6a940db5904743e8220491ce10b5107e119a44c;p=supertux.git diff --git a/src/object/block.cpp b/src/object/block.cpp index 82f310488..6d0c5f4a6 100644 --- a/src/object/block.cpp +++ b/src/object/block.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,11 @@ // 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 #include "block.hpp" @@ -204,7 +204,7 @@ BonusBlock::hit(Player& ) void BonusBlock::try_open() { - if(sprite->get_action_name() == "empty") { + if(sprite->get_action() == "empty") { sound_manager->play("sounds/brick.wav"); return; } @@ -214,7 +214,7 @@ BonusBlock::try_open() switch(contents) { case CONTENT_COIN: Sector::current()->add_object(new BouncyCoin(get_pos())); - player.get_status()->incCoins(); + player.get_status()->add_coins(1); break; case CONTENT_FIREGROW: @@ -282,7 +282,7 @@ Brick::Brick(const Vector& pos, int data) void Brick::hit(Player& ) { - if(sprite->get_action_name() == "empty") + if(sprite->get_action() == "empty") return; try_break(true); @@ -291,7 +291,7 @@ Brick::hit(Player& ) void Brick::try_break(bool playerhit) { - if(sprite->get_action_name() == "empty") + if(sprite->get_action() == "empty") return; sound_manager->play("sounds/brick.wav"); @@ -300,7 +300,7 @@ Brick::try_break(bool playerhit) if(coin_counter > 0) { sector->add_object(new BouncyCoin(get_pos())); coin_counter--; - player.get_status()->incCoins(); + player.get_status()->add_coins(1); if(coin_counter == 0) sprite->set_action("empty"); start_bounce();