Made trampolines less likely to interfere with level design:

[supertux.git] / src / sector.hpp

diff --git a/src/sector.hpp b/src/sector.hpp
index 6f3b659..0ed2f4c 100644 (file)
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -32,6 +32,9 @@ namespace lisp {
 class Lisp;
 class Writer;
 }
+namespace collision {
+class Constraints;
+}
 
 class Rect;
 class Sprite;
@@ -40,7 +43,6 @@ class Player;
 class Camera;
 class TileMap;
 class Bullet;
-class CollisionGrid;
 class ScriptInterpreter;
 class SpawnPoint;
 class MovingObject;
@@ -107,8 +109,7 @@ public:
   
   bool add_bullet(const Vector& pos, float xm, Direction dir);
   bool add_smoke_cloud(const Vector& pos);
-  void add_floating_text(const Vector& pos, const std::string& text);
-                                                                                
+ 
   /** get currently activated sector. */
   static Sector* current()
   { return _current; }
@@ -126,10 +127,12 @@ public:
     return total;
   }
 
-  void collision_tilemap(const Rect& dest, const Vector& movement, CollisionHit& hit) const;
+  void collision_tilemap(collision::Constraints* constraints,
+      const Vector& movement, const Rect& dest) const;
 
   /** Checks if at the specified rectangle are gameobjects with STATIC flag set
-   * (or solid tiles from the tilemap)
+   * (or solid tiles from the tilemap).
+   * This does not(!) include badguys or players.
    */
   bool is_free_space(const Rect& rect) const;
 
@@ -162,21 +165,22 @@ private:
   void handle_collisions();
  
   /**
-   * Collision checks 2 objects against each other and does instant
+   * Does collision detection between 2 objects and does instant
    * collision response handling in case of a collision
    */
   void collision_object(MovingObject* object1, MovingObject* object2) const;
 
   /**
    * Does collision detection of an object against all other static
-   * objects (and the tilemap) in the level. Collisions are sorted
-   * and collision response against the first hit in time is done.
+   * objects (and the tilemap) in the level. Collision response is done
+   * for the first hit in time. (other hits get ignored, the function
+   * should be called repeatedly to resolve those)
    *
    * returns true if the collision detection should be aborted for this object
-   * (because of ABORT_MOVE in the collision response)
+   * (because of ABORT_MOVE in the collision response or no collisions)
    */
-  bool collision_static(MovingObject* object, const Vector& movement);
-
+  void collision_static(collision::Constraints* constraints,
+      const Vector& movement, const Rect& dest, GameObject& object);
   
   GameObject* parse_object(const std::string& name, const lisp::Lisp& lisp);
 
@@ -195,8 +199,6 @@ private:
  
   MusicType currentmusic;
 
-  std::auto_ptr<CollisionGrid> grid;
-
   HSQOBJECT sector_table;
   /// sector scripts
   typedef std::vector<HSQOBJECT> ScriptList;