X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fendsequence.cpp;h=183d2479e8f8277a33b8746a3d945c1320713030;hb=83c5812ba15bc66c3dc6ae1c3fc59ab29978e514;hp=2e4cc6a4133fbde3d7d05d612df746939bf6ae9e;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git diff --git a/src/object/endsequence.cpp b/src/object/endsequence.cpp index 2e4cc6a41..183d2479e 100644 --- a/src/object/endsequence.cpp +++ b/src/object/endsequence.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux - End Sequence // Copyright (C) 2007 Christoph Sommer // -// 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,32 +12,19 @@ // 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 +// along with this program. If not, see . -#include "endsequence.hpp" +#include "object/endsequence.hpp" -#include -#include -#include -#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" - -EndSequence::EndSequence() -: isrunning(false), isdone(false), tux_may_walk(true) +#include "supertux/sector.hpp" + +EndSequence::EndSequence() : + isrunning(false), + isdone(false), + tux_may_walk(true), + end_sequence_controller(0) { - end_sequence_controller = 0; } EndSequence::~EndSequence() @@ -95,7 +80,7 @@ EndSequence::is_tux_stopped() return !tux_may_walk; } - bool +bool EndSequence::is_done() { return isdone; @@ -109,9 +94,12 @@ EndSequence::starting() void EndSequence::running(float /*elapsed_time*/) { + end_sequence_controller->update(); } void EndSequence::stopping() { } + +/* EOF */