Changeset 6135 in orxonox.OLD for branches/objectmanager/src/lib

Timestamp:

Dec 16, 2005, 6:01:26 PM (19 years ago)

Author:

bensch

Message:

om: safer collision-test

File:

• branches/objectmanager/src/lib/collision_detection/cd_engine.cc (modified) (1 diff)

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

@@ -110 +110 @@
 {
   BVTree* tree;
-  std::list<WorldEntity*>::iterator entity1, entity2;
+  std::list<WorldEntity*>::iterator entity1, entity2, pre1, pre2;
   PRINTF(3)("checking for collisions\n");
-  for (entity1 = list1.begin(); entity1 != list1.end(); entity1++)
+
+  pre1 = list1.begin();
+  while (pre1 != list1.end())
   {
+    entity1 = pre1;
+    pre1++;
     if( likely((*entity1) != this->terrain))
     {
-      for (entity2 = list2.begin(); entity2 != list2.end(); entity2++)
+      pre2 = list2.begin();
+      while (pre2 != list2.end())
       {
+        entity2 = pre2;
+        pre2++;
         if( likely((*entity2) != this->terrain))
         {