Fixed flame-caused segfault when sound is off

SVN-Revision: 2917

diff --git a/src/audio/sound_manager.hpp b/src/audio/sound_manager.hpp
index 5415b70..b39162b 100644 (file)
--- a/src/audio/sound_manager.hpp
+++ b/src/audio/sound_manager.hpp
@@ -41,6 +41,8 @@ public:
   void enable_music(bool music_enabled);
   void play_music(const std::string& filename, bool fade = false);
   void stop_music(bool fade = true);
+  
+  bool is_sound_enabled() { return sound_enabled; }
 
   void update();
 

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index f43b69a..1c03b35 100644 (file)
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -62,12 +62,16 @@ 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) {