fix collision against spikes too wide, fix paths, try to fix jumping on badguys that...

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

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index 7e98cb4..da6c026 100644 (file)
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -17,13 +17,13 @@
 //  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.h"
+#include "flame.hpp"
+#include "msg.hpp"
 
 Flame::Flame(const lisp::Lisp& reader)
-  : angle(0), radius(100), speed(2)
+  : angle(0), radius(100), speed(2), source(0)
 {
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
@@ -32,7 +32,13 @@ 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;
+}
+
+Flame::~Flame()
+{
+  delete source;
 }
 
 void
@@ -55,6 +61,35 @@ Flame::active_update(float elapsed_time)
   Vector newpos(start_position.x + cos(angle) * radius,
                 start_position.y + sin(angle) * radius);
   movement = newpos - 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) {
+    msg_warning("Couldn't start flame sound");
+    return;
+  }
+  source->set_position(get_pos());
+  source->set_looping(true);
+  source->set_gain(2.0);
+  source->set_reference_distance(32);
+  source->play();
+}
+
+void
+Flame::deactivate()
+{
+  delete source;
+  source = 0;
 }
 
 void