- fix a bunch of msvc warnings (mostly assigning double constants to float variables)

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

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index 19211d2..7f8d356 100644 (file)
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -25,7 +25,7 @@
 static const std::string SOUNDFILE = "sounds/flame.wav";
 
 Flame::Flame(const lisp::Lisp& reader)
-  : BadGuy(reader, "images/creatures/flame/flame.sprite", LAYER_FLOATINGOBJECTS), angle(0), radius(100), speed(2), sound_source(0)
+  : BadGuy(reader, "images/creatures/flame/flame.sprite", LAYER_FLOATINGOBJECTS), angle(0), radius(100), speed(2)
 {
   reader.get("radius", radius);
   reader.get("speed", speed);
@@ -51,7 +51,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();
@@ -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")
-