Getting rid of nasty tabs

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

diff --git a/src/badguy/skullyhop.cpp b/src/badguy/skullyhop.cpp
index 8bf61d7..6de656e 100644 (file)
--- a/src/badguy/skullyhop.cpp
+++ b/src/badguy/skullyhop.cpp
@@ -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
@@ -25,19 +25,19 @@
 namespace {
   const float VERTICAL_SPEED = -450;   /**< y-speed when jumping */
   const float HORIZONTAL_SPEED = 220; /**< x-speed when jumping */
-  const float MIN_RECOVER_TIME = 0.1; /**< minimum time to stand still before starting a (new) jump */
-  const float MAX_RECOVER_TIME = 1.0; /**< maximum time to stand still before starting a (new) jump */
+  const float MIN_RECOVER_TIME = 0.1f; /**< minimum time to stand still before starting a (new) jump */
+  const float MAX_RECOVER_TIME = 1.0f; /**< maximum time to stand still before starting a (new) jump */
   static const std::string HOP_SOUND = "sounds/hop.ogg";
 }
 
 SkullyHop::SkullyHop(const lisp::Lisp& reader)
-       : BadGuy(reader, "images/creatures/skullyhop/skullyhop.sprite")
+        : BadGuy(reader, "images/creatures/skullyhop/skullyhop.sprite")
 {
   sound_manager->preload( HOP_SOUND );
 }
 
 SkullyHop::SkullyHop(const Vector& pos, Direction d)
-       : BadGuy(pos, d, "images/creatures/skullyhop/skullyhop.sprite")
+        : BadGuy(pos, d, "images/creatures/skullyhop/skullyhop.sprite")
 {
   sound_manager->preload( HOP_SOUND );
 }
@@ -52,7 +52,7 @@ SkullyHop::write(lisp::Writer& writer)
 }
 
 void
-SkullyHop::activate()
+SkullyHop::initialize()
 {
   // initial state is JUMPING, because we might start airborne
   state = JUMPING;