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

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

diff --git a/src/badguy/ghosttree.hpp b/src/badguy/ghosttree.hpp
index 7e57d5c..a139554 100644 (file)
--- a/src/badguy/ghosttree.hpp
+++ b/src/badguy/ghosttree.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Boss "GhostTree"
 //  Copyright (C) 2007 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,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.
-#ifndef __GHOSTTREE_H__
-#define __GHOSTTREE_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_BADGUY_GHOSTTREE_HPP
+#define HEADER_SUPERTUX_BADGUY_GHOSTTREE_HPP
 
-#include <vector>
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class TreeWillOWisp;
 class Lantern;
@@ -28,7 +25,7 @@ class Lantern;
 class GhostTree : public BadGuy
 {
 public:
-  GhostTree(const lisp::Lisp& lisp);
+  GhostTree(const Reader& lisp);
   ~GhostTree();
 
   virtual bool is_flammable() const { return false; }
@@ -69,7 +66,12 @@ private:
 
   bool is_color_deadly(Color color) const;
   void spawn_lantern();
+
+private:
+  GhostTree(const GhostTree&);
+  GhostTree& operator=(const GhostTree&);
 };
 
 #endif
 
+/* EOF */