Changeset 6135 in orxonox.OLD for branches/objectmanager/src/story_entities
- Timestamp:
- Dec 16, 2005, 6:01:26 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/objectmanager/src/story_entities/world.cc
r6134 r6135 690 690 this->gameTime += this->dtS; 691 691 692 this->tick(this->objectManager.getObjectList(OM_DEAD_TICK), this->dtS);692 /* this->tick(this->objectManager.getObjectList(OM_DEAD_TICK), this->dtS); 693 693 this->tick(this->objectManager.getObjectList(OM_COMMON), this->dtS); 694 this->tick(this->objectManager.getObjectList(OM_GROUP_00), this->dtS); 694 this->tick(this->objectManager.getObjectList(OM_GROUP_00), this->dtS);*/ 695 695 this->tick(this->objectManager.getObjectList(OM_GROUP_01), this->dtS); 696 696 this->tick(this->objectManager.getObjectList(OM_GROUP_01_PROJ), this->dtS); 697 698 // tIterator<WorldEntity>* iterator = this->entities->getIterator();699 // WorldEntity* entity = iterator->firstElement();700 // while( entity != NULL)701 // {702 // entity->tick (this->dtS);703 // entity = iterator->nextElement();704 // }705 // delete iterator;706 697 707 698 /* update tick the rest */ … … 747 738 void World::collide() 748 739 { 749 CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_00), this->objectManager.getObjectList(OM_GROUP_01_PROJ)); 750 CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_01), this->objectManager.getObjectList(OM_COMMON)); 740 CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_00), 741 this->objectManager.getObjectList(OM_GROUP_01_PROJ)); 742 CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_01), 743 this->objectManager.getObjectList(OM_COMMON)); 751 744 } 752 745
Note: See TracChangeset
for help on using the changeset viewer.