X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.cpp;h=1ed824001a1603fcc673b8fe5912b391d6b72f81;hb=2d1bc69993923150eb701d3cacb917ab4e23d5ef;hp=78cb5b7261f7b54fca6029a3f0dd901c85ffcc72;hpb=34c5787d09b5d56664c13173dbafb6242a3d4e65;p=supertux.git

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 78cb5b726..1ed824001 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -21,105 +21,129 @@
 
 #include "mrbomb.hpp"
 #include "bomb.hpp"
+#include "object/explosion.hpp"
 #include "sprite/sprite_manager.hpp"
-
-static const float WALKSPEED = 80;
+#include "audio/sound_manager.hpp"
 
 MrBomb::MrBomb(const lisp::Lisp& reader)
-	: BadGuy(reader, "images/creatures/mr_cherry/mr_cherry.sprite")
+  : WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
 {
+  walk_speed = 80;
+  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)
-	: BadGuy(pos, d, "images/creatures/mr_cherry/mr_cherry.sprite")
+  : WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
 {
+  walk_speed = 80;
+  max_drop_height = 16;
+  grabbed = false;
+  sound_manager->preload("sounds/explosion.wav");
 }
 
 void
 MrBomb::write(lisp::Writer& writer)
 {
   writer.start_list("mrbomb");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
+  WalkingBadguy::write(writer);
   writer.end_list("mrbomb");
 }
 
-void
-MrBomb::activate()
+HitResponse
+MrBomb::collision(GameObject& object, const CollisionHit& hit)
 {
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
+  if(grabbed)
+    return FORCE_MOVE;
+  return WalkingBadguy::collision(object, hit);
 }
 
-void
-MrBomb::active_update(float elapsed_time)
+HitResponse
+MrBomb::collision_player(Player& player, const CollisionHit& hit)
 {
-  if (on_ground() && might_fall())
-  {
-    dir = (dir == LEFT ? RIGHT : LEFT);
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
-
-  BadGuy::active_update(elapsed_time);
+  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::collision_solid(const CollisionHit& hit)
+MrBomb::active_update(float elapsed_time)
 {
-  update_on_ground_flag(hit);
-  
-  if(hit.bottom || hit.top) {
-    physic.set_velocity_y(0);
-  }
-  if(hit.left || hit.right) {
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
+  if(grabbed)
+    return;
+  WalkingBadguy::active_update(elapsed_time);
 }
 
-HitResponse
-MrBomb::collision_badguy(BadGuy&, const CollisionHit& hit )
+void
+MrBomb::kill_fall()
 {
-  if(hit.left || hit.right) {
-    dir = (dir == LEFT) ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());               
-  }
-  return CONTINUE;
+  remove_me();
+  Explosion* explosion = new Explosion(get_bbox().get_middle());
+  Sector::current()->add_object(explosion);
+
+  run_dead_script();
 }
 
 void
-MrBomb::kill_fall()
+MrBomb::grab(MovingObject&, const Vector& pos, Direction dir)
 {
-  remove_me();
-  Bomb* bomb = new Bomb(get_pos(), dir, sprite_name );
-  Sector::current()->add_object(bomb);
-  bomb->explode();
+  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")