- Use obstacks for memory allocation for lispfiles and DrawingRequests,

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

diff --git a/src/object/camera.hpp b/src/object/camera.hpp
index ed7b5a7..260a612 100644 (file)
--- a/src/object/camera.hpp
+++ b/src/object/camera.hpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de
+//  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
@@ -16,6 +16,7 @@
 //  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.
+
 #ifndef SUPERTUX_CAMERA_H
 #define SUPERTUX_CAMERA_H
 
@@ -41,7 +42,7 @@ class PathWalker;
 class Camera : public GameObject, public Serializable, public ScriptInterface
 {
 public:
-  Camera(Sector* sector);
+  Camera(Sector* sector, std::string name = "");
   virtual ~Camera();
 
   /// parse camera mode from lisp file
@@ -51,6 +52,7 @@ public:
 
   /// reset camera postion
   virtual void reset(const Vector& tuxpos);
+  virtual void reset_kd(const Vector& tuxpos);
 
   /** return camera position */
   const Vector& get_translation() const;
@@ -61,8 +63,8 @@ public:
   {
   }
 
-  virtual void expose(HSQUIRRELVM vm, int table_idx);
-  virtual void unexpose(HSQUIRRELVM vm, int table_idx);
+  virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
+  virtual void unexpose(HSQUIRRELVM vm, SQInteger table_idx);
 
   // shake camera in a direction 1 time
   void shake(float speed, float x, float y);
@@ -87,6 +89,8 @@ public:
 
 private:
   void update_scroll_normal(float elapsed_time);
+  void update_scroll_normal_kd(float elapsed_time);
+  void update_scroll_normal_exp(float elapsed_time);
   void update_scroll_autoscroll(float elapsed_time);
   void update_scroll_to(float elapsed_time);
   void keep_in_bounds(Vector& vector);
@@ -123,4 +127,3 @@ private:
 };
 
 #endif /*SUPERTUX_CAMERA_H*/
-