Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9187 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 5, 2006, 7:29:00 AM (18 years ago)
Author:
patrick
Message:

well… it does… but at which price?

Location:
branches/presentation/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/lib/collision_reaction/collision_handle.cc

    r9186 r9187  
    230230  for(; it < this->targetList.end(); it++)
    231231  {
    232     if(collisionEvent->getEntityB()->isA(CL_AIMING_SYSTEM))
    233     {
    234        PRINTF(0)("I am: %s colliding with: %s\n", owner->getClassName(), collisionEvent->getEntityB()->getClassName(), *it);
    235        if( collisionEvent->getEntityA() == this->owner) {
    236          PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
    237          collisionEvent->getEntityB()->getClassName(), *it);
    238          if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
    239            PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
    240            collisionEvent->getEntityB()->getClassName(), *it);
    241             }
    242        }
    243        else {
    244          PRINTF(0)("I am not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
    245          collisionEvent->getEntityB()->getClassName(), *it);
    246          if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
    247            PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
    248            collisionEvent->getEntityA()->getClassName(), *it);
    249             }
    250        }
    251 
    252     }
     232//     if(collisionEvent->getEntityB()->isA(CL_AIMING_SYSTEM) || collisionEvent->getEntityA()->isA(CL_AIMING_SYSTEM))
     233//     {
     234//        PRINTF(0)("I am: %s colliding with: %s\n", owner->getClassName(), collisionEvent->getEntityB()->getClassName(), *it);
     235//        if( collisionEvent->getEntityA() == this->owner) {
     236//          PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
     237//          collisionEvent->getEntityB()->getClassName(), *it);
     238//          if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
     239//            PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
     240//            collisionEvent->getEntityB()->getClassName(), *it);
     241//             }
     242//        }
     243//        else {
     244//          PRINTF(0)("I am not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
     245//          collisionEvent->getEntityB()->getClassName(), *it);
     246//          if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
     247//            PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
     248//            collisionEvent->getEntityA()->getClassName(), *it);
     249//             }
     250//        }
     251//
     252//     }
    253253
    254254    if( collisionEvent->getEntityA() == this->owner) {
     
    280280  {
    281281
    282     if(collision->getEntityB()->isA(CL_AIMING_SYSTEM))
    283     {
    284       PRINTF(0)("I am: %s colliding with: %s\n", owner->getClassName(), collision->getEntityB()->getClassName(), *it);
    285       if( collision->getEntityA() == this->owner) {
    286         PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
    287         collision->getEntityB()->getClassName(), *it);
    288         if( collision->getEntityB()->isA((ClassID)(*it))) {
    289           PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
    290           collision->getEntityB()->getClassName(), *it);
    291         }
    292       }
    293       else {
    294         PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
    295         collision->getEntityB()->getClassName(), *it);
    296         if( collision->getEntityA()->isA((ClassID)(*it))) {
    297           PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
    298           collision->getEntityA()->getClassName(), *it);
    299         }
    300       }
    301     }
     282//     if(collision->getEntityB()->isA(CL_AIMING_SYSTEM) || collision->getEntityA()->isA(CL_AIMING_SYSTEM))
     283//     {
     284//       PRINTF(0)("Shared!!! I am: %s colliding with: %s\n", owner->getClassName(), collision->getEntityB()->getClassName(), *it);
     285//       if( collision->getEntityA() == this->owner) {
     286//         PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
     287//         collision->getEntityB()->getClassName(), *it);
     288//         if( collision->getEntityB()->isA((ClassID)(*it))) {
     289//           PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
     290//           collision->getEntityB()->getClassName(), *it);
     291//         }
     292//       }
     293//       else {
     294//         PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
     295//         collision->getEntityB()->getClassName(), *it);
     296//         if( collision->getEntityA()->isA((ClassID)(*it))) {
     297//           PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
     298//           collision->getEntityA()->getClassName(), *it);
     299//         }
     300//       }
     301//     }
    302302
    303303    if( collision->getEntityA() == this->owner) {
    304       if( collision->getEntityB()->isA((ClassID)(*it)))
     304      if( collision->getEntityA()->isA((ClassID)(*it)))
    305305        return true; }
    306306      else {
    307         if( collision->getEntityA()->isA((ClassID)(*it)))
     307        if( collision->getEntityB()->isA((ClassID)(*it)))
    308308          return true; }
    309309  }
  • branches/presentation/src/story_entities/game_world.cc

    r9184 r9187  
    468468  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
    469469      this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
    470   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    471     this->dataTank->objectManager->getObjectList(OM_GROUP_01));
     470  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
     471    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
    472472
    473473  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
  • branches/presentation/src/world_entities/weapons/aiming_system.cc

    r9186 r9187  
    6262
    6363  // registering default reactions:
    64   this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
     64//   this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
    6565  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
    6666
Note: See TracChangeset for help on using the changeset viewer.