X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fsspiky.cpp;h=013d8347f0cb5dd23f143ffce9bf6b529bf79dff;hb=1f5ff04e5283398473b4ac033258b17af0ed08f0;hp=c81ea1d7978e0494ee102b3e20ab72da90704d13;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/badguy/sspiky.cpp b/src/badguy/sspiky.cpp
index c81ea1d79..013d8347f 100644
--- a/src/badguy/sspiky.cpp
+++ b/src/badguy/sspiky.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
@@ -14,32 +12,23 @@
 //  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.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "sspiky.hpp"
+#include "badguy/sspiky.hpp"
 
-static const float WALKSPEED = 80;
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
-SSpiky::SSpiky(const lisp::Lisp& reader)
-	: WalkingBadguy(reader, "images/creatures/spiky/sleepingspiky.sprite", "left", "right"), state(SSPIKY_SLEEPING)
+SSpiky::SSpiky(const Reader& reader)
+  : WalkingBadguy(reader, "images/creatures/spiky/sleepingspiky.sprite", "left", "right"), state(SSPIKY_SLEEPING)
 {
-  walk_speed = WALKSPEED;
-  max_drop_height = -1;
+  walk_speed = 80;
+  max_drop_height = 600;
 }
 
 void
-SSpiky::write(lisp::Writer& writer)
-{
-  writer.start_list("sspiky");
-  WalkingBadguy::write(writer);
-  writer.end_list("sspiky");
-}
-
-void
-SSpiky::activate()
+SSpiky::initialize()
 {
   state = SSPIKY_SLEEPING;
   physic.set_velocity_x(0);
@@ -77,8 +66,8 @@ SSpiky::active_update(float elapsed_time) {
 
     Player* player = this->get_nearest_player();
     if (player) {
-      Rect mb = this->get_bbox();
-      Rect pb = player->get_bbox();
+      Rectf mb = this->get_bbox();
+      Rectf pb = player->get_bbox();
 
       bool inReach_left = (pb.p2.x >= mb.p2.x-((dir == LEFT) ? 256 : 0));
       bool inReach_right = (pb.p1.x <= mb.p1.x+((dir == RIGHT) ? 256 : 0));
@@ -99,11 +88,24 @@ SSpiky::active_update(float elapsed_time) {
     if(sprite->animation_done()) {
       // start walking
       state = SSPIKY_WALKING;
-      WalkingBadguy::activate();
+      WalkingBadguy::initialize();
     }
 
     BadGuy::active_update(elapsed_time);
   }
 }
 
-IMPLEMENT_FACTORY(SSpiky, "sspiky")
+void
+SSpiky::freeze()
+{
+  WalkingBadguy::freeze();
+  state = SSPIKY_WALKING; // if we get hit while sleeping, wake up :)
+}
+
+bool
+SSpiky::is_freezable() const
+{
+  return true;
+}
+
+/* EOF */