X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollision_grid.h;h=7822c31e3b4b359cbc7ef6930faa12c15f5fe6fe;hb=9599042661b468aae7bd34dca05441c0ebc93ad7;hp=8a507d142b6b25386517c40a1f7283ce0efc68c9;hpb=cf585f019ce5aacf92e252a2f2c60c47255bea52;p=supertux.git

diff --git a/src/collision_grid.h b/src/collision_grid.h
index 8a507d142..7822c31e3 100644
--- a/src/collision_grid.h
+++ b/src/collision_grid.h
@@ -20,7 +20,6 @@ public:
 
   void add_object(MovingObject* object);
   void remove_object(MovingObject* object);
-  void move_object(MovingObject* object);
 
   void check_collisions();
 
@@ -47,9 +46,10 @@ private:
     ObjectWrapper* object_wrapper;
   };
 
-  void remove_object_from_gridcell(int gridcell, MovingObject* object);
+  void remove_object_from_gridcell(int gridcell, ObjectWrapper* wrapper);
   void collide_object(ObjectWrapper* wrapper);
   void collide_object_object(ObjectWrapper* wrapper, ObjectWrapper* wrapper2);
+  void move_object(ObjectWrapper* wrapper);
   
   typedef std::vector<GridEntry*> GridEntries;
   GridEntries grid;