X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsspiky.hpp;h=b6a35ed84add4b978a0d56ee57b35d17bd6181d7;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=3a546f68c7c758658bc3670642263d3da675f7a0;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/badguy/sspiky.hpp b/src/badguy/sspiky.hpp
index 3a546f68c..b6a35ed84 100644
--- a/src/badguy/sspiky.hpp
+++ b/src/badguy/sspiky.hpp
@@ -20,29 +20,31 @@
 #ifndef __SSPIKY_H__
 #define __SSPIKY_H__
 
-#include "badguy.hpp"
+#include "walking_badguy.hpp"
 
-class SSpiky : public BadGuy
+class SSpiky : public WalkingBadguy
 {
 public:
   SSpiky(const lisp::Lisp& reader);
 
-  void activate();
+  void initialize();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);
 
-protected:
-  Timer timer;
+  void freeze();
+  bool is_freezable() const;
+
+  virtual SSpiky* clone() const { return new SSpiky(*this); }
 
+protected:
   enum SSpikyState {
     SSPIKY_SLEEPING,
     SSPIKY_WAKING,
     SSPIKY_WALKING
   };
   SSpikyState state;
-  
 };
 
 #endif