Changeset 10238 for code/branches/presentationHS14merge/src

Timestamp:

Feb 1, 2015, 6:42:19 PM (10 years ago)

Author:

landauf

Message:

merged weaponupdateHS14 (except some unnecessary changes)

Location:

code/branches/presentationHS14merge

Files:

• . (modified) (1 prop)
• src/modules/weapons/RocketController.cc (modified) (2 diffs)

code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc

@@ -41 +41 @@
 namespace orxonox
 {
+    RegisterClass(RocketController);
+
     /**
     @brief
@@ -97 +99 @@
         if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000)
             this->rocket_->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
-        if (distance <1000) this->rocket_->setAcceleration(0,0,0);
+        if (distance < 1000) this->rocket_->setAcceleration(0,0,0);
 
         this->rocket_->rotateYaw(-sgn(coord.x)*coord.x*coord.x);