Changeset 6135 in orxonox.OLD for branches/objectmanager/src/story_entities/world.cc

Timestamp:

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

Author:

bensch

Message:

om: safer collision-test

File:

• branches/objectmanager/src/story_entities/world.cc (modified) (2 diffs)

branches/objectmanager/src/story_entities/world.cc

@@ -690 +690 @@
       this->gameTime += this->dtS;
 
-      this->tick(this->objectManager.getObjectList(OM_DEAD_TICK), this->dtS);
+/*      this->tick(this->objectManager.getObjectList(OM_DEAD_TICK), this->dtS);
       this->tick(this->objectManager.getObjectList(OM_COMMON), this->dtS);
-      this->tick(this->objectManager.getObjectList(OM_GROUP_00), this->dtS);
+      this->tick(this->objectManager.getObjectList(OM_GROUP_00), this->dtS);*/
       this->tick(this->objectManager.getObjectList(OM_GROUP_01), this->dtS);
       this->tick(this->objectManager.getObjectList(OM_GROUP_01_PROJ), this->dtS);
-
-//       tIterator<WorldEntity>* iterator = this->entities->getIterator();
-//       WorldEntity* entity = iterator->firstElement();
-//       while( entity != NULL)
-//         {
-//           entity->tick (this->dtS);
-//           entity = iterator->nextElement();
-//         }
-//       delete iterator;
 
       /* update tick the rest */
@@ -747 +738 @@
 void World::collide()
 {
-  CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_00), this->objectManager.getObjectList(OM_GROUP_01_PROJ));
-  CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_01), this->objectManager.getObjectList(OM_COMMON));
+  CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_00),
+                                            this->objectManager.getObjectList(OM_GROUP_01_PROJ));
+  CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_01),
+                                            this->objectManager.getObjectList(OM_COMMON));
 }