Changeset 8894 in orxonox.OLD for trunk/src/story_entities/multi_player_world.cc

Timestamp:

Jun 29, 2006, 12:19:48 AM (18 years ago)

Author:

patrick

Message:

merged the branche single_player_map with the trunk

File:

• trunk/src/story_entities/multi_player_world.cc (modified) (1 diff)

trunk/src/story_entities/multi_player_world.cc

@@ -98 +98 @@
     this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
 
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));