Changeset 11058 for code/branches/cpp11_v3/src/orxonox/controllers
- Timestamp:
 - Jan 10, 2016, 8:01:09 PM (10 years ago)
 - Location:
 - code/branches/cpp11_v3/src/orxonox/controllers
 - Files:
 - 
          
- 6 edited
 
- 
          DivisionController.cc (modified) (1 diff)
 - 
          DivisionController.h (modified) (1 diff)
 - 
          SectionController.cc (modified) (1 diff)
 - 
          SectionController.h (modified) (1 diff)
 - 
          WingmanController.cc (modified) (1 diff)
 - 
          WingmanController.h (modified) (1 diff)
 
 
Legend:
- Unmodified
 - Added
 - Removed
 
- 
        
code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc
r11057 r11058 55 55 this->actionpoints_.clear(); 56 56 } 57 void DivisionController::tick(float dt)58 {59 if (!this->isActive())60 return;61 62 SUPER(DivisionController, tick, dt);63 64 }65 57 void DivisionController::action() 66 58 {  - 
        
code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h
r11057 r11058 50 50 //----[/language demanded functions]---- 51 51 52 //----[orxonox demanded functions]----53 virtual void tick(float dt);54 //----[orxonox demanded functions]----55 56 52 //----[own functions]---- 57 53 virtual bool setFollower(ActionpointController* newFollower);  - 
        
code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc
r11057 r11058 55 55 this->parsedActionpoints_.clear(); 56 56 this->actionpoints_.clear(); 57 }58 59 //----in tick, move (or look) and shoot----60 void SectionController::tick(float dt)61 {62 if (!this->isActive())63 return;64 65 SUPER(SectionController, tick, dt);66 67 57 } 68 58  - 
        
code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h
r11057 r11058 49 49 //----[/language demanded functions]---- 50 50 51 //----[orxonox demanded functions]----52 virtual void tick(float dt);53 //----[/orxonox demanded functions]----54 55 51 //----[own functions]---- 56 52 ActionpointController* findNewDivisionLeader();  - 
        
code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc
r11057 r11058 53 53 this->parsedActionpoints_.clear(); 54 54 this->actionpoints_.clear(); 55 }56 57 //----in tick, move (or look) and shoot----58 void WingmanController::tick(float dt)59 {60 if (!this->isActive())61 return;62 63 SUPER(WingmanController, tick, dt);64 65 55 } 66 56  - 
        
code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h
r11057 r11058 51 51 52 52 //----[orxonox demanded functions]---- 53 virtual void tick(float dt);54 53 virtual bool hasWingman() 55 54 { return false; }  
Note: See TracChangeset
          for help on using the changeset viewer.
      


            






