fade out console

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

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index f43b69a..b3f3fa3 100644 (file)
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -17,10 +17,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
 #include "flame.hpp"
+#include "log.hpp"
 
 Flame::Flame(const lisp::Lisp& reader)
   : angle(0), radius(100), speed(2), source(0)
@@ -32,7 +32,7 @@ Flame::Flame(const lisp::Lisp& reader)
   bbox.set_pos(Vector(start_position.x + cos(angle) * radius,
                       start_position.y + sin(angle) * radius));
   bbox.set_size(32, 32);  
-  sprite = sprite_manager->create("flame");
+  sprite = sprite_manager->create("images/creatures/flame/flame.sprite");
   countMe = false;
 }
 
@@ -62,16 +62,20 @@ Flame::active_update(float elapsed_time)
                 start_position.y + sin(angle) * radius);
   movement = newpos - get_pos();
 
-  source->set_position(get_pos());
+  if (sound_manager->is_sound_enabled())
+    source->set_position(get_pos());
 }
 
 void
 Flame::activate()
 {
+  if (!sound_manager->is_sound_enabled())
+    return;
+
   delete source;
   source = sound_manager->create_sound_source("sounds/flame.wav");
   if(!source) {
-    std::cerr << "Couldn't start flame sound.\n";
+    log_warning << "Couldn't start flame sound" << std::endl;
     return;
   }
   source->set_position(get_pos());