Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index 83845a6..0956160 100644 (file)
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -1,40 +1,72 @@
-#include <config.h>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "flame.h"
+#include "badguy/flame.hpp"
 
-Flame::Flame(LispReader& reader)
-  : angle(0), radius(100), speed(2)
+#include "audio/sound_manager.hpp"
+#include "lisp/lisp.hpp"
+#include "supertux/object_factory.hpp"
+
+#include <math.h>
+
+static const std::string SOUNDFILE = "sounds/flame.wav";
+
+Flame::Flame(const Reader& reader) :
+  BadGuy(reader, "images/creatures/flame/flame.sprite", LAYER_FLOATINGOBJECTS), 
+  angle(0), 
+  radius(100), 
+  speed(2),
+  sound_source()
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
-  reader.read_float("radius", radius);
-  reader.read_float("speed", speed);
+  reader.get("radius", radius);
+  reader.get("speed", speed);
   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");
+  countMe = false;
+  sound_manager->preload(SOUNDFILE);
+
+  set_colgroup_active(COLGROUP_TOUCHABLE);
 }
 
 void
-Flame::write(LispWriter& writer)
+Flame::active_update(float elapsed_time)
 {
-  writer.start_list("flame");
+  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();
 
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-  writer.write_float("radius", radius);
-  writer.write_float("speed", speed);
+  sound_source->set_position(get_pos());
+}
 
-  writer.end_list("flame");
+void
+Flame::activate()
+{
+  sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
+  sound_source->set_position(get_pos());
+  sound_source->set_looping(true);
+  sound_source->set_gain(2.0);
+  sound_source->set_reference_distance(32);
+  sound_source->play();
 }
 
 void
-Flame::active_action(float elapsed_time)
+Flame::deactivate()
 {
-  angle = fmodf(angle + elapsed_time * speed, 2*M_PI);
-  Vector newpos(start_position.x + cos(angle) * radius,
-                start_position.y + sin(angle) * radius);
-  movement = newpos - get_pos();
+  sound_source.reset();
 }
 
 void
@@ -42,3 +74,6 @@ Flame::kill_fall()
 {
 }
 
+IMPLEMENT_FACTORY(Flame, "flame");
+
+/* EOF */