Changeset 8849 in orxonox.OLD for branches/multi_player_map/src/story_entities/multi_player_world.cc

Timestamp:

Jun 28, 2006, 1:49:00 PM (18 years ago)

Author:

patrick

Message:

collision detection works now

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

@@ -96 +96 @@
 
   PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_PLAYERS_PROJ\n\n");
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
-    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ),
+  this->dataTank->objectManager->getObjectList(OM_PLAYERS));
   PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_GROUP_01_PROJ\n\n");
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
@@ -108 +108 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     this->dataTank->objectManager->getObjectList(OM_GROUP_01));
-