X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision_grid.cpp;h=6ed8e4cc31c38f648f69b2e2c9e3d3a77881dd23;hb=22901c90fe1a4b0d5a6ef8fccb2494699b888e32;hp=311fc78af32ed0a54bc369fc36ef00e653b08b03;hpb=9599042661b468aae7bd34dca05441c0ebc93ad7;p=supertux.git

diff --git a/src/collision_grid.cpp b/src/collision_grid.cpp
index 311fc78af..6ed8e4cc3 100644
--- a/src/collision_grid.cpp
+++ b/src/collision_grid.cpp
@@ -1,8 +1,28 @@
+//  $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.
+
 #include <config.h>
 
 #include <iostream>
 #include "collision_grid.h"
-#include "special/collision.h"
+#include "collision.h"
 #include "sector.h"
 #include "collision_grid_iterator.h"
 
@@ -49,7 +69,7 @@ CollisionGrid::add_object(MovingObject* object)
   objects.push_back(wrapper);
   wrapper->id = objects.size()-1;
   
-  const Rectangle& bbox = object->bbox;
+  const Rect& bbox = object->bbox;
   for(float y = bbox.p1.y; y < bbox.p2.y; y += cell_height) {
     for(float x = bbox.p1.x; x < bbox.p2.x; x += cell_width) {
       int gridx = int(x / cell_width);
@@ -87,7 +107,7 @@ CollisionGrid::remove_object(MovingObject* object)
   }
 #endif
   
-  const Rectangle& bbox = wrapper->dest;
+  const Rect& bbox = wrapper->dest;
   for(float y = bbox.p1.y; y < bbox.p2.y; y += cell_height) {
     for(float x = bbox.p1.x; x < bbox.p2.x; x += cell_width) {
       int gridx = int(x / cell_width);
@@ -109,7 +129,7 @@ CollisionGrid::move_object(ObjectWrapper* wrapper)
 {
   // FIXME not optimal yet... should leave the gridcells untouched that don't
   // need to be changed.
-  const Rectangle& obbox = wrapper->dest;
+  const Rect& obbox = wrapper->dest;
   for(float y = obbox.p1.y; y < obbox.p2.y; y += cell_height) {
     for(float x = obbox.p1.x; x < obbox.p2.x; x += cell_width) {
       int gridx = int(x / cell_width);
@@ -123,7 +143,7 @@ CollisionGrid::move_object(ObjectWrapper* wrapper)
     }
   }
 
-  const Rectangle& nbbox = wrapper->object->bbox;
+  const Rect& nbbox = wrapper->object->bbox;
   for(float y = nbbox.p1.y; y < nbbox.p2.y; y += cell_height) {
     for(float x = nbbox.p1.x; x < nbbox.p2.x; x += cell_width) {
       int gridx = int(x / cell_width);
@@ -184,7 +204,7 @@ CollisionGrid::collide_object(ObjectWrapper* wrapper)
 {
   iterator_timestamp++;
 
-  const Rectangle& bbox = wrapper->object->bbox;
+  const Rect& bbox = wrapper->object->bbox;
   for(float y = bbox.p1.y - cell_height; y < bbox.p2.y + cell_height; y += cell_height) {
     for(float x = bbox.p1.x - cell_width; x < bbox.p2.x + cell_width; x += cell_width) {
       int gridx = int(x / cell_width);
@@ -220,9 +240,9 @@ CollisionGrid::collide_object_object(ObjectWrapper* wrapper,
   MovingObject* object1 = wrapper->object;
   MovingObject* object2 = wrapper2->object;
   
-  Rectangle dest1 = object1->get_bbox();
+  Rect dest1 = object1->get_bbox();
   dest1.move(object1->get_movement());
-  Rectangle dest2 = object2->get_bbox();
+  Rect dest2 = object2->get_bbox();
   dest2.move(object2->get_movement());
 
   Vector movement = object1->get_movement() - object2->get_movement();