Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 28, 2006, 10:42:16 AM (18 years ago)
Author:
patrick
Message:

muliplayer: restructuring cd code

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r8839 r8841  
    9898  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    9999    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
    100 
    101   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    102   this->dataTank->objectManager->getObjectList(OM_GROUP_00));
    103   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    104   this->dataTank->objectManager->getObjectList(OM_GROUP_01));
    105 
    106100  PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_GROUP_01_PROJ\n\n");
    107101  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    … …  
    110104  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    111105    this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
     106  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     107    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
     108  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     109    this->dataTank->objectManager->getObjectList(OM_GROUP_01));
     110
     111
     112
    112113
    113114  PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_00 vs OM_GROUP_01_PROJ\n\n");
    114115  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    115116    this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
     117  PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_00 vs OM_GROUP_01\n\n");
     118  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     119    this->dataTank->objectManager->getObjectList(OM_GROUP_01));
     120
    116121  PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_01 vs OM_GROUP_00_PROJ\n\n");
    117122  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
    118123    this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
    119124  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
    120   this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
    121   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    122   this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
    123   PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_00 vs OM_GROUP_01\n\n");
    124   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    125     this->dataTank->objectManager->getObjectList(OM_GROUP_01));
    126 
     125  this->dataTank->objectManager->getObjectList(OM_GROUP_00));
    127126
    128127}
Note: See TracChangeset for help on using the changeset viewer.