Changeset 8845 in orxonox.OLD for branches/multi_player_map/src/story_entities

Timestamp:

Jun 28, 2006, 12:22:38 PM (18 years ago)

Author:

patrick

Message:

more collision checks

File:

• branches/multi_player_map/src/story_entities/multi_player_world.cc (modified) (2 diffs)

branches/multi_player_map/src/story_entities/multi_player_world.cc

@@ -118 +118 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
+    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
 
   PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_01 vs OM_GROUP_00_PROJ\n\n");
@@ -123 +125 @@
     this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_00));
-
+    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
 }