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

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

diff --git a/src/badguy/yeti.hpp b/src/badguy/yeti.hpp
index 3d55f4e..ac2603b 100644 (file)
--- a/src/badguy/yeti.hpp
+++ b/src/badguy/yeti.hpp
@@ -1,13 +1,11 @@
-//  $Id$
-//
 //  SuperTux - Boss "Yeti"
 //  Copyright (C) 2005 Matthias Braun <matze@braunis.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
-//  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
@@ -15,24 +13,22 @@
 //  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.
-
-#ifndef __YETI_H__
-#define __YETI_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "badguy.hpp"
+#ifndef HEADER_SUPERTUX_BADGUY_YETI_HPP
+#define HEADER_SUPERTUX_BADGUY_YETI_HPP
 
 #include <memory>
 
+#include "badguy/badguy.hpp"
+
 class Yeti : public BadGuy
 {
 public:
-  Yeti(const lisp::Lisp& lisp);
+  Yeti(const Reader& lisp);
   ~Yeti();
 
   void draw(DrawingContext& context);
-  void write(lisp::Writer& writer);
   void initialize();
   void active_update(float elapsed_time);
   void collision_solid(const CollisionHit& hit);
@@ -40,8 +36,6 @@ public:
   void kill_squished(GameObject& object);
   void kill_fall();
 
-  virtual Yeti* clone() const { return new Yeti((Yeti&)*this); }
-
 private:
   void run();
   void jump_up();
@@ -54,6 +48,7 @@ private:
 
   void take_hit(Player& player);
 
+private:
   enum YetiState {
     JUMP_DOWN,
     RUN,
@@ -61,6 +56,8 @@ private:
     BE_ANGRY,
     SQUISHED
   };
+
+private:
   YetiState state;
   Timer state_timer;
   Timer safe_timer;
@@ -70,3 +67,5 @@ private:
 };
 
 #endif
+
+/* EOF */