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

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 78cb5b726..68e076892 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -23,61 +23,40 @@
 #include "bomb.hpp"
 #include "sprite/sprite_manager.hpp"
 
-static const float WALKSPEED = 80;
-
 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 = 0;
+
   //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::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 = 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()
-{
-  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());
-}
-
-void
-MrBomb::active_update(float elapsed_time)
-{
-  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);
-}
-
 bool
 MrBomb::collision_squished(Player& player)
 {
@@ -88,32 +67,6 @@ MrBomb::collision_squished(Player& player)
 }
 
 void
-MrBomb::collision_solid(const CollisionHit& hit)
-{
-  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());
-  }
-}
-
-HitResponse
-MrBomb::collision_badguy(BadGuy&, const CollisionHit& hit )
-{
-  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;
-}
-
-void
 MrBomb::kill_fall()
 {
   remove_me();