Changeset 1921 in orxonox.OLD for orxonox

Timestamp:

Jun 8, 2004, 2:24:24 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: missiles are slower, and there are less

Location:

orxonox/trunk/core

Files:

• shoot_rocket.cc (modified) (3 diffs)
• shoot_rocket.h (modified) (2 diffs)

orxonox/trunk/core/shoot_rocket.cc

@@ -26 +26 @@
 
 
-ShootRocket::ShootRocket () 
+ShootRocket::ShootRocket ()
 {
   lastShoot = null;
   step = 1.0;
+  inhibitor =0;
 }
 
@@ -113 +114 @@
 void ShootRocket::addShoot(float x, float y, float z)
 {
-  //cout << "ShootRocket::addShoot" << endl;
-  shoot* sh = new shoot;
-  sh->xCor = x; sh->yCor = y; sh->zCor = z;
-  sh->xVel = -1+(float)random() / 1000000000/step; 
-  sh->yVel = -1/step;
-  sh->zVel = 1-(float)random() / 1000000000/step;
-  sh->xAcc = 0; sh->yAcc = .1/step; sh->zAcc = 0;
-  sh->next = lastShoot;
-  lastShoot = sh;
+  inhibitor++;
+  if (inhibitor >= 10)
+    {
+      //cout << "ShootRocket::addShoot" << endl;
+      shoot* sh = new shoot;
+      sh->xCor = x; sh->yCor = y; sh->zCor = z;
+      sh->xVel = (-1+(float)random() / 1000000000/step)/5; 
+      sh->yVel = -.3;
+      sh->zVel = (1-(float)random() / 1000000000/step)/5;
+      sh->xAcc = 0; sh->yAcc = .01/step; sh->zAcc = 0;
+      sh->next = lastShoot;
+      lastShoot = sh;
+      inhibitor =0;
+    }
 }
 
@@ -131 +137 @@
   sh->xCor = x; sh->yCor = y; sh->zCor = z;
   sh->xVel = xVel/step; sh->yVel = yVel/step; sh->zVel = zVel/step;
-  sh->xAcc = 0; sh->yAcc = .05; sh->zAcc = 0;
+  sh->xAcc = 0; sh->yAcc = .02; sh->zAcc = 0;
   sh->next = lastShoot;
   lastShoot = sh;

orxonox/trunk/core/shoot_rocket.h

@@ -8 +8 @@
 #include "stdincl.h"
 #include "data_tank.h"
+#include "npc.h"
 
 class ShootRocket {
@@ -33 +34 @@
   ShootRocket ();
   ~ShootRocket ();
+  
+  int inhibitor;
 
   void drawShoot(void);