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

[supertux.git] / src / object / electrifier.hpp

diff --git a/src/object/electrifier.hpp b/src/object/electrifier.hpp
index 3cfa1b8..3869536 100644 (file)
--- a/src/object/electrifier.hpp
+++ b/src/object/electrifier.hpp
@@ -1,27 +1,25 @@
 //  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
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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 __ELECTRIFIER_H__
-#define __ELECTRIFIER_H__
+#ifndef HEADER_SUPERTUX_OBJECT_ELECTRIFIER_HPP
+#define HEADER_SUPERTUX_OBJECT_ELECTRIFIER_HPP
 
-#include <config.h>
-#include "resources.hpp"
-#include "game_object.hpp"
-#include "timer.hpp"
+#include "supertux/game_object.hpp"
+#include "supertux/timer.hpp"
+#include <stdint.h>
 
 //Changes all tiles with the given ID to a new one for a given amount of time, then removes itself
 //Used by the Kugelblitz to electrify water - can be used for other effects, too
@@ -30,7 +28,7 @@ class Electrifier : public GameObject
 public:
   Electrifier(uint32_t oldtile, uint32_t newtile, float seconds);
   ~Electrifier();
-protected:  
+protected:
   virtual void update(float time);
   virtual void draw(DrawingContext& context);
 private:
@@ -41,3 +39,4 @@ private:
 
 #endif
 
+/* EOF */