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

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

diff --git a/src/object/level_time.hpp b/src/object/level_time.hpp
index 6d9a3a2..36b9870 100644 (file)
--- a/src/object/level_time.hpp
+++ b/src/object/level_time.hpp
@@ -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,66 +12,68 @@
 //  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 HEADER_SUPERTUX_OBJECT_LEVEL_TIME_HPP
+#define HEADER_SUPERTUX_OBJECT_LEVEL_TIME_HPP
 
-#ifndef __LEVELTIME_H__
-#define __LEVELTIME_H__
+#include <memory>
 
-#include "game_object.hpp"
-#include "timer.hpp"
-#include "lisp/lisp.hpp"
-#include "video/surface.hpp"
-#include "script_interface.hpp"
+#include "supertux/game_object.hpp"
+#include "supertux/script_interface.hpp"
+#include "util/reader_fwd.hpp"
 #include "video/color.hpp"
 
-#include <memory>
+class Surface;
 
-class LevelTime : public GameObject, public ScriptInterface
+class LevelTime : public GameObject, 
+                  public ScriptInterface
 {
-    static Color text_color;
+  static Color text_color;
 public:
-    LevelTime(const lisp::Lisp& reader);
+  LevelTime(const Reader& reader);
 
-    virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
-    virtual void unexpose(HSQUIRRELVM vm, SQInteger table_idx);
+  virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
+  virtual void unexpose(HSQUIRRELVM vm, SQInteger table_idx);
 
-    void update(float elapsed_time);
-    void draw(DrawingContext& context);
+  void update(float elapsed_time);
+  void draw(DrawingContext& context);
 
-    /**
-     * @name Scriptable Methods
-     * @{
-     */
+  /**
+   * @name Scriptable Methods
+   * @{
+   */
 
-    /**
-     * Resumes the countdown
-     */
-    void start();
+  /**
+   * Resumes the countdown
+   */
+  void start();
 
-    /**
-     * Pauses the countdown
-     */
-    void stop();
+  /**
+   * Pauses the countdown
+   */
+  void stop();
 
-    /**
-     * Returns the number of seconds left on the clock
-     */
-    float get_time();
+  /**
+   * Returns the number of seconds left on the clock
+   */
+  float get_time();
 
-    /**
-     * Changes the number of seconds left on the clock
-     */
-    void set_time(float time_left);
+  /**
+   * Changes the number of seconds left on the clock
+   */
+  void set_time(float time_left);
 
-    /**
-     * @}
-     */
+  /**
+   * @}
+   */
 
 private:
-    std::auto_ptr<Surface> time_surface;
-    bool running;
-    float time_left;
+  std::auto_ptr<Surface> time_surface;
+  bool running;
+  float time_left;
 };
 
 #endif
+
+/* EOF */