Changeset 10181 for code/branches/presentationHS14/src/orxonox/controllers
- Timestamp:
- Dec 15, 2014, 3:58:14 PM (10 years ago)
- Location:
- code/branches/presentationHS14
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationHS14
- Property svn:mergeinfo changed
/code/branches/towerdefenseHS14 (added) merged: 10086,10091,10105-10106,10109,10123,10125-10126,10132,10134,10140-10142,10144,10146-10147,10151,10158-10159,10172
- Property svn:mergeinfo changed
-
code/branches/presentationHS14/src/orxonox/controllers/ArtificialController.cc
r9667 r10181 94 94 static const float hardcoded_projectile_speed = 1250; 95 95 96 this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->get Position(), hardcoded_projectile_speed, this->target_->getPosition(), this->target_->getVelocity());96 this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), hardcoded_projectile_speed, this->target_->getWorldPosition(), this->target_->getVelocity()); 97 97 this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO); 98 98
Note: See TracChangeset
for help on using the changeset viewer.