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

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

diff --git a/src/badguy/treewillowisp.hpp b/src/badguy/treewillowisp.hpp
index facd07a..05b2876 100644 (file)
--- a/src/badguy/treewillowisp.hpp
+++ b/src/badguy/treewillowisp.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - "Will-O-Wisp" Badguy
 //  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,14 +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 __TREEWILLOWISP_H__
-#define __TREEWILLOWISP_H__
+#ifndef HEADER_SUPERTUX_BADGUY_TREEWILLOWISP_HPP
+#define HEADER_SUPERTUX_BADGUY_TREEWILLOWISP_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class GhostTree;
 class SoundSource;
@@ -39,7 +35,6 @@ public:
    */
   void vanish();
   void start_sucking(Vector suck_target);
-  bool was_sucked;
 
   void active_update(float elapsed_time);
   void set_color(const Color& color);
@@ -59,6 +54,11 @@ private:
   enum MyState {
     STATE_DEFAULT, STATE_VANISHING, STATE_SUCKED
   };
+
+public:
+  bool was_sucked;
+
+private:
   MyState mystate;
 
   Color color;
@@ -70,7 +70,12 @@ private:
   GhostTree* tree;
 
   Vector suck_target;
+
+private:
+  TreeWillOWisp(const TreeWillOWisp&);
+  TreeWillOWisp& operator=(const TreeWillOWisp&);
 };
 
 #endif
 
+/* EOF */