-Incorporated Marcin Ko��cielnicki patch that reintroduces the flying

[supertux.git] / src / collision_grid.h

diff --git a/src/collision_grid.h b/src/collision_grid.h
index fe3f831..8a507d1 100644 (file)
--- a/src/collision_grid.h
+++ b/src/collision_grid.h
@@ -25,6 +25,8 @@ public:
   void check_collisions();
 
 private:
+  friend class CollisionGridIterator;
+  
   struct ObjectWrapper
   {
     MovingObject* object;
@@ -58,6 +60,7 @@ private:
   float height;
   float cell_width;
   float cell_height;
+  int iterator_timestamp;
 };
 
 extern CollisionGrid* bla;