fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/skullyhop.hpp b/src/badguy/skullyhop.hpp
index 13c7d06..1ceab05 100644 (file)
--- a/src/badguy/skullyhop.hpp
+++ b/src/badguy/skullyhop.hpp
@@ -30,11 +30,11 @@ class SkullyHop : public BadGuy
 {
 public:
   SkullyHop(const lisp::Lisp& reader);
-  SkullyHop(float pos_x, float pos_y, Direction d);
+  SkullyHop(const Vector& pos, Direction d);
 
   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);
   bool collision_squished(Player& player);
   void active_update(float elapsed_time);
@@ -48,9 +48,6 @@ protected:
     JUMPING
   };
 
-  bool has_initial_direction;
-  Direction initial_direction;  
-
   Timer recover_timer;
   SkullyHopState state;
 
@@ -58,4 +55,3 @@ protected:
 };
 
 #endif
-