Bonusblock and Bricks now break themself when hit by MrIceblock or Snail.

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

diff --git a/src/badguy/sspiky.hpp b/src/badguy/sspiky.hpp
index b3a28ec..d99629d 100644 (file)
--- a/src/badguy/sspiky.hpp
+++ b/src/badguy/sspiky.hpp
@@ -1,7 +1,7 @@
-//  $Id: sspiky.hpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
+//  $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,38 +12,36 @@
 //  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.
 
 #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;
+  virtual SSpiky* clone() const { return new SSpiky(*this); }
 
+protected:
   enum SSpikyState {
     SSPIKY_SLEEPING,
     SSPIKY_WAKING,
     SSPIKY_WALKING
   };
   SSpikyState state;
-  
 };
 
 #endif