Changeset 5955 in orxonox.OLD for branches/powerups/src/world_entities/weapons/aiming_turret.cc

Timestamp:

Dec 7, 2005, 1:05:10 PM (18 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

File:

• branches/powerups/src/world_entities/weapons/aiming_turret.cc (modified) (3 diffs)

branches/powerups/src/world_entities/weapons/aiming_turret.cc

@@ -26 +26 @@
 
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "factory.h"
@@ -93 +92 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_ROCKET);
+  this->setProjectileType(CL_GUIDED_MISSILE);
 
 
@@ -142 +141 @@
     return;
 
-    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
+  pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
+  pj->setTarget(this->target->getParent());
   pj->setParent(NullParent::getInstance());
   pj->setAbsCoor(this->getEmissionPoint());