X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.cpp;h=68e076892fc7b05cd3357fd627e466aae9a79a93;hb=7361e2120c8a5db222219e8b556c9efc8eda7bcc;hp=67722369b02e9674698f1223f46343bdf03d08ec;hpb=f342eab71dbf70aa5104df60d22a725924621289;p=supertux.git

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 67722369b..68e076892 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -21,100 +21,56 @@
 
 #include "mrbomb.hpp"
 #include "bomb.hpp"
-
-static const float WALKSPEED = 80;
+#include "sprite/sprite_manager.hpp"
 
 MrBomb::MrBomb(const lisp::Lisp& reader)
+	: WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/mr_bomb/mr_bomb.sprite");
-  set_direction = false;
+  walk_speed = 80;
+  max_drop_height = 0;
+
+  //Check if we need another sprite
+  if( !reader.get( "sprite", sprite_name ) ){
+    return;
+  }
+  if( sprite_name == "" ){
+    sprite_name = "images/creatures/mr_bomb/mr_bomb.sprite";
+    return;
+  }
+  //Replace sprite
+  sprite = sprite_manager->create( sprite_name );
 }
 
-MrBomb::MrBomb(float pos_x, float pos_y, Direction d)
+/* 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")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/mr_bomb/mr_bomb.sprite");
-  set_direction = true;
-  initial_direction = d;
+  walk_speed = 80;
+  max_drop_height = 0;
 }
 
 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()
-{
-  if (set_direction) {dir = initial_direction;}
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
-}
-
-void
-MrBomb::active_update(float elapsed_time)
-{
-  if (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);
-}
-
 bool
 MrBomb::collision_squished(Player& player)
 {
   remove_me();
-  Sector::current()->add_object(new Bomb(get_pos(), dir));
+  Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
   kill_squished(player);
   return true;
 }
 
-HitResponse
-MrBomb::collision_solid(GameObject& , const CollisionHit& hit)
-{
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
-    physic.set_velocity_y(0);
-  } else { // hit right or left
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
-
-  return CONTINUE;
-}
-
-HitResponse
-MrBomb::collision_badguy(BadGuy& , const CollisionHit& hit)
-{
-  if(fabsf(hit.normal.x) > .8) { // left or right
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");    
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
-
-  return CONTINUE;
-}
-
 void
 MrBomb::kill_fall()
 {
   remove_me();
-  Bomb* bomb = new Bomb(get_pos(), dir);
+  Bomb* bomb = new Bomb(get_pos(), dir, sprite_name );
   Sector::current()->add_object(bomb);
   bomb->explode();
 }