Changeset 10271 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Jan 17, 2007, 6:15:21 PM (18 years ago)

Author:

nicolasc

Message:

working spikeballs

Location:

branches/playability/src/world_entities/weapons

Files:

• heavy_blaster.cc (modified) (1 diff)
• spike_launcher.cc (modified) (3 diffs)
• spike_thrower.cc (modified) (3 diffs)

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -41 +41 @@
   }
   delete [] this->emissionPoint;
-  
-   delete [] this->shootAnim;
-   delete [] this->objComp;
+  delete [] this->shootAnim;
+  delete [] this->objComp;
 /*
     for(int j = 0; j < this->getSegs(); j++)

branches/playability/src/world_entities/weapons/spike_launcher.cc

@@ -239 +239 @@
 void SpikeLauncher::fire()
 {
-  // temporary solution to test the module
   updateFireDir(VECTOR_RAND(1), 20);
 
-  printf("firing spikes\n");
   Projectile* pj = NULL;
   for (int i = 0; i < this->spikes; i++)
@@ -250 +248 @@
       return;
 
-//     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*115.0 + VECTOR_RAND(10)));
     pj->setVelocity(this->launcher[i].getNormalized() * 300.0);
 
@@ -257 +254 @@
     Quaternion q;
     pj->setRelDir(q.lookAt(Vector(), this->launcher[i], VECTOR_RAND(1)));
-//     pj->setRelDir(90, this->launcher[i].x, this->launcher[i].y, this->launcher[i].z);
-
-/*    pj->toList(this->getOMListNumber());*/
+
     pj->activate();
   }

branches/playability/src/world_entities/weapons/spike_thrower.cc

@@ -82 +82 @@
   animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
   animation2->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
-  animation2->addKeyFrame(Vector(0, -.5, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);*/
-/*
+  animation2->addKeyFrame(Vector(0, -.5, 0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_CONSTANT);
+
   animation1->setInfinity(ANIM_INF_CONSTANT);
   animation2->setInfinity(ANIM_INF_CONSTANT);*/
@@ -104 +104 @@
   this->getProjectileFactory()->prepare(50);
 
-//   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
-//   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-//   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
+  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 
 }
@@ -156 +156 @@
   pj->setParent(PNode::getNullParent());
 
-//   pj->setVelocity(this->getParent()->getAbsDir().apply(Vector(1,0,0))*200 + this->getParent()->getParent()->getVelocity());
-  pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*160);
+  dynamic_cast<SpikeBall*>(pj)->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*110);
 
   pj->setAbsCoor(this->getEmissionPoint());