- Implemented a scripted object that can be placed in a level and whose name is

[supertux.git] / src / collision_grid.h

diff --git a/src/collision_grid.h b/src/collision_grid.h
index 1027562..abb2ef1 100644 (file)
--- a/src/collision_grid.h
+++ b/src/collision_grid.h
@@ -17,15 +17,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #ifndef __COLLISION_GRID_H__
 #define __COLLISION_GRID_H__
 
 #include <vector>
 #include "moving_object.h"
 
-using namespace SuperTux;
-
 class CollisionGridIterator;
 
 /**
@@ -49,7 +46,7 @@ private:
   struct ObjectWrapper
   {
     MovingObject* object;
-    Rectangle dest;
+    Rect dest;
     /** (pseudo) timestamp. When reading from the grid the timestamp is
      * changed so that you can easily avoid reading an object multiple times
      * when it is in several cells that you check.