Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/badguy/spidermite.cpp b/src/badguy/spidermite.cpp
index e9584f7..a608033 100644 (file)
--- a/src/badguy/spidermite.cpp
+++ b/src/badguy/spidermite.cpp
@@ -1,62 +1,46 @@
-//  $Id: flyingsnowball.cpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
-#include <stdio.h>
+#include "badguy/spidermite.hpp"
 
-#include "spidermite.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.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)
+SpiderMite::SpiderMite(const Reader& reader) :
+  BadGuy(reader, "images/creatures/spidermite/spidermite.sprite"),
+  mode(),
+  timer()
 {
-  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"), 
+  mode(),
+  timer()
 {
-  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);
 }
 
 void
-SpiderMite::write(lisp::Writer& writer)
-{
-  writer.start_list("spidermite");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("spidermite");
-}
-
-void 
-SpiderMite::activate()
+SpiderMite::initialize()
 {
   sprite->set_action(dir == LEFT ? "left" : "right");
   mode = FLY_UP;
@@ -65,25 +49,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) {
@@ -104,4 +86,6 @@ SpiderMite::active_update(float elapsed_time)
   }
 }
 
-IMPLEMENT_FACTORY(SpiderMite, "spidermite")
+IMPLEMENT_FACTORY(SpiderMite, "spidermite");
+
+/* EOF */