-// $Id$
-//
// SuperTux
// 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
// 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>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "mrbomb.hpp"
+#include "audio/sound_manager.hpp"
+#include "badguy/bomb.hpp"
+#include "badguy/mrbomb.hpp"
#include "object/explosion.hpp"
+#include "sprite/sprite.hpp"
#include "sprite/sprite_manager.hpp"
-#include "audio/sound_manager.hpp"
-#include "level.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
-namespace {
- const float TICKING_TIME = 1.0f; /**< delay until ticking MrBomb explodes */
-}
-
-MrBomb::MrBomb(const lisp::Lisp& reader)
- : WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
+MrBomb::MrBomb(const Reader& reader) :
+ WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right"),
+ grabbed()
{
walk_speed = 80;
max_drop_height = 16;
grabbed = false;
+ //Prevent stutter when Tux jumps on Mr Bomb
sound_manager->preload("sounds/explosion.wav");
- ticking.reset(sound_manager->create_sound_source("sounds/fizz.wav"));
- ticking->set_position(get_pos());
- ticking->set_looping(true);
- ticking->set_gain(2.0);
- ticking->set_reference_distance(32);
-
- state = STATE_IDLE;
-
//Check if we need another sprite
if( !reader.get( "sprite", sprite_name ) ){
return;
sprite = sprite_manager->create( sprite_name );
}
-/* MrBomb created by a despencer always gets default sprite atm.*/
-MrBomb::MrBomb(const Vector& pos, Direction d)
- : WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
+/* MrBomb created by a dispenser always gets default sprite atm.*/
+MrBomb::MrBomb(const Vector& pos, Direction d) :
+ WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right"),
+ grabbed()
{
walk_speed = 80;
max_drop_height = 16;
grabbed = false;
sound_manager->preload("sounds/explosion.wav");
-
- state = STATE_IDLE;
-
- ticking.reset(sound_manager->create_sound_source("sounds/fizz.wav"));
- ticking->set_position(get_pos());
- ticking->set_looping(true);
- ticking->set_gain(2.0);
- ticking->set_reference_distance(32);
-}
-
-void
-MrBomb::write(lisp::Writer& writer)
-{
- writer.start_list("mrbomb");
- WalkingBadguy::write(writer);
- writer.end_list("mrbomb");
}
HitResponse
bool
MrBomb::collision_squished(GameObject& object)
{
- if(frozen) unfreeze();
- Player* player = dynamic_cast<Player*>(&object);
- if (player) {
- player->bounce(*this);
- }
- if (state == STATE_IDLE) {
- if (player && countMe) Sector::current()->get_level()->stats.badguys++;
- state = STATE_TICKING;
-
- // TODO: currently we need to re-create ticking sound object every time, in case we had to stop it
- ticking.reset(sound_manager->create_sound_source("sounds/fizz.wav"));
- ticking->set_position(get_pos());
- ticking->set_looping(true);
- ticking->set_gain(2.0);
- ticking->set_reference_distance(32);
-
- ticking->play();
- ticking_timer.start(TICKING_TIME);
- walk_left_action = "ticking-left";
- walk_right_action = "ticking-right";
- sprite->set_action(dir == LEFT ? walk_left_action : walk_right_action);
+ if(is_valid()) {
+ remove_me();
+ Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
}
+ kill_squished(object);
return true;
}
void
MrBomb::active_update(float elapsed_time)
{
- if (state == STATE_TICKING) {
- ticking->set_position(get_pos());
- if(ticking_timer.check()) {
- explode();
- }
- }
if(grabbed)
return;
WalkingBadguy::active_update(elapsed_time);
}
void
-MrBomb::explode()
-{
- ticking->stop();
-
- remove_me();
- Explosion* explosion = new Explosion(get_bbox().get_middle());
- Sector::current()->add_object(explosion);
-
- run_dead_script();
-}
-
-void
MrBomb::kill_fall()
{
- remove_me();
- Explosion* explosion = new Explosion(get_bbox().get_middle());
- Sector::current()->add_object(explosion);
+ if(is_valid()) {
+ remove_me();
+ Explosion* explosion = new Explosion(get_bbox().get_middle());
+ Sector::current()->add_object(explosion);
+ }
run_dead_script();
}
{
WalkingBadguy::freeze();
sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
- if (state == STATE_TICKING) {
- ticking_timer.stop();
- ticking->stop();
- walk_left_action = "left";
- walk_right_action = "right";
- state = STATE_IDLE;
- }
-}
-
-void
-MrBomb::unfreeze()
-{
- WalkingBadguy::unfreeze();
}
bool
return frozen;
}
-IMPLEMENT_FACTORY(MrBomb, "mrbomb")
+IMPLEMENT_FACTORY(MrBomb, "mrbomb");
+
+/* EOF */
projects / supertux.git / blobdiff