* Add Airship (regular above-ground theme) and Battle (castle/boss theme) music court...

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

diff --git a/src/badguy/spidermite.cpp b/src/badguy/spidermite.cpp
index 70feda7..62998e1 100644 (file)
--- a/src/badguy/spidermite.cpp
+++ b/src/badguy/spidermite.cpp
@@ -22,17 +22,22 @@
 
 #include "spidermite.hpp"
 
-static const float FLYTIME = 1.2;
-static const float FLYSPEED = -100.0;
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+
+static const float FLYTIME = 1.2f;
+static const float FLYSPEED = -100.0f;
 
 SpiderMite::SpiderMite(const lisp::Lisp& reader)
-       : BadGuy(reader, "images/creatures/spidermite/spidermite.sprite")
+  : BadGuy(reader, "images/creatures/spidermite/spidermite.sprite")
 {
   physic.enable_gravity(false);
 }
 
 SpiderMite::SpiderMite(const Vector& pos)
-       : BadGuy(pos, "images/creatures/spidermite/spidermite.sprite")
+  : BadGuy(pos, "images/creatures/spidermite/spidermite.sprite")
 {
   physic.enable_gravity(false);
 }
@@ -42,14 +47,14 @@ SpiderMite::write(lisp::Writer& writer)
 {
   writer.start_list("spidermite");
 
-  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("spidermite");
 }
 
-void 
-SpiderMite::activate()
+void
+SpiderMite::initialize()
 {
   sprite->set_action(dir == LEFT ? "left" : "right");
   mode = FLY_UP;
@@ -58,10 +63,10 @@ SpiderMite::activate()
 }
 
 bool
-SpiderMite::collision_squished(Player& player)
+SpiderMite::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  kill_squished(player);
+  kill_squished(object);
   return true;
 }
 
@@ -74,7 +79,7 @@ SpiderMite::collision_solid(const CollisionHit& hit)
 }
 
 void
-SpiderMite::active_update(float elapsed_time) 
+SpiderMite::active_update(float elapsed_time)
 {
   if(timer.check()) {
     if(mode == FLY_UP) {