X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fflame.cpp;h=66ce6d3167fc4d3843543deb49c7b60caa028721;hb=575ee7830c331b48172dccacc7a96188f8d6695b;hp=d061f676f3def7d51db4edb87588a63c7fa3b12f;hpb=d4020fbad1a693156ae5ad310fdcf0f90e3f315f;p=supertux.git

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index d061f676f..66ce6d316 100644
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -30,13 +30,12 @@
 static const std::string FLAME_SOUND = "sounds/flame.wav";
 
 Flame::Flame(const Reader& reader) :
-  BadGuy(reader, "images/creatures/flame/flame.sprite", LAYER_FLOATINGOBJECTS), 
-  angle(0), 
-  radius(100), 
+  BadGuy(reader, "images/creatures/flame/flame.sprite", LAYER_FLOATINGOBJECTS),
+  angle(0),
+  radius(100),
   speed(2),
-  fading(false),
   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")),
   sound_source()
 {
   reader.get("radius", radius);
@@ -44,10 +43,10 @@ Flame::Flame(const Reader& reader) :
   bbox.set_pos(Vector(start_position.x + cos(angle) * radius,
                       start_position.y + sin(angle) * radius));
   countMe = false;
-  sound_manager->preload(FLAME_SOUND);
+  SoundManager::current()->preload(FLAME_SOUND);
 
   set_colgroup_active(COLGROUP_TOUCHABLE);
-  
+
   lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
   lightsprite->set_color(Color(0.21f, 0.13f, 0.08f));
 }
@@ -61,9 +60,8 @@ Flame::active_update(float elapsed_time)
   movement = newpos - get_pos();
 
   sound_source->set_position(get_pos());
-  
-  if(fading)
-    if (sprite->animation_done()) remove_me();
+
+  if (sprite->get_action() == "fade" && sprite->animation_done()) remove_me();
 }
 
 void
@@ -87,7 +85,7 @@ Flame::draw(DrawingContext& context)
 void
 Flame::activate()
 {
-  sound_source.reset(sound_manager->create_sound_source(FLAME_SOUND));
+  sound_source = SoundManager::current()->create_sound_source(FLAME_SOUND);
   sound_source->set_position(get_pos());
   sound_source->set_looping(true);
   sound_source->set_gain(2.0);
@@ -110,15 +108,11 @@ Flame::kill_fall()
 void
 Flame::freeze()
 {
-  //TODO: get unique death sound
-  sound_manager->play("sounds/fizz.wav", get_pos());
+  SoundManager::current()->play("sounds/sizzle.ogg", get_pos());
   sprite->set_action("fade", 1);
-  Vector ppos = bbox.get_middle();
-  Vector pspeed = Vector(0, -150);
-  Vector paccel = Vector(0,0);
-  Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_BACKGROUNDTILES+2));
-  fading = true;
-  
+  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));
+  set_group(COLGROUP_DISABLED);
+
   // start dead-script
   run_dead_script();
 }