-// 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)
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "badguy/flame.hpp"
+
+#include <math.h>
+
+#include "audio/sound_manager.hpp"
+#include "math/random_generator.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "object/sprite_particle.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
+
+static const std::string FLAME_SOUND = "sounds/flame.wav";
+
+Flame::Flame(const Reader& reader) :
+ BadGuy(reader, "images/creatures/flame/flame.sprite", LAYER_FLOATINGOBJECTS),
+ angle(0),
+ radius(100),
+ speed(2),
+ light(0.0f,0.0f,0.0f),
+ lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-small.sprite")),
+ sound_source()