X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fstumpy.hpp;h=37b0dc3c4900a49574a01d8c6b5d5e66d4d6d4e8;hb=75fc1b8f0bd2cc8ba9f448678d46db1e882b40a9;hp=a3bd2038bd346cd0cf37360fa3a7ccc3c4dfddd3;hpb=fd282d4799cb88eae93e471f5c055f9dc3f12b86;p=supertux.git

diff --git a/src/badguy/stumpy.hpp b/src/badguy/stumpy.hpp
index a3bd2038b..37b0dc3c4 100644
--- a/src/badguy/stumpy.hpp
+++ b/src/badguy/stumpy.hpp
@@ -1,12 +1,10 @@
-//  $Id: stumpy.hpp 3980 2006-07-10 19:55:56Z sommer $
-//
 //  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,37 +12,39 @@
 //  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 __STUMPY_H__
-#define __STUMPY_H__
+#ifndef HEADER_SUPERTUX_BADGUY_STUMPY_HPP
+#define HEADER_SUPERTUX_BADGUY_STUMPY_HPP
 
-#include "walking_badguy.hpp"
+#include "badguy/walking_badguy.hpp"
 
 class Stumpy : public WalkingBadguy
 {
 public:
-  Stumpy(const lisp::Lisp& reader);
+  Stumpy(const Reader& reader);
   Stumpy(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   void active_update(float elapsed_time);
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
 
-  virtual Stumpy* clone() const { return new Stumpy(*this); }
+  bool is_freezable() const;
 
 protected:
   enum MyState {
     STATE_INVINCIBLE, STATE_NORMAL
   };
-  MyState mystate;
 
-  Timer invincible_timer;
-   
-  bool collision_squished(Player& player);
+protected:
+  bool collision_squished(GameObject& object);
+
+private:
+  MyState mystate;
+  Timer   invincible_timer;
 };
 
 #endif
+
+/* EOF */