Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1941 in orxonox.OLD for orxonox/trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/core/player.cc

    r1931 r1941  
    7575void Player::shoot(int n)
    7676{
    77   shootLaser->addShoot(xCor, yCor, zCor);
    78   shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
    79   shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
    80   shootRocket->addShoot(xCor, yCor, zCor);
     77  if (shootLaser->inhibitor++ <= 100)
     78    shootLaser->addShoot(xCor, yCor, zCor);
     79  else if (shootLaser->inhibitor++ <= 200)
     80    shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
     81  else if (shootLaser->inhibitor++ <= 300)
     82    shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
     83  else
     84    shootLaser->inhibitor =0;
     85 
     86  if (shootRocket->inhibitor++ >=80)
     87    {
     88      shootRocket->addBackParable(xCor, yCor, zCor);
     89      shootRocket->addSideAcc(xCor, yCor, zCor, RIGHT);
     90      shootRocket->addSideAcc(xCor, yCor, zCor, LEFT);
     91      shootRocket->addRotater(xCor, yCor, zCor);
     92      if (shootRocket->inhibitor >=90)
     93        shootRocket->inhibitor =0;
     94    }
    8195  //cout << "Player::shoot" << endl;
    8296}
Note: See TracChangeset for help on using the changeset viewer.