Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 27, 2006, 4:30:47 PM (18 years ago)
Author:
rennerc
Message:

dont collide player with himself

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/multi_player_map/src/story_entities/multi_player_world.cc

    r8717 r8833  
    9393void MultiPlayerWorld::collisionDetection()
    9494{
    95   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    96     this->dataTank->objectManager->getObjectList(OM_PLAYERS));
     95  //CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS), this->dataTank->objectManager->getObjectList(OM_PLAYERS));
    9796  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    9897    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
     98   
     99  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     100    this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
     101  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     102    this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
    99103
    100104  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
Note: See TracChangeset for help on using the changeset viewer.