Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 2, 2015, 4:48:27 PM (9 years ago)
Author:
gania
Message:

small fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc

    r10731 r10759  
    4444        this->goalProtect_ = NULL;*/
    4545       
    46         //this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&FleetController::action, this)));
     46        this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&FleetController::action, this)));
    4747    }
    4848
     
    5656    void FleetController::action()
    5757    {
    58 
     58        this->divisions_.clear();
     59       
     60        /*for (ObjectList<DivisionController>::iterator it = ObjectList<DivisionController>::begin(); it; ++it)
     61        {
     62            if ((this->getControllableEntity()->getTeam() == (it)->getControllableEntity()->getTeam()))
     63            {
     64                this->divisions_.push_back(*(it));
     65            }
     66        }
     67        for (ObjectList<Controller>::iterator it = ObjectList<Controller>::begin(); it; ++it)
     68        {
     69            if ((this->getControllableEntity()->getTeam() != (it)->getControllableEntity()->getTeam()) && (it)->getControllableEntity()->getTeam() != 0)
     70            {
     71                for(std::vector<WeakPtr<DivisionController> >::iterator it2 = divisions_.begin(); it2 != divisions_.end(); ++it2) {
     72                    (*it2)->setTarget(it->getControllableEntity());   
     73                }               
     74                break;
     75            }
     76        }*/
    5977
    6078    }
Note: See TracChangeset for help on using the changeset viewer.