merged new collision detection branch back into mainline

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

diff --git a/src/badguy/spidermite.cpp b/src/badguy/spidermite.cpp
index d8f6970..70feda7 100644 (file)
--- a/src/badguy/spidermite.cpp
+++ b/src/badguy/spidermite.cpp
@@ -23,23 +23,17 @@
 #include "spidermite.hpp"
 
 static const float FLYTIME = 1.2;
-static const float FLYSPEED = 100.0;
+static const float FLYSPEED = -100.0;
 
 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);
 }
 
@@ -71,14 +65,12 @@ SpiderMite::collision_squished(Player& player)
   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