Rolled back bomb to old behaviour, some bomb gfx tuning

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

diff --git a/src/badguy/spidermite.cpp b/src/badguy/spidermite.cpp
index 70feda7..8ea7e74 100644 (file)
--- a/src/badguy/spidermite.cpp
+++ b/src/badguy/spidermite.cpp
@@ -22,8 +22,8 @@
 
 #include "spidermite.hpp"
 
-static const float FLYTIME = 1.2;
-static const float FLYSPEED = -100.0;
+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")
@@ -48,8 +48,8 @@ SpiderMite::write(lisp::Writer& writer)
   writer.end_list("spidermite");
 }
 
-void 
-SpiderMite::activate()
+void
+SpiderMite::initialize()
 {
   sprite->set_action(dir == LEFT ? "left" : "right");
   mode = FLY_UP;
@@ -58,10 +58,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 +74,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) {