- added new console font

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

diff --git a/src/object/camera.hpp b/src/object/camera.hpp
index 16e3203..e02c306 100644 (file)
--- a/src/object/camera.hpp
+++ b/src/object/camera.hpp
@@ -42,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
@@ -52,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;
@@ -62,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);
@@ -88,6 +89,7 @@ public:
 
 private:
   void update_scroll_normal(float elapsed_time);
+  void update_scroll_normal_kd(float elapsed_time);
   void update_scroll_autoscroll(float elapsed_time);
   void update_scroll_to(float elapsed_time);
   void keep_in_bounds(Vector& vector);
@@ -124,4 +126,3 @@ private:
 };
 
 #endif /*SUPERTUX_CAMERA_H*/
-