Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10290


Ignore:
Timestamp:
Mar 1, 2015, 2:17:08 PM (9 years ago)
Author:
landauf
Message:

details

Location:
code/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

    r9945 r10290  
    6565
    6666
    67         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&HsW01::shot, this)));
     67        this->delayTimer_.setTimer(this->delay_, false, createExecutor(createFunctor(&HsW01::shot, this)));
    6868        this->delayTimer_.stopTimer();
    6969
  • code/trunk/src/orxonox/controllers/FormationController.cc

    r9800 r10290  
    678678               (*it)->state_=FREE;
    679679               (*it)->forceFreedom();
    680                (*it)->target_=originator;
     680               (*it)->setTarget(originator);
    681681           }
    682682           i++;
     
    935935                        < this->targetPosition_.squaredDistance(this->getControllableEntity()->getPosition()) * (1.5f + acos((this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).dotProduct(distanceCurrent) / speed / distanceCurrent.length()) / math::twoPi) + rnd(-250, 250))
    936936                {
    937                     this->target_ = (*it);
    938                     this->targetPosition_ = it->getPosition();
     937                    this->setTarget(*it);
    939938                }
    940939            }
Note: See TracChangeset for help on using the changeset viewer.