Changeset 9005 for code/branches/presentation2011/src/orxonox/controllers/HumanController.cc

Timestamp:

Dec 19, 2011, 2:43:04 PM (13 years ago)

Author:

willis

Message:

fixed merging some merging bugs and some other bugs…

File:

• code/branches/presentation2011/src/orxonox/controllers/HumanController.cc (modified) (1 diff)

code/branches/presentation2011/src/orxonox/controllers/HumanController.cc

@@ -78 +78 @@
         this->boosting_ = false;
         this->boosting_ = false;
-        this->tempMaster=NULL;
         HumanController::localController_s = this;
         this->boostingTimeout_.setTimer(HumanController::BOOSTING_TIME, false, createExecutor(createFunctor(&HumanController::terminateBoosting, this)));
         this->boostingTimeout_.stopTimer();
-        this->state_=FREE;
     }