X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.cpp;h=215284299242581480207b63aeb8a09784722106;hb=2fd963388c2dae6a30f82c99b679a73e8bc5917d;hp=76222d28fa27aaeae2b81b1bae0e6352641c4c70;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 76222d28f..215284299 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -29,8 +29,8 @@ MrBomb::write(lisp::Writer& writer)
 {
   writer.start_list("mrbomb");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("mrbomb");
 }
@@ -48,7 +48,7 @@ MrBomb::collision_squished(Player& player)
 {
   remove_me();
   Sector::current()->add_object(new Bomb(get_pos(), dir));
-  player.bounce(*this);
+  kill_squished(player);
   return true;
 }
 
@@ -66,3 +66,14 @@ MrBomb::collision_solid(GameObject& , const CollisionHit& hit)
   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;
+}