Changeset 1941 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 14, 2004, 12:43:03 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/core/player.cc: This file has finaly been fixed, with
svn merge ​https://open.datacore.ch/pw/orxonox/trunk/core/player.cc -r 1940:1930. Now it should compile again.

File:

• orxonox/trunk/core/player.cc (modified) (1 diff)

orxonox/trunk/core/player.cc

@@ -75 +75 @@
 void Player::shoot(int n) 
 {
-  shootLaser->addShoot(xCor, yCor, zCor);
-  shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
-  shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
-  shootRocket->addShoot(xCor, yCor, zCor);
+  if (shootLaser->inhibitor++ <= 100)
+    shootLaser->addShoot(xCor, yCor, zCor);
+  else if (shootLaser->inhibitor++ <= 200)
+    shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
+  else if (shootLaser->inhibitor++ <= 300)
+    shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
+  else
+    shootLaser->inhibitor =0;
+  
+  if (shootRocket->inhibitor++ >=80)
+    {
+      shootRocket->addBackParable(xCor, yCor, zCor);
+      shootRocket->addSideAcc(xCor, yCor, zCor, RIGHT);
+      shootRocket->addSideAcc(xCor, yCor, zCor, LEFT);
+      shootRocket->addRotater(xCor, yCor, zCor);
+      if (shootRocket->inhibitor >=90)
+        shootRocket->inhibitor =0;
+    }
   //cout << "Player::shoot" << endl;
 }