X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.hpp;h=0ed2f4c173641927e7bb6ad8e9e54f8a3551302e;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=ab96230e69387f29511f83ab1841477815ee3c4d;hpb=b4868c421ba670cd6301394558f1034e38a0c7b3;p=supertux.git

diff --git a/src/sector.hpp b/src/sector.hpp
index ab96230e6..0ed2f4c17 100644
--- 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;
 
@@ -176,8 +179,8 @@ private:
    * returns true if the collision detection should be aborted for this object
    * (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);
 
@@ -196,8 +199,6 @@ private:
  
   MusicType currentmusic;
 
-  std::auto_ptr<CollisionGrid> grid;
-
   HSQOBJECT sector_table;
   /// sector scripts
   typedef std::vector<HSQOBJECT> ScriptList;