Changeset 6911 in orxonox.OLD for branches/current_cd/src/lib/collision_detection/cd_engine.cc

Timestamp:

Jan 31, 2006, 7:12:41 PM (18 years ago)

Author:

patrick

Message:

cd: compiles again

File:

• branches/current_cd/src/lib/collision_detection/cd_engine.cc (modified) (2 diffs)

branches/current_cd/src/lib/collision_detection/cd_engine.cc

@@ -108 +108 @@
 void CDEngine::checkCollisions(std::list<WorldEntity*>& list1, std::list<WorldEntity*>& list2)
 {
-  const BVTree* tree;
+  BVTree* tree;
   std::list<WorldEntity*>::iterator entity1, entity2, pre1, pre2;
   PRINTF(5)("checking for collisions\n");
@@ -126 +126 @@
           PRINTF(4)("checking object %s against %s\n", (*entity1)->getName(), (*entity2)->getName());
           tree = (*entity1)->getOBBTree();
-          if( likely(tree != NULL) && (*entity2)->getOBBTree() != NULL) tree->collideWith(*entity1, *entity2);
+          if( likely(tree != NULL) && (*entity2)->getOBBTree() != NULL)
+            tree->collideWith(*entity1, *entity2);
         }
       }