Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7070 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Feb 7, 2006, 2:25:35 PM (19 years ago)
Author:
bensch
Message:

fix targettingturret

Location:
trunk/src/world_entities/weapons
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/weapons/aiming_turret.cc

    r6760 r7070  
    4141{
    4242  this->init();
    43 
    4443  this->loadModel("models/guns/turret2.obj");
    45 
    46 
    47   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
    48   this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
    49   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
    5044}
    5145
    … …  
    9084
    9185  this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
    92   this->setProjectileType(CL_ROCKET);
     86  this->setProjectileType(CL_GUIDED_MISSILE);
    9387
    9488
    … …  
    10094  this->target->setRange(400);
    10195  this->target->setAngle(M_PI_2);
     96
     97  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
     98  this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
     99  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     100
    102101}
    103102

  • trunk/src/world_entities/weapons/targeting_turret.cc

    r6760 r7070  
    9595  this->target->setRange(1000);
    9696  this->target->setAngle(M_PI_4);
     97  this->lockedTarget = this->target;
     98
    9799  this->lockedTime = 0;
    98100  this->neededLockTime = 2;
    … …  
    101103
    102104
    103   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
     105  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
    104106  this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
    105107  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");

  • trunk/src/world_entities/weapons/turret.cc

    r6920 r7070  
    4040{
    4141  this->init();
    42 
    43   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
    44   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
    45   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
    46 
    4742}
    4843
    … …  
    9792  this->setEmissionPoint(1.684, 0.472, 0);
    9893  //this->getProjectileFactory()->prepare(100);
     94
     95  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
     96  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
     97  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     98
    9999}
    100100
Note: See TracChangeset for help on using the changeset viewer.