X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fskullyhop.hpp;h=970ed93b8d3308b1d14fa4552113990724b05588;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=805cf354179ac117ec45af574bf27259fb81e12b;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git

diff --git a/src/badguy/skullyhop.hpp b/src/badguy/skullyhop.hpp
index 805cf3541..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
@@ -32,11 +32,11 @@ public:
   SkullyHop(const lisp::Lisp& reader);
   SkullyHop(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   void write(lisp::Writer& writer);
   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); }
@@ -55,4 +55,3 @@ protected:
 };
 
 #endif
-