X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fspiky.cpp;h=8aceaae30f8c44328a7846254d4758236c6d4bbb;hb=4c9b57d29e67f9db5605f378549b07f670baa837;hp=c779faace3c93f744a1cc828767639a156793331;hpb=a705cb038b55f5d7634c646c134abaa7d16aee2b;p=supertux.git

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index c779faace..8aceaae30 100644
--- a/src/badguy/spiky.cpp
+++ b/src/badguy/spiky.cpp
@@ -1,24 +1,43 @@
+//  $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 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.
+
 #include <config.h>
 
-#include "spiky.h"
+#include "spiky.hpp"
 
 static const float WALKSPEED = 80;
 
-Spiky::Spiky(LispReader& reader)
+Spiky::Spiky(const lisp::Lisp& reader)
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
+  reader.get("x", start_position.x);
+  reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("spiky");
+  sprite = sprite_manager->create("images/creatures/spiky/spiky.sprite");
 }
 
 void
-Spiky::write(LispWriter& writer)
+Spiky::write(lisp::Writer& writer)
 {
   writer.start_list("spiky");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("spiky");
 }
@@ -30,6 +49,19 @@ Spiky::activate()
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
 
+void
+Spiky::active_update(float elapsed_time)
+{
+  BadGuy::active_update(elapsed_time);
+
+  if (might_fall(601))
+  {
+    dir = (dir == LEFT ? RIGHT : LEFT);
+    sprite->set_action(dir == LEFT ? "left" : "right");
+    physic.set_velocity_x(-physic.get_velocity_x());
+  }
+}
+
 HitResponse
 Spiky::collision_solid(GameObject& , const CollisionHit& hit)
 {
@@ -44,3 +76,16 @@ Spiky::collision_solid(GameObject& , const CollisionHit& hit)
   return CONTINUE;
 }
 
+HitResponse
+Spiky::collision_badguy(BadGuy& , const CollisionHit& hit)
+{
+  if(fabsf(hit.normal.x) > .8) { // left or right
+    dir = dir == LEFT ? RIGHT : LEFT;
+    sprite->set_action(dir == LEFT ? "left" : "right");
+    physic.set_velocity_x(-physic.get_velocity_x());
+  }
+
+  return CONTINUE;
+}
+
+IMPLEMENT_FACTORY(Spiky, "spiky")