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

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 4ebe6fbf5..1ed824001 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -23,14 +23,18 @@
 #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_bomb/mr_bomb.sprite", "left", "right")
+  : 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;
@@ -43,13 +47,14 @@ MrBomb::MrBomb(const lisp::Lisp& reader)
   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_bomb/mr_bomb.sprite", "left", "right")
+  : 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
@@ -110,7 +115,7 @@ MrBomb::grab(MovingObject&, const Vector& pos, Direction dir)
   movement = pos - get_pos();
   this->dir = dir;
   sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
-  set_group(COLGROUP_DISABLED);
+  set_colgroup_active(COLGROUP_DISABLED);
   grabbed = true;
 }
 
@@ -118,7 +123,7 @@ void
 MrBomb::ungrab(MovingObject& , Direction dir)
 {
   this->dir = dir;
-  set_group(COLGROUP_MOVING);
+  set_colgroup_active(COLGROUP_MOVING);
   grabbed = false;
 }