X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ffirefly.cpp;h=0077c9bd46f006dd1ac0459253048117cc1b3571;hb=64842a0700a2ee8a3d2d61ad2685217f5060985a;hp=81bb8f7851f4d828b504e0a0cb84462e26b93877;hpb=09e419eb998e216c01115d001e68aa556d501d2e;p=supertux.git

diff --git a/src/object/firefly.cpp b/src/object/firefly.cpp
index 81bb8f785..0077c9bd4 100644
--- a/src/object/firefly.cpp
+++ b/src/object/firefly.cpp
@@ -28,7 +28,7 @@
 #include "util/reader.hpp"
 
 Firefly::Firefly(const Reader& lisp) :
-   MovingSprite(lisp, "images/objects/resetpoints/default-resetpoint.sprite", LAYER_TILES, COLGROUP_TOUCHABLE), 
+   MovingSprite(lisp, "images/objects/resetpoints/default-resetpoint.sprite", LAYER_TILES, COLGROUP_TOUCHABLE),
    activated(false),
    initial_position()
 {
@@ -43,16 +43,16 @@ Firefly::Firefly(const Reader& lisp) :
     return;
   }
   //Replace sprite
-  sprite = sprite_manager->create( sprite_name );
+  sprite = SpriteManager::current()->create( sprite_name );
   bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
   reactivate();
 
   //Load sound
     if( sprite_name.find("vbell", 0) == std::string::npos ) {
-      sound_manager->preload("sounds/savebell_low.wav");
+      SoundManager::current()->preload("sounds/savebell_low.wav");
     }
     else {
-      sound_manager->preload("sounds/savebell2.wav");
+      SoundManager::current()->preload("sounds/savebell2.wav");
     }
 }
 
@@ -89,14 +89,14 @@ Firefly::collision(GameObject& other, const CollisionHit& )
       float vy = -cos(angle)*velocity;
       Vector pspeed = Vector(vx, vy);
       Vector paccel = Vector(0, 1000);
-      Sector::current()->add_object(new SpriteParticle("images/objects/particles/reset.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+      Sector::current()->add_object(std::make_shared<SpriteParticle>("images/objects/particles/reset.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
     }
 
     if( sprite_name.find("vbell", 0) == std::string::npos ) {
-      sound_manager->play("sounds/savebell2.wav");
+      SoundManager::current()->play("sounds/savebell2.wav");
     }
     else {
-      sound_manager->play("sounds/savebell_low.wav");
+      SoundManager::current()->play("sounds/savebell_low.wav");
     }
 
     sprite->set_action("ringing");