fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/totem.hpp b/src/badguy/totem.hpp
index 8742025..89ef732 100644 (file)
--- a/src/badguy/totem.hpp
+++ b/src/badguy/totem.hpp
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  SuperTux - "Totem" Badguy
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
@@ -12,7 +12,7 @@
 //  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
@@ -36,7 +36,7 @@ public:
   void activate();
   void active_update(float elapsed_time);
   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);
 
   virtual Totem* clone() const { return new Totem(*this); }
@@ -56,4 +56,3 @@ protected:
 };
 
 #endif
-