X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fbomb.cpp;h=75dcf4299f9b2be0ebe8e6da0a76ac249bf0fbd6;hb=ea2a9a4bba9669442ea0fe2f9f4323b13dfa1e07;hp=5327515ab62b47adff1232f7911dbbb971b3f85a;hpb=38105c22495d9439b30221732dd5d7b89f328a0c;p=supertux.git

diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp
index 5327515ab..75dcf4299 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,17 +12,21 @@
 //  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 "random_generator.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"
 
-Bomb::Bomb(const Vector& pos, Direction dir, std::string custom_sprite /*= "images/creatures/mr_bomb/mr_bomb.sprite"*/ )
-        : BadGuy( pos, dir, custom_sprite )
+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()
 {
   state = STATE_TICKING;
   set_action(dir == LEFT ? "ticking-left" : "ticking-right", 1);
@@ -38,30 +40,13 @@ Bomb::Bomb(const Vector& pos, Direction dir, std::string custom_sprite /*= "imag
   ticking->play();
 }
 
-Bomb::Bomb(const Bomb& other)
-        : BadGuy(other), state(other.state)
-{
-  if (state == STATE_TICKING) {
-    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();
-  }
-}
-
-void
-Bomb::write(lisp::Writer& )
-{
-  // bombs are only temporarily so don't write them out...
-}
-
 void
 Bomb::collision_solid(const CollisionHit& hit)
 {
   if(hit.bottom)
     physic.set_velocity_y(0);
+
+  update_on_ground_flag(hit);
 }
 
 HitResponse
@@ -77,12 +62,15 @@ Bomb::collision_badguy(BadGuy& , const CollisionHit& )
 }
 
 void
-Bomb::active_update(float )
+Bomb::active_update(float elapsed_time)
 {
   ticking->set_position(get_pos());
   if(sprite->animation_done()) {
     explode();
   }
+  else if (!grabbed) {
+    movement = physic.get_movement(elapsed_time);
+  }
 }
 
 void
@@ -90,9 +78,21 @@ Bomb::explode()
 {
   ticking->stop();
 
-  remove_me();
-  Explosion* explosion = new Explosion(get_bbox().get_middle());
-  Sector::current()->add_object(explosion);
+  // 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();
+    Explosion* explosion = new Explosion(get_bbox().get_middle());
+    Sector::current()->add_object(explosion);
+  }
 
   run_dead_script();
 }
@@ -102,3 +102,30 @@ Bomb::kill_fall()
 {
   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
+  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 */