Reverted bigger parts of tuxdev patch:

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

diff --git a/src/badguy/stalactite.hpp b/src/badguy/stalactite.hpp
index ed221cb..ef48ede 100644 (file)
--- a/src/badguy/stalactite.hpp
+++ b/src/badguy/stalactite.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,11 +12,10 @@
 //  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
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __STALACTITE_H__
 #define __STALACTITE_H__
@@ -27,16 +26,18 @@ class Stalactite : public BadGuy
 {
 public:
   Stalactite(const lisp::Lisp& reader);
- 
+
   void active_update(float elapsed_time);
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
-  HitResponse collision_player(Player& player, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
+  HitResponse collision_player(Player& player);
 
   void kill_fall();
   void draw(DrawingContext& context);
   void deactivate();
 
+  virtual Stalactite* clone() const { return new Stalactite(*this); }
+
 protected:
   Timer timer;
 
@@ -50,4 +51,3 @@ protected:
 };
 
 #endif
-