Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/badguy/stalactite.hpp b/src/badguy/stalactite.hpp
index bf9484b..b396fbc 100644 (file)
--- a/src/badguy/stalactite.hpp
+++ b/src/badguy/stalactite.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,43 +12,42 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __STALACTITE_H__
-#define __STALACTITE_H__
+#ifndef HEADER_SUPERTUX_BADGUY_STALACTITE_HPP
+#define HEADER_SUPERTUX_BADGUY_STALACTITE_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class Stalactite : public BadGuy
 {
 public:
-  Stalactite(const lisp::Lisp& reader);
+  Stalactite(const Reader& reader);
 
   void active_update(float elapsed_time);
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
-  HitResponse collision_player(Player& player);
+  HitResponse collision_player(Player& player, const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
 
   void kill_fall();
   void draw(DrawingContext& context);
   void deactivate();
 
-  virtual Stalactite* clone() const { return new Stalactite(*this); }
-
   void squish();
 
 protected:
-  Timer timer;
-
   enum StalactiteState {
     STALACTITE_HANGING,
     STALACTITE_SHAKING,
     STALACTITE_FALLING,
     STALACTITE_SQUISHED
   };
+
+protected:
+  Timer timer;
   StalactiteState state;
 };
 
 #endif
+
+/* EOF */