Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7078 in orxonox.OLD for trunk/src/story_entities


Ignore:
Timestamp:
Feb 7, 2006, 4:13:01 PM (19 years ago)
Author:
patrick
Message:

trunk: player group handling

Location:
trunk/src/story_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/story_entities/game_world.cc

    r7035 r7078  
    385385  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
    386386      this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
     387  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     388  this->dataTank->objectManager->getObjectList(OM_GROUP_01));
    387389
    388390  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),

  • trunk/src/story_entities/multi_player_world_data.cc

    r7074 r7078  
    212212        playable = dynamic_cast<Playable*>(playableList->front());
    213213        this->localPlayer->setPlayable(playable);
    214         playable->toList(OM_GROUP_01);
     214        playable->toList(OM_GROUP_00);
    215215        playable->setAbsCoor(213.37, 57.71, -47.98);
    216216        playable->setAbsDir(Quaternion(0.16, 0.98, -0.10));
Note: See TracChangeset for help on using the changeset viewer.