reworked miniswig a bit to support virtual functions and to only emit constructors...

[supertux.git] / src / collision_grid_iterator.h

diff --git a/src/collision_grid_iterator.h b/src/collision_grid_iterator.h
index 9e22f62..3d56661 100644 (file)
--- a/src/collision_grid_iterator.h
+++ b/src/collision_grid_iterator.h
@@ -1,32 +1,49 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  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_ITERATOR_H__
 #define __COLLISION_GRID_ITERATOR_H__
 
-#include "math/rectangle.h"
-
-using namespace SuperTux;
+#include "math/rect.h"
 
 class CollisionGrid;
 
 class CollisionGridIterator
 {
 public:
-  CollisionGridIterator(CollisionGrid& newgrid, const Rectangle& bbox)
+  CollisionGridIterator(CollisionGrid& newgrid, const Rect& bbox)
     : grid(newgrid)
   {
-    start_x = int(bbox.p1.x / grid.cell_width);
+    start_x = int(bbox.p1.x / grid.cell_width) - 2;
     if(start_x < 0)
       start_x = 0;
     x = start_x;
         
-    y = int(bbox.p1.y / grid.cell_height);
+    y = int(bbox.p1.y / grid.cell_height) - 2;
     if(y < 0)
       y = 0;
     
-    end_x = int(bbox.p2.x / grid.cell_width) + 1;
+    end_x = int(bbox.p2.x / grid.cell_width) + 2;
     if(end_x > (int) grid.cells_x)
       end_x = grid.cells_x;
     
-    end_y = int(bbox.p2.y / grid.cell_height) + 1;
+    end_y = int(bbox.p2.y / grid.cell_height) + 2;
     if(end_y > (int) grid.cells_y)
       end_y = grid.cells_y;