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

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

diff --git a/src/object/electrifier.cpp b/src/object/electrifier.cpp
index f1b8c1c..bf5dfbb 100644 (file)
--- a/src/object/electrifier.cpp
+++ b/src/object/electrifier.cpp
@@ -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,15 +12,10 @@
 //  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.
-
-#include <config.h>
-#include "electrifier.hpp"
-#include "sector.hpp"
-#include "object/tilemap.hpp"
-#include "tile.hpp"
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "object/electrifier.hpp"
+#include "supertux/sector.hpp"
 
 Electrifier::Electrifier(uint32_t oldtile, uint32_t newtile, float seconds)
 {
@@ -48,3 +41,5 @@ void
 Electrifier::draw(DrawingContext& )
 {
 }
+
+/* EOF */