X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fskullyhop.hpp;h=970ed93b8d3308b1d14fa4552113990724b05588;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=13c7d0699308aac1e7d66df6d23f85280b2d05ca;hpb=58eb3364f724b2100859fd39da9bba5a9a09cafc;p=supertux.git

diff --git a/src/badguy/skullyhop.hpp b/src/badguy/skullyhop.hpp
index 13c7d0699..970ed93b8 100644
--- a/src/badguy/skullyhop.hpp
+++ b/src/badguy/skullyhop.hpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
 //  SkullyHop - A Hopping Skull
-//  Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
+//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -30,13 +30,13 @@ 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 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);
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
   void active_update(float elapsed_time);
 
   virtual SkullyHop* clone() const { return new SkullyHop(*this); }
@@ -48,9 +48,6 @@ protected:
     JUMPING
   };
 
-  bool has_initial_direction;
-  Direction initial_direction;  
-
   Timer recover_timer;
   SkullyHopState state;
 
@@ -58,4 +55,3 @@ protected:
 };
 
 #endif
-