Changeset 10290 for code/trunk

Timestamp:

Mar 1, 2015, 2:17:08 PM (10 years ago)

Author:

landauf

Message:

details

Location:

code/trunk/src

Files:

• modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• orxonox/controllers/FormationController.cc (modified) (2 diffs)

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

@@ -65 +65 @@
 
 
-        this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&HsW01::shot, this)));
+        this->delayTimer_.setTimer(this->delay_, false, createExecutor(createFunctor(&HsW01::shot, this)));
         this->delayTimer_.stopTimer();
 

code/trunk/src/orxonox/controllers/FormationController.cc

@@ -678 +678 @@
                (*it)->state_=FREE;
                (*it)->forceFreedom();
-               (*it)->target_=originator;
+               (*it)->setTarget(originator);
            }
            i++;
@@ -935 +935 @@
                         < this->targetPosition_.squaredDistance(this->getControllableEntity()->getPosition()) * (1.5f + acos((this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).dotProduct(distanceCurrent) / speed / distanceCurrent.length()) / math::twoPi) + rnd(-250, 250))
                 {
-                    this->target_ = (*it);
-                    this->targetPosition_ = it->getPosition();
+                    this->setTarget(*it);
                 }
             }