* Add Airship (regular above-ground theme) and Battle (castle/boss theme) music court...
[supertux.git] / src / badguy / skullyhop.cpp
index 2b086ea..258adec 100644 (file)
@@ -1,7 +1,7 @@
 //  $Id$
 //
 //  SkullyHop - A Hopping Skull
-//  Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
+//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
 
 #include "skullyhop.hpp"
 #include "random_generator.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "audio/sound_manager.hpp"
+#include "sprite/sprite.hpp"
 
 namespace {
   const float VERTICAL_SPEED = -450;   /**< y-speed when jumping */
@@ -31,13 +35,13 @@ namespace {
 }
 
 SkullyHop::SkullyHop(const lisp::Lisp& reader)
-       : BadGuy(reader, "images/creatures/skullyhop/skullyhop.sprite")
+        : BadGuy(reader, "images/creatures/skullyhop/skullyhop.sprite")
 {
   sound_manager->preload( HOP_SOUND );
 }
 
 SkullyHop::SkullyHop(const Vector& pos, Direction d)
-       : BadGuy(pos, d, "images/creatures/skullyhop/skullyhop.sprite")
+        : BadGuy(pos, d, "images/creatures/skullyhop/skullyhop.sprite")
 {
   sound_manager->preload( HOP_SOUND );
 }
@@ -46,13 +50,13 @@ void
 SkullyHop::write(lisp::Writer& writer)
 {
   writer.start_list("skullyhop");
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
+  writer.write("x", start_position.x);
+  writer.write("y", start_position.y);
   writer.end_list("skullyhop");
 }
 
 void
-SkullyHop::activate()
+SkullyHop::initialize()
 {
   // initial state is JUMPING, because we might start airborne
   state = JUMPING;