X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fyeti.hpp;h=573a7a0302567b2bb83914a9a64fc6d59ac50846;hb=5240d812e12e6b53dc3c36bf313361d2d457382a;hp=3d55f4e43be20466c6fcf30b876f345235f0a4b7;hpb=058e2f6298d8319c0fe03c5e950a36a8f1f57aba;p=supertux.git

diff --git a/src/badguy/yeti.hpp b/src/badguy/yeti.hpp
index 3d55f4e43..573a7a030 100644
--- 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,20 +36,18 @@ public:
   void kill_squished(GameObject& object);
   void kill_fall();
 
-  virtual Yeti* clone() const { return new Yeti((Yeti&)*this); }
-
 private:
   void run();
   void jump_up();
   void be_angry();
   void drop_stalactite();
-  void summon_snowball();
   void jump_down();
 
   void draw_hit_points(DrawingContext& context);
 
   void take_hit(Player& player);
 
+private:
   enum YetiState {
     JUMP_DOWN,
     RUN,
@@ -61,12 +55,16 @@ private:
     BE_ANGRY,
     SQUISHED
   };
+
+private:
   YetiState state;
   Timer state_timer;
   Timer safe_timer;
   int stomp_count;
   int hit_points;
-  std::auto_ptr<Surface> hud_head;
+  SurfacePtr hud_head;
 };
 
 #endif
+
+/* EOF */