Changeset 10631 for code/trunk
- Timestamp:
- Oct 10, 2015, 6:38:44 PM (9 years ago)
- Location:
- code/trunk/src/orxonox/controllers
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/controllers/ArtificialController.cc
r10624 r10631 82 82 void ArtificialController::changedControllableEntity() 83 83 { 84 FormationController::changedControllableEntity(); // super 85 84 86 if (!this->getControllableEntity()) 85 87 this->removeFromFormation(); -
code/trunk/src/orxonox/controllers/FormationController.cc
r10624 r10631 1087 1087 } 1088 1088 1089 void FormationController::changedControllableEntity() 1090 { 1091 Controller::changedControllableEntity(); // super 1092 1093 // when changing the controllable entity, ensure that the controller does not use the new entity as target 1094 if (this->target_ && this->getControllableEntity() == static_cast<ControllableEntity*>(this->target_)) 1095 this->forgetTarget(); 1096 } 1089 1097 } -
code/trunk/src/orxonox/controllers/FormationController.h
r9797 r10631 99 99 FormationController* getSlave( void ) { return this->slaves_.back(); } 100 100 101 virtual void changedControllableEntity(); 102 101 103 protected: 102 104 bool formationFlight_; -
code/trunk/src/orxonox/controllers/NewHumanController.cc
r10624 r10631 496 496 void NewHumanController::changedControllableEntity() 497 497 { 498 HumanController::changedControllableEntity(); // super 499 498 500 this->controlMode_ = 0; 499 501 this->centerCursor();
Note: See TracChangeset
for help on using the changeset viewer.