X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fflame.cpp;h=8f035a7f436cc1dc192c87f4a88e2e8019c85c87;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=390656f28ecff0019935b09c10c212973b35b13e;hpb=b51f8f420a99f380d9389bdd7a020b9a33a72820;p=supertux.git

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index 390656f28..8f035a7f4 100644
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -33,6 +33,8 @@ Flame::Flame(const lisp::Lisp& reader)
                       start_position.y + sin(angle) * radius));
   countMe = false;
   sound_manager->preload(SOUNDFILE);
+
+  set_colgroup_active(COLGROUP_TOUCHABLE);
 }
 
 void
@@ -51,7 +53,7 @@ Flame::write(lisp::Writer& writer)
 void
 Flame::active_update(float elapsed_time)
 {
-  angle = fmodf(angle + elapsed_time * speed, 2*M_PI);
+  angle = fmodf(angle + elapsed_time * speed, (float) (2*M_PI));
   Vector newpos(start_position.x + cos(angle) * radius,
                 start_position.y + sin(angle) * radius);
   movement = newpos - get_pos();
@@ -62,8 +64,6 @@ Flame::active_update(float elapsed_time)
 void
 Flame::activate()
 {
-  set_group(COLGROUP_TOUCHABLE);
-
   sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
   sound_source->set_position(get_pos());
   sound_source->set_looping(true);
@@ -75,7 +75,7 @@ Flame::activate()
 void
 Flame::deactivate()
 {
-  sound_source.release();
+  sound_source.reset();
 }
 
 void
@@ -84,4 +84,3 @@ Flame::kill_fall()
 }
 
 IMPLEMENT_FACTORY(Flame, "flame")
-