grabbed = false;
//Prevent stutter when Tux jumps on Mr Bomb
- sound_manager->preload("sounds/explosion.wav");
+ SoundManager::current()->preload("sounds/explosion.wav");
//Check if we need another sprite
if( !reader.get( "sprite", sprite_name ) ){
return;
}
//Replace sprite
- sprite = sprite_manager->create( sprite_name );
+ sprite = SpriteManager::current()->create( sprite_name );
}
/* MrBomb created by a dispenser always gets default sprite atm.*/
walk_speed = 80;
max_drop_height = 16;
grabbed = false;
- sound_manager->preload("sounds/explosion.wav");
+ SoundManager::current()->preload("sounds/explosion.wav");
}
HitResponse
}
if(is_valid()) {
remove_me();
- Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
+ Sector::current()->add_object(std::make_shared<Bomb>(get_pos(), dir, sprite_name));
}
kill_squished(object);
return true;
{
if(is_valid()) {
remove_me();
- Explosion* explosion = new Explosion(get_bbox().get_middle());
+ auto explosion = std::make_shared<Explosion>(get_bbox().get_middle());
Sector::current()->add_object(explosion);
}
}
void
-MrBomb::grab(MovingObject&, const Vector& pos, Direction dir)
+MrBomb::grab(MovingObject&, const Vector& pos, Direction dir_)
{
assert(frozen);
movement = pos - get_pos();
- this->dir = dir;
- sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
+ 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)
+MrBomb::ungrab(MovingObject& , Direction dir_)
{
- this->dir = dir;
+ this->dir = dir_;
set_colgroup_active(COLGROUP_MOVING);
grabbed = false;
}