restore trunk

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

diff --git a/src/object/platform.hpp b/src/object/platform.hpp
index 0815a71..06456a7 100644 (file)
--- a/src/object/platform.hpp
+++ b/src/object/platform.hpp
@@ -39,14 +39,15 @@ public:
 
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
   virtual void update(float elapsed_time);
+
   const Vector& get_speed() const
   {
     return speed;
   }
 
-  /** 
+  /**
    * @name Scriptable Methods
-   * @{ 
+   * @{
    */
 
   /** Move platform until at given node, then stop */
@@ -58,8 +59,8 @@ public:
   /** Stop platform at next node */
   void stop_moving();
 
-  /** 
-   * @} 
+  /**
+   * @}
    */
 
   virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
@@ -72,8 +73,13 @@ public:
 private:
   std::auto_ptr<Path> path;
   std::auto_ptr<PathWalker> walker;
+
   Vector speed;
 
+  bool automatic; /**< true if Platform will automatically pick a destination based on collisions and current Player position */
+  bool player_contact; /**< true if a Player touched the Platform during the last round of collision detections */
+  bool last_player_contact; /**< true if a Player touched the Platform during the round before the last round of collision detections */
+
 };
 
 #endif