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

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

diff --git a/src/object/endsequence.cpp b/src/object/endsequence.cpp
index 2e4cc6a..a993256 100644 (file)
--- a/src/object/endsequence.cpp
+++ b/src/object/endsequence.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - End Sequence
 //  Copyright (C) 2007 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,30 +12,15 @@
 //  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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "endsequence.hpp"
+#include "object/endsequence.hpp"
 
-#include <stdexcept>
-#include <iostream>
-#include <sstream>
-#include "main.hpp"
-#include "resources.hpp"
-#include "sector.hpp"
-#include "gettext.hpp"
-#include "object_factory.hpp"
 #include "object/player.hpp"
-#include "video/drawing_context.hpp"
-#include "lisp/list_iterator.hpp"
-#include "log.hpp"
-#include "scripting/level_time.hpp"
-#include "scripting/squirrel_util.hpp"
+#include "supertux/sector.hpp"
 
 EndSequence::EndSequence()
-: isrunning(false), isdone(false), tux_may_walk(true)
+  : isrunning(false), isdone(false), tux_may_walk(true)
 {
   end_sequence_controller = 0;
 }
@@ -95,7 +78,7 @@ EndSequence::is_tux_stopped()
   return !tux_may_walk;
 }
 
- bool
+bool
 EndSequence::is_done()
 {
   return isdone;
@@ -115,3 +98,5 @@ void
 EndSequence::stopping()
 {
 }
+
+/* EOF */