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

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

diff --git a/src/object/endsequence_walkleft.cpp b/src/object/endsequence_walkleft.cpp
index bf87105..0ee8e74 100644 (file)
--- a/src/object/endsequence_walkleft.cpp
+++ b/src/object/endsequence_walkleft.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - End Sequence: Tux walks right
 //  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,17 +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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
-#include "endsequence_walkleft.hpp"
-#include "sector.hpp"
-#include "mainloop.hpp"
+#include "object/endsequence_walkleft.hpp"
 #include "object/player.hpp"
+#include "supertux/mainloop.hpp"
+#include "supertux/sector.hpp"
 
 EndSequenceWalkLeft::EndSequenceWalkLeft()
-: EndSequence()
+  : EndSequence()
 {
 }
 
@@ -42,7 +38,7 @@ EndSequenceWalkLeft::starting()
 {
   EndSequence::starting();
   last_x_pos = -1;
-  endsequence_timer.start(7.3f * main_loop->get_speed());
+  endsequence_timer.start(7.3f * g_main_loop->get_speed());
 }
 
 void
@@ -68,3 +64,5 @@ EndSequenceWalkLeft::stopping()
 {
   EndSequence::stopping();
 }
+
+/* EOF */