Fixed compiler warning

[supertux.git] / src / badguy / iceflame.cpp

diff --git a/src/badguy/iceflame.cpp b/src/badguy/iceflame.cpp
index 7160036..be51c78 100644 (file)
--- a/src/badguy/iceflame.cpp
+++ b/src/badguy/iceflame.cpp
@@ -28,25 +28,25 @@
 #include "util/reader.hpp"
 
 Iceflame::Iceflame(const Reader& reader) :
-  BadGuy(reader, "images/creatures/flame/iceflame.sprite", LAYER_FLOATINGOBJECTS), 
-  angle(0), 
-  radius(100), 
+  BadGuy(reader, "images/creatures/flame/iceflame.sprite", LAYER_FLOATINGOBJECTS),
+  angle(0),
+  radius(100),
   speed(2),
   light(0.0f,0.0f,0.0f),
-  lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
 {
   reader.get("radius", radius);
   reader.get("speed", speed);
   bbox.set_pos(Vector(start_position.x + cos(angle) * radius,
                       start_position.y + sin(angle) * radius));
   countMe = false;
-  sound_manager->preload("sounds/sizzle.ogg");
-  
+  SoundManager::current()->preload("sounds/sizzle.ogg");
+
   set_colgroup_active(COLGROUP_TOUCHABLE);
-  
+
   lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
   lightsprite->set_color(Color(0.00f, 0.13f, 0.18f));
-  
+
 }
 
 void
@@ -56,7 +56,7 @@ Iceflame::active_update(float elapsed_time)
   Vector newpos(start_position.x + cos(angle) * radius,
                 start_position.y + sin(angle) * radius);
   movement = newpos - get_pos();
-  
+
   if (sprite->get_action() == "fade" && sprite->animation_done()) remove_me();
 }
 
@@ -86,9 +86,13 @@ Iceflame::kill_fall()
 void
 Iceflame::ignite()
 {
-  sound_manager->play("sounds/sizzle.ogg", get_pos());
+  SoundManager::current()->play("sounds/sizzle.ogg", get_pos());
   sprite->set_action("fade", 1);
-  Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", bbox.get_middle(), ANCHOR_MIDDLE, Vector(0, -150), Vector(0,0), LAYER_BACKGROUNDTILES+2));
+  Sector::current()->add_object(std::make_shared<SpriteParticle>("images/objects/particles/smoke.sprite",
+                                                                 "default",
+                                                                 bbox.get_middle(), ANCHOR_MIDDLE,
+                                                                 Vector(0, -150), Vector(0,0),
+                                                                 LAYER_BACKGROUNDTILES+2));
   set_group(COLGROUP_DISABLED);
 
   // start dead-script