X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Fwillowisp.hpp;h=29f4cb9f8835dcdcace5b80c72e2d48d1bbb0799;hb=59d76147a1b09fca2d2b4a1780ab47509c1e47ff;hp=33049faeefa011734af0f7d75478698fb1d74770;hpb=c87aa7be71247c14fd9653286b9bc79a75420fca;p=supertux.git

diff --git a/src/scripting/willowisp.hpp b/src/scripting/willowisp.hpp
index 33049faee..29f4cb9f8 100644
--- a/src/scripting/willowisp.hpp
+++ b/src/scripting/willowisp.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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 __SCRIPTING_WILLOWISP_H__
-#define __SCRIPTING_WILLOWISP_H__
+#ifndef HEADER_SUPERTUX_SCRIPTING_WILLOWISP_HPP
+#define HEADER_SUPERTUX_SCRIPTING_WILLOWISP_HPP
 
-namespace Scripting
-{
+namespace scripting {
 
 class WillOWisp
 {
@@ -34,10 +30,10 @@ public:
   /** Move willowisp to given node */
   virtual void goto_node(int node_no) = 0;
 
-  /** set willowisp state can be:
+  /** set willowisp state; can be:
    * -stopped          willowisp doesn't move
    * -move_path        willowisp moves along the path (call goto_node)
-   * -move_path_track  willowisp moves along path but catchs tux when he is near
+   * -move_path_track  willowisp moves along path but catches tux when he is near
    * -normal           "normal" mode starts tracking tux when he is near enough
    * -vanish           vanish
    */
@@ -50,3 +46,5 @@ public:
 }
 
 #endif
+
+/* EOF */