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

[supertux.git] / src / scripting / thunderstorm.hpp

diff --git a/src/scripting/thunderstorm.hpp b/src/scripting/thunderstorm.hpp
index fbe555c..37c91c2 100644 (file)
--- a/src/scripting/thunderstorm.hpp
+++ b/src/scripting/thunderstorm.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 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,19 +12,17 @@
 //  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_THUNDERSTORM_H__
-#define __SCRIPTING_THUNDERSTORM_H__
+#ifndef HEADER_SUPERTUX_SCRIPTING_THUNDERSTORM_HPP
+#define HEADER_SUPERTUX_SCRIPTING_THUNDERSTORM_HPP
 
 #ifndef SCRIPTING_API
 class Thunderstorm;
 typedef Thunderstorm _Thunderstorm;
 #endif
 
-namespace Scripting
-{
+namespace Scripting {
 
 class Thunderstorm
 {
@@ -36,35 +32,35 @@ public:
   ~Thunderstorm();
 #endif
 
-    /**
-     * Start playing thunder and lightning at configured interval
-     */
-    void start();
+  /**
+   * Start playing thunder and lightning at configured interval
+   */
+  void start();
 
-    /**
-     * Stop playing thunder and lightning at configured interval
-     */
-    void stop();
+  /**
+   * Stop playing thunder and lightning at configured interval
+   */
+  void stop();
 
-    /**
-     * Play thunder
-     */
-    void thunder();
+  /**
+   * Play thunder
+   */
+  void thunder();
 
-    /**
-     * Play lightning, i.e. call flash() and electrify()
-     */
-    void lightning();
+  /**
+   * Play lightning, i.e. call flash() and electrify()
+   */
+  void lightning();
 
-    /**
-     * Display a nice flash
-     */
-    void flash();
+  /**
+   * Display a nice flash
+   */
+  void flash();
 
-    /**
-     * Electrify water throughout the whole sector for a short time
-     */
-    void electrify();
+  /**
+   * Electrify water throughout the whole sector for a short time
+   */
+  void electrify();
 
 #ifndef SCRIPTING_API
   _Thunderstorm* thunderstorm;
@@ -74,3 +70,5 @@ public:
 }
 
 #endif
+
+/* EOF */