X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fcrystallo.hpp;h=14c6a0ce570acca4587f8548d7abcf937f2a65d3;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=ed32e1a05c9e6296d4b12419b710442553887c92;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git

diff --git a/src/badguy/crystallo.hpp b/src/badguy/crystallo.hpp
index ed32e1a05..14c6a0ce5 100644
--- a/src/badguy/crystallo.hpp
+++ b/src/badguy/crystallo.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Crystallo
 //  Copyright (C) 2008 Wolfgang Becker <uafr@gmx.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,13 +12,12 @@
 //  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 __CRYSTALLO_H__
-#define __CRSYTALLO_H__
+#ifndef HEADER_SUPERTUX_BADGUY_CRYSTALLO_HPP
+#define HEADER_SUPERTUX_BADGUY_CRYSTALLO_HPP
 
-#include "walking_badguy.hpp"
+#include "badguy/walking_badguy.hpp"
 
 /*
  * Basic badguy, patrols around a fixed position.
@@ -28,11 +25,9 @@
 class Crystallo : public WalkingBadguy
 {
 public:
-  Crystallo(const lisp::Lisp& reader);
+  Crystallo(const Reader& reader);
   Crystallo(const Vector& pos, Direction d);
 
-  virtual Crystallo* clone() const { return new Crystallo(*this); }
-
   void active_update(float elapsed_time);
 
 protected:
@@ -43,3 +38,5 @@ private:
 };
 
 #endif
+
+/* EOF */