Changeset 10216 for code/trunk/src/orxonox/controllers/ArtificialController.cc

Timestamp:

Jan 31, 2015, 6:03:17 PM (10 years ago)

Author:

landauf

Message:

merged branch presentationFS14 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ArtificialController.cc (modified) (1 diff)

code/trunk/src/orxonox/controllers/ArtificialController.cc

@@ -94 +94 @@
         static const float hardcoded_projectile_speed = 1250;
 
-        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getPosition(), hardcoded_projectile_speed, this->target_->getPosition(), this->target_->getVelocity());
+        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), hardcoded_projectile_speed, this->target_->getWorldPosition(), this->target_->getVelocity());
         this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO);