- Timestamp:
- May 21, 2010, 10:25:27 AM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/rocket (added) merged: 6778-6781,6783-6785,6803,6809-6811,6813-6818,6827,6834,6863,6878,6900,6902-6905,6943,6948-6950
- Property svn:mergeinfo changed
-
code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc
r6598 r6951 364 364 Ogre::RaySceneQueryResult& result = rsq->execute(); 365 365 Pawn* pawn = orxonox_cast<Pawn*>(this->getControllableEntity()); 366 WorldEntity* myWe = static_cast<WorldEntity*>(this->getControllableEntity()); 366 367 367 368 Ogre::RaySceneQueryResult::iterator itr; 368 369 for (itr = result.begin(); itr != result.end(); ++itr) 369 370 { 370 if (itr->movable->isInScene() && itr->movable->getMovableType() == "Entity" && itr->distance > 500) 371 // CCOUT(0) << "testing object as target" << endl; 372 if (itr->movable->isInScene() && itr->movable->getMovableType() == "Entity" /*&& itr->distance > 500*/) 371 373 { 372 374 // Try to cast the user pointer 373 375 WorldEntity* wePtr = dynamic_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny())); 376 377 // make sure we don't shoot ourselves 378 if( wePtr==myWe ) 379 continue; 380 374 381 if (wePtr) 375 382 { … … 379 386 while (parent) 380 387 { 381 if (this->targetMask_.isExcluded(parent->getIdentifier()) )388 if (this->targetMask_.isExcluded(parent->getIdentifier()) || parent==myWe) 382 389 { 383 390 parent = parent->getParent(); … … 579 586 } 580 587 } 588 589 590 591 592 581 593 }
Note: See TracChangeset
for help on using the changeset viewer.