X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbomb.cpp;h=614bb18d7a1988a2eb32ea60d208c6684c322935;hb=147634cda2b097cf34753268ef83849fce379292;hp=6f884f1093270004278c152bfea67a0af9912a0f;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp index 6f884f109..614bb18d7 100644 --- a/src/badguy/bomb.cpp +++ b/src/badguy/bomb.cpp @@ -1,3 +1,23 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2005 Matthias Braun +// +// 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 #include "bomb.h" @@ -9,7 +29,7 @@ Bomb::Bomb(const Vector& pos, Direction dir) { start_position = pos; bbox.set_pos(pos); - bbox.set_size(32, 32); + bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("bomb"); state = 0; timer.start(TICKINGTIME); @@ -18,7 +38,7 @@ Bomb::Bomb(const Vector& pos, Direction dir) } void -Bomb::write(LispWriter& ) +Bomb::write(lisp::Writer& ) { // bombs are only temporarily so don't write them out... } @@ -41,15 +61,21 @@ Bomb::collision_player(Player& player, const CollisionHit& ) return ABORT_MOVE; } +HitResponse +Bomb::collision_badguy(BadGuy& badguy, const CollisionHit& ) +{ + if(state == 1) + badguy.kill_fall(); + return ABORT_MOVE; +} + void Bomb::active_action(float ) { switch(state) { case 0: if(timer.check()) { - state = 1; - sprite->set_action("explosion"); - timer.start(EXPLOSIONTIME); + explode(); } break; case 1: @@ -61,6 +87,18 @@ Bomb::active_action(float ) } void +Bomb::explode() +{ + state = 1; + sprite->set_action("explosion"); + sound_manager->play_sound("explosion", get_pos(), + Sector::current()->player->get_pos()); + timer.start(EXPLOSIONTIME); +} + +void Bomb::kill_fall() { + explode(); } +