X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.cpp;h=1ed824001a1603fcc673b8fe5912b391d6b72f81;hb=38105c22495d9439b30221732dd5d7b89f328a0c;hp=61bc9d95e8641d3ae0dcc70fdfa31c6744202afb;hpb=ff59adfe9b44e1447ae02a2f9705d695a280059e;p=supertux.git

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 61bc9d95e..1ed824001 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -21,32 +21,40 @@
 
 #include "mrbomb.hpp"
 #include "bomb.hpp"
+#include "object/explosion.hpp"
 #include "sprite/sprite_manager.hpp"
+#include "audio/sound_manager.hpp"
 
 MrBomb::MrBomb(const lisp::Lisp& reader)
-	: WalkingBadguy(reader, "images/creatures/mr_cherry/mr_cherry.sprite", "left", "right")
+  : WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
 {
   walk_speed = 80;
-  max_drop_height = 0;
+  max_drop_height = 16;
+  grabbed = false;
+
+  //Prevent stutter when Tux jumps on Mr Bomb
+  sound_manager->preload("sounds/explosion.wav");
 
   //Check if we need another sprite
   if( !reader.get( "sprite", sprite_name ) ){
     return;
   }
   if( sprite_name == "" ){
-    sprite_name = "images/creatures/mr_cherry/mr_cherry.sprite";
+    sprite_name = "images/creatures/mr_bomb/mr_bomb.sprite";
     return;
   }
-  //Replace sprite 
+  //Replace sprite
   sprite = sprite_manager->create( sprite_name );
 }
 
-/* MrBomb created by a despencer always gets default sprite atm.*/
+/* MrBomb created by a dispenser always gets default sprite atm.*/
 MrBomb::MrBomb(const Vector& pos, Direction d)
-	: WalkingBadguy(pos, d, "images/creatures/mr_cherry/mr_cherry.sprite", "left", "right")
+  : WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
 {
   walk_speed = 80;
-  max_drop_height = 0;
+  max_drop_height = 16;
+  grabbed = false;
+  sound_manager->preload("sounds/explosion.wav");
 }
 
 void
@@ -57,22 +65,85 @@ MrBomb::write(lisp::Writer& writer)
   writer.end_list("mrbomb");
 }
 
+HitResponse
+MrBomb::collision(GameObject& object, const CollisionHit& hit)
+{
+  if(grabbed)
+    return FORCE_MOVE;
+  return WalkingBadguy::collision(object, hit);
+}
+
+HitResponse
+MrBomb::collision_player(Player& player, const CollisionHit& hit)
+{
+  if(grabbed)
+    return FORCE_MOVE;
+  return WalkingBadguy::collision_player(player, hit);
+}
+
 bool
-MrBomb::collision_squished(Player& player)
+MrBomb::collision_squished(GameObject& object)
 {
   remove_me();
   Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
-  kill_squished(player);
+  kill_squished(object);
   return true;
 }
 
 void
+MrBomb::active_update(float elapsed_time)
+{
+  if(grabbed)
+    return;
+  WalkingBadguy::active_update(elapsed_time);
+}
+
+void
 MrBomb::kill_fall()
 {
   remove_me();
-  Bomb* bomb = new Bomb(get_pos(), dir, sprite_name );
-  Sector::current()->add_object(bomb);
-  bomb->explode();
+  Explosion* explosion = new Explosion(get_bbox().get_middle());
+  Sector::current()->add_object(explosion);
+
+  run_dead_script();
+}
+
+void
+MrBomb::grab(MovingObject&, const Vector& pos, Direction dir)
+{
+  assert(frozen);
+  movement = pos - get_pos();
+  this->dir = dir;
+  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
+  set_colgroup_active(COLGROUP_DISABLED);
+  grabbed = true;
+}
+
+void
+MrBomb::ungrab(MovingObject& , Direction dir)
+{
+  this->dir = dir;
+  set_colgroup_active(COLGROUP_MOVING);
+  grabbed = false;
+}
+
+void
+MrBomb::freeze()
+{
+  WalkingBadguy::freeze();
+  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
+}
+
+bool
+MrBomb::is_freezable() const
+{
+  return true;
+}
+
+bool
+MrBomb::is_portable() const
+{
+  return frozen;
 }
 
 IMPLEMENT_FACTORY(MrBomb, "mrbomb")