X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fspidermite.cpp;h=2c5bbf1d7ebefc0ff249290b1c2b949b6d26871f;hb=65a0b6f7ec1123cff959e13e1a4919dc70fe4e85;hp=e9584f7d2e9c889ea1f6aea2f0c86438578f6388;hpb=0d9d5685bf4d2308364dcff501f188295b71891c;p=supertux.git

diff --git a/src/badguy/spidermite.cpp b/src/badguy/spidermite.cpp
index e9584f7d2..2c5bbf1d7 100644
--- a/src/badguy/spidermite.cpp
+++ b/src/badguy/spidermite.cpp
@@ -1,7 +1,7 @@
-//  $Id: flyingsnowball.cpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
+//  $Id$
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,35 +12,28 @@
 //  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, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 #include <stdio.h>
 
 #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")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/spidermite/spidermite.sprite");
   physic.enable_gravity(false);
 }
 
-SpiderMite::SpiderMite(float pos_x, float pos_y)
+SpiderMite::SpiderMite(const Vector& pos)
+  : BadGuy(pos, "images/creatures/spidermite/spidermite.sprite")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/spidermite/spidermite.sprite");
   physic.enable_gravity(false);
 }
 
@@ -49,14 +42,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;
@@ -65,25 +58,23 @@ 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;
 }
 
-HitResponse
-SpiderMite::collision_solid(GameObject& , const CollisionHit& hit)
+void
+SpiderMite::collision_solid(const CollisionHit& hit)
 {
-  if(fabsf(hit.normal.y) > 1.5) { // hit floor or roof?
+  if(hit.top || hit.bottom) { // hit floor or roof?
     physic.set_velocity_y(0);
   }
-
-  return CONTINUE;
 }
 
 void
-SpiderMite::active_update(float elapsed_time) 
+SpiderMite::active_update(float elapsed_time)
 {
   if(timer.check()) {
     if(mode == FLY_UP) {