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

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index 7a71c3df0..8aceaae30 100644
--- a/src/badguy/spiky.cpp
+++ b/src/badguy/spiky.cpp
@@ -1,7 +1,7 @@
 //  $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,15 +12,14 @@
 //  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 "spiky.h"
+#include "spiky.hpp"
 
 static const float WALKSPEED = 80;
 
@@ -29,7 +28,7 @@ Spiky::Spiky(const lisp::Lisp& reader)
   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
@@ -50,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)
 {