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

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

diff --git a/src/object/endsequence.hpp b/src/object/endsequence.hpp
index f7ac647..e05ae7e 100644 (file)
--- a/src/object/endsequence.hpp
+++ b/src/object/endsequence.hpp
@@ -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,43 +12,44 @@
 //  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 __ENDSEQUENCE_H__
-#define __ENDSEQUENCE_H__
+#ifndef HEADER_SUPERTUX_OBJECT_ENDSEQUENCE_HPP
+#define HEADER_SUPERTUX_OBJECT_ENDSEQUENCE_HPP
 
-#include <memory>
-#include "game_object.hpp"
-#include "timer.hpp"
-#include "lisp/lisp.hpp"
 #include "control/codecontroller.hpp"
+#include "supertux/game_object.hpp"
 
 class EndSequence : public GameObject
 {
 public:
-    EndSequence();
-    virtual ~EndSequence();
+  EndSequence();
+  virtual ~EndSequence();
 
-    virtual void update(float elapsed_time);
-    virtual void draw(DrawingContext& context);
+  virtual void update(float elapsed_time);
+  virtual void draw(DrawingContext& context);
 
-    void start(); /**< play EndSequence */
-    void stop_tux(); /**< called when Tux has reached his final position */
-    void stop(); /**< stop playing EndSequence, mark it as done playing */
-    bool is_tux_stopped(); /**< returns true if Tux has reached his final position */
-    bool is_done(); /**< returns true if EndSequence has finished playing */
+  void start(); /**< play EndSequence */
+  void stop_tux(); /**< called when Tux has reached his final position */
+  void stop(); /**< stop playing EndSequence, mark it as done playing */
+  bool is_tux_stopped(); /**< returns true if Tux has reached his final position */
+  bool is_done(); /**< returns true if EndSequence has finished playing */
 
 protected:
-    virtual void starting(); /**< called when EndSequence starts */
-    virtual void running(float elapsed_time); /**< called while the EndSequence is running */
-    virtual void stopping(); /**< called when EndSequence stops */
-
-    bool isrunning; /**< true while EndSequence plays */
-    bool isdone; /**< true if EndSequence has finished playing */
-    bool tux_may_walk; /**< true while tux is allowed to walk */
-    CodeController* end_sequence_controller;
-
+  virtual void starting(); /**< called when EndSequence starts */
+  virtual void running(float elapsed_time); /**< called while the EndSequence is running */
+  virtual void stopping(); /**< called when EndSequence stops */
+
+  bool isrunning; /**< true while EndSequence plays */
+  bool isdone; /**< true if EndSequence has finished playing */
+  bool tux_may_walk; /**< true while tux is allowed to walk */
+  CodeController* end_sequence_controller;
+
+private:
+  EndSequence(const EndSequence&);
+  EndSequence& operator=(const EndSequence&);
 };
 
 #endif
+
+/* EOF */