argh, clean out copy

[supertux.git] / src / badguy / sspiky.hpp

diff --git a/src/badguy/sspiky.hpp b/src/badguy/sspiky.hpp
index 3a546f6..8e346cd 100644 (file)
--- 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 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