[Orxonox-commit 3087] r7781 - code/branches/network5/src/orxonox/controllers

[scheusso at orxonox.net]

Author: scheusso
Date: 2010-12-19 21:48:30 +0100 (Sun, 19 Dec 2010)
New Revision: 7781

Modified:
   code/branches/network5/src/orxonox/controllers/NewHumanController.cc
Log:
fix: NHC doesn't aim (and shoot) at own spaceship and objects to close to the camera anymore


Modified: code/branches/network5/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/network5/src/orxonox/controllers/NewHumanController.cc	2010-12-19 20:41:57 UTC (rev 7780)
+++ code/branches/network5/src/orxonox/controllers/NewHumanController.cc	2010-12-19 20:48:30 UTC (rev 7781)
@@ -374,7 +374,7 @@
         for (itr = result.begin(); itr != result.end(); ++itr)
         {
 //             CCOUT(0) << "testing object as target" << endl;
-            if (itr->movable->isInScene() && itr->movable->getMovableType() == "Entity" /*&& itr->distance > 500*/)
+            if (itr->movable->isInScene() && itr->movable->getMovableType() == "Entity" && itr->distance > 200)
             {
                 // Try to cast the user pointer
                 WorldEntity* wePtr;