X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fbomb.cpp;h=86ef0e7283d9b9098bcd8004d3fde29da3fdc638;hb=9eab9403c2b9ff629c07380e8d5f1032d21bd3f7;hp=ac8491fb585fa2e3a8c6ced5ecba8126424845c6;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp
index ac8491fb5..86ef0e728 100644
--- a/src/badguy/bomb.cpp
+++ b/src/badguy/bomb.cpp
@@ -1,12 +1,10 @@
-//  $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
@@ -14,94 +12,121 @@
 //  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 "bomb.hpp"
+#include "audio/sound_manager.hpp"
+#include "badguy/bomb.hpp"
+#include "object/explosion.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/sector.hpp"
 
-static const float TICKINGTIME = 1;
-static const float EXPLOSIONTIME = 1;
-
-Bomb::Bomb(const Vector& pos, Direction dir)
+Bomb::Bomb(const Vector& pos, Direction dir_, std::string custom_sprite /*= "images/creatures/mr_bomb/mr_bomb.sprite"*/ ) :
+  BadGuy( pos, dir_, custom_sprite ),
+  state(),
+  grabbed(false),
+  grabber(NULL),
+  ticking()
 {
-  start_position = pos;
-  bbox.set_pos(pos);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/mr_bomb/bomb.sprite");
   state = STATE_TICKING;
-  timer.start(TICKINGTIME);
-  this->dir = dir;
-  sprite->set_action(dir == LEFT ? "ticking-left" : "ticking-right");
+  set_action(dir_ == LEFT ? "ticking-left" : "ticking-right", 1);
   countMe = false;
 
-  set_group(COLGROUP_TOUCHABLE);
+  ticking = SoundManager::current()->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();
 }
 
 void
-Bomb::write(lisp::Writer& )
-{
-  // bombs are only temporarily so don't write them out...
-}
-
-HitResponse
-Bomb::collision_solid(GameObject& , const CollisionHit& hit)
+Bomb::collision_solid(const CollisionHit& hit)
 {
-  if(fabsf(hit.normal.y) > .5)
+  if(hit.bottom)
     physic.set_velocity_y(0);
 
-  return CONTINUE;
+  update_on_ground_flag(hit);
 }
 
 HitResponse
-Bomb::collision_player(Player& player, const CollisionHit& )
+Bomb::collision_player(Player& , const CollisionHit& )
 {
-  if(state == STATE_EXPLODING) {
-    player.kill(Player::SHRINK);
-  }
   return ABORT_MOVE;
 }
 
 HitResponse
-Bomb::collision_badguy(BadGuy& badguy, const CollisionHit& )
+Bomb::collision_badguy(BadGuy& , const CollisionHit& )
 {
-  if(state == STATE_EXPLODING)
-    badguy.kill_fall();
   return ABORT_MOVE;
 }
 
 void
-Bomb::active_update(float )
+Bomb::active_update(float elapsed_time)
 {
-  switch(state) {
-    case STATE_TICKING:
-      if(timer.check()) {
-        explode();
-      }
-      break;
-    case STATE_EXPLODING:
-      if(timer.check()) {
-        remove_me();
-      }
-      break;
-  } 
+  ticking->set_position(get_pos());
+  if(sprite->animation_done()) {
+    explode();
+  }
+  else if (!grabbed) {
+    movement = physic.get_movement(elapsed_time);
+  }
 }
 
 void
 Bomb::explode()
 {
-  state = STATE_EXPLODING;
-  set_group(COLGROUP_TOUCHABLE);
-  sprite->set_action("explosion");
-  sound_manager->play("sounds/explosion.wav", get_pos());
-  timer.start(EXPLOSIONTIME);
+  ticking->stop();
+
+  // Make the player let go before we explode, otherwise the player is holding
+  // an invalid object. There's probably a better way to do this than in the
+  // Bomb class.
+  if (grabber != NULL) {
+    Player* player = dynamic_cast<Player*>(grabber);
+
+    if (player)
+      player->stop_grabbing();
+  }
+
+  if(is_valid()) {
+    remove_me();
+    auto explosion = std::make_shared<Explosion>(get_bbox().get_middle());
+    Sector::current()->add_object(explosion);
+  }
+
+  run_dead_script();
 }
 
 void
 Bomb::kill_fall()
 {
-  if (state != STATE_EXPLODING)  // we don't want it exploding again
-    explode();
+  explode();
+}
+
+void
+Bomb::grab(MovingObject& object, const Vector& pos, Direction dir_)
+{
+  movement = pos - get_pos();
+  this->dir = dir_;
+
+  // We actually face the opposite direction of Tux here to make the fuse more
+  // visible instead of hiding it behind Tux
+  sprite->set_action_continued(dir == LEFT ? "ticking-right" : "ticking-left");
+  set_colgroup_active(COLGROUP_DISABLED);
+  grabbed = true;
+  grabber = &object;
+}
+
+void
+Bomb::ungrab(MovingObject& object, Direction dir_)
+{
+  this->dir = dir_;
+  // portable objects are usually pushed away from Tux when dropped, but we
+  // don't want that, so we set the position
+  //FIXME: why don't we want that? shouldn't behavior be consistent?
+  set_pos(object.get_pos() + Vector(dir_ == LEFT ? -16 : 16, get_bbox().get_height()*0.66666 - 32));
+  set_colgroup_active(COLGROUP_MOVING);
+  grabbed = false;
 }
 
+/* EOF */