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

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

diff --git a/src/badguy/willowisp.hpp b/src/badguy/willowisp.hpp
index a5ca159..9076e6a 100644 (file)
--- a/src/badguy/willowisp.hpp
+++ b/src/badguy/willowisp.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - "Will-O-Wisp" Badguy
 //  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
@@ -14,27 +12,26 @@
 //  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 __WILLOWISP_H__
-#define __WILLOWISP_H__
+#ifndef HEADER_SUPERTUX_BADGUY_WILLOWISP_HPP
+#define HEADER_SUPERTUX_BADGUY_WILLOWISP_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class Path;
 class PathWalker;
 class SoundSource;
 
-#include "script_interface.hpp"
 #include "scripting/willowisp.hpp"
+#include "supertux/script_interface.hpp"
 
-class WillOWisp : public BadGuy, public Scripting::WillOWisp,
+class WillOWisp : public BadGuy, 
+                  public Scripting::WillOWisp,
                   public ScriptInterface
 {
 public:
-  WillOWisp(const lisp::Lisp& reader);
+  WillOWisp(const Reader& reader);
 
   void activate();
   void deactivate();
@@ -68,6 +65,8 @@ private:
     STATE_STOPPED, STATE_IDLE, STATE_TRACKING, STATE_VANISHING, STATE_WARPING,
     STATE_PATHMOVING, STATE_PATHMOVING_TRACK
   };
+
+private:
   MyState mystate;
 
   std::string target_sector;
@@ -85,3 +84,5 @@ private:
 };
 
 #endif
+
+/* EOF */