[Orxonox-commit 6234] r10891 - code/branches/campaignHS15/src/orxonox/controllers

[gania at orxonox.net]

Author: gania
Date: 2015-11-30 13:08:21 +0100 (Mon, 30 Nov 2015)
New Revision: 10891

Modified:
   code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc
Log:
hotfix for isnan

Modified: code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc	2015-11-30 09:26:22 UTC (rev 10890)
+++ code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc	2015-11-30 12:08:21 UTC (rev 10891)
@@ -215,7 +215,8 @@
         Vector3 newPositionOfTarget = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), 
                                                            hardcoded_projectile_speed, this->target_->getWorldPosition(), 
                                                            this->target_->getVelocity());
-        if (!newPositionOfTarget.isNaN())
+        //Vector3.isNaN() is what I used on my machine and it worked...
+        if (!(std::isnan(newPositionOfTarget.x) || std::isnan(newPositionOfTarget.y) || std::isnan(newPositionOfTarget.z)))
         {
             this->setPositionOfTarget(newPositionOfTarget);
         }