Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8839 in orxonox.OLD for branches


Ignore:
Timestamp:
Jun 28, 2006, 1:04:04 AM (18 years ago)
Author:
patrick
Message:

muliplayer: collisions with all entities expect the ones from player_proj seem to work

Location:
branches/multi_player_map/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/multi_player_map/src/story_entities/multi_player_world.cc

    r8838 r8839  
    9999    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
    100100
     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
    101106  PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_GROUP_01_PROJ\n\n");
    102107  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     
    112117  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
    113118    this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
     119  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));
    114123  PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_00 vs OM_GROUP_01\n\n");
    115124  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    116125    this->dataTank->objectManager->getObjectList(OM_GROUP_01));
    117126
    118   PRINTF(5)("\n-----------------------------------------\nchecking OM_COMMON vs OM_GROUP_00\n\n");
    119   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    120     this->dataTank->objectManager->getObjectList(OM_COMMON));
    121   PRINTF(5)("\n-----------------------------------------\nchecking OM_COMMON vs OM_GROUP_01\n\n");
    122   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
    123     this->dataTank->objectManager->getObjectList(OM_COMMON));
    124   PRINTF(5)("\n-----------------------------------------\nchecking OM_COMMON vs OM_PLAYER\n\n");
    125   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
    126   this->dataTank->objectManager->getObjectList(OM_COMMON));
    127127
    128128}
  • branches/multi_player_map/src/world_entities/space_ships/space_ship.cc

    r8838 r8839  
    384384  this->shiftCoor(move);
    385385
     386  PRINTF(0)("id of %s is: %i\n", this->getName(), this->getOMListNumber());
    386387
    387388}
     
    511512void SpaceShip::respawn( )
    512513{
    513   if( this->uniqueID %2)
    514   toList( OM_GROUP_00 );
    515   else
    516     toList(OM_GROUP_01);
    517 }
    518 
    519 
    520 
    521 
     514  toList( OM_PLAYERS );
     515}
     516
     517
     518
     519
Note: See TracChangeset for help on using the changeset viewer.