Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10415 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Jan 27, 2007, 10:43:17 PM (18 years ago)
Author:
patrick
Message:

changed the path names to reflect the new data repos

Location:
trunk/src/world_entities
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/npcs/generic_npc.cc

    r10386 r10415  
    8989  this->toList(OM_GROUP_00);
    9090
    91 //   this->soundBuffer = OrxSound::ResourceSoundBuffer("sound/rain.wav");
     91//   this->soundBuffer = OrxSound::ResourceSoundBuffer("sounds/rain.wav");
    9292
    9393  time = 30.0f;

  • trunk/src/world_entities/power_ups/param_power_up.cc

    r10114 r10415  
    4141{
    4242  this->init();
    43   this->loadPickupSound("sound/powerups/power_up_6.wav");
     43  this->loadPickupSound("sounds/powerups/power_up_6.wav");
    4444  if( root != NULL)
    4545    this->loadParams(root);

  • trunk/src/world_entities/power_ups/weapon_power_up.cc

    r10114 r10415  
    4747{
    4848  this->registerObject(this, WeaponPowerUp::_objectList);
    49   this->loadPickupSound("sound/powerups/whats this2.wav");
     49  this->loadPickupSound("sounds/powerups/whats this2.wav");
    5050
    5151  this->weaponXML = NULL;

  • trunk/src/world_entities/projectiles/bomb.cc

    r10114 r10415  
    7676  this->detonationMaterial->setDiffuse(1, 0, 0);
    7777
    78   this->loadExplosionSound("sound/explosions/explosion_7_far.wav");
     78  this->loadExplosionSound("sounds/explosions/explosion_7_far.wav");
    7979  //   this->detonationMaterial->setTransparency(.1);
    8080  /**

  • trunk/src/world_entities/projectiles/boomerang_projectile.cc

    r10317 r10415  
    3838
    3939  this->loadModel("models/projectiles/orx-rocket.obj", 2.0);
    40   this->loadExplosionSound("sound/explosions/explosion_4.wav");
     40  this->loadExplosionSound("sounds/explosions/explosion_4.wav");
    4141
    4242

  • trunk/src/world_entities/projectiles/guided_missile.cc

    r10317 r10415  
    3737
    3838  this->loadModel("models/projectiles/orx-rocket.obj", 2.0);
    39   this->loadExplosionSound("sound/explosions/explosion_4.wav");
     39  this->loadExplosionSound("sounds/explosions/explosion_4.wav");
    4040
    4141

  • trunk/src/world_entities/projectiles/swarm_projectile.cc

    r10368 r10415  
    4242/*  this->loadModel("models/projectiles/orx-rocket.obj", 0.5);*/
    4343  this->loadModel("models/projectiles/swarm_projectile.obj"); // no double rescale (see draw())
    44   this->loadExplosionSound("sound/explosions/explosion_4.wav");
     44  this->loadExplosionSound("sounds/explosions/explosion_4.wav");
    4545
    4646

  • trunk/src/world_entities/space_ships/helicopter.cc

    r10114 r10415  
    112112
    113113  //load sound
    114   this->chopperBuffer = OrxSound::ResourceSoundBuffer("sound/engine/chopper.wav");
     114  this->chopperBuffer = OrxSound::ResourceSoundBuffer("sounds/engine/chopper.wav");
    115115
    116116}

  • trunk/src/world_entities/space_ships/hover.cc

    r10114 r10415  
    7979  //if (this->hoverBuffer != NULL)
    8080  //  ResourceManager::getInstance()->unload(this->hoverBuffer);
    81   //this->hoverBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/engine/hover.wav", WAV);
     81  //this->hoverBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sounds/engine/hover.wav", WAV);
    8282
    8383}

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

    r10368 r10415  
    101101  this->getProjectileFactory()->prepare(10);
    102102
    103   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
    104   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
    105   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     103  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
     104  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
     105  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
    106106
    107107}

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

    r10114 r10415  
    9898  this->target.setAngle(M_PI_2);
    9999
    100   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
    101   this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
    102   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     100  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
     101  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
     102  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
    103103
    104104}

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

    r10114 r10415  
    9494  //this->getProjectileFactory()->prepare(100);
    9595
    96   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
    97   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
    98   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     96  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
     97  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
     98  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
    9999
    100100}

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

    r10114 r10415  
    8585  //this->minCharge = 2;
    8686
    87   this->setActionSound(WA_SHOOT, "sound/explo.wav");
    88   this->setActionSound(WA_ACTIVATE, "sound/voices/cannon.wav");
     87  this->setActionSound(WA_SHOOT, "sounds/explo.wav");
     88  this->setActionSound(WA_ACTIVATE, "sounds/voices/cannon.wav");
    8989
    9090  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_HEAVY);

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

    r10368 r10415  
    4141  }
    4242  delete [] this->emissionPoint;
    43  
     43
    4444   delete [] this->shootAnim;
    4545   delete [] this->objComp;
    … …  
    7373
    7474  this->loadModel("models/guns/fragcannon.obj", .4);
    75  
     75
    7676
    7777  this->setStateDuration(WS_SHOOTING, 0.5);   // 2 Schuss pro Sekunde
    … …  
    8484  //this->minCharge = 2;
    8585
    86   this->setActionSound(WA_SHOOT, "sound/laser.wav");
    87   this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
    88   this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
     86  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
     87  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
     88  this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
    8989
    9090  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);

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

    r10114 r10415  
    7272  //this->minCharge = 2;
    7373
    74   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_4.wav");
    75   this->setActionSound(WA_ACTIVATE, "sound/powerups/whats this2.wav");
    76   this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
     74  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_4.wav");
     75  this->setActionSound(WA_ACTIVATE, "sounds/powerups/whats this2.wav");
     76  this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
    7777
    7878  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_HEAVY);

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

    r10114 r10415  
    6868  //this->minCharge = 2;
    6969
    70   this->setActionSound(WA_SHOOT, "sound/laser.wav");
    71   this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
     70  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
     71  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
    7272
    7373

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

    r10368 r10415  
    6767
    6868  this->loadModel("models/guns/gattling.obj", 0.333);
    69  
     69
    7070
    7171  this->setStateDuration(WS_SHOOTING, 0.05);  // 20 Schuss pro Sekunde
    … …  
    7878  //this->minCharge = 2;
    7979
    80   this->setActionSound(WA_SHOOT, "sound/laser.wav");
    81   this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
    82   this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
     80  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
     81  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
     82  this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
    8383
    8484  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);

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

    r10368 r10415  
    6363  //this->minCharge = 2;
    6464
    65   this->setActionSound(WA_SHOOT, "sound/laser.wav");
    66   this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
    67   this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
     65  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
     66  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
     67  this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
    6868
    6969  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);

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

    r10368 r10415  
    110110  this->getProjectileFactory()->prepare(this->spikes);  //we don't need more...
    111111
    112 //   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
    113 //   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
    114 //   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     112//   this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
     113//   this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
     114//   this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
    115115
    116116}

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

    r10368 r10415  
    104104  this->getProjectileFactory()->prepare(50);
    105105
    106   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
    107   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
    108   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     106  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
     107  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
     108  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
    109109
    110110}

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

    r10368 r10415  
    102102  this->getProjectileFactory()->prepare(50);
    103103
    104   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
    105   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
    106   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     104  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
     105  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
     106  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
    107107
    108108}

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

    r10114 r10415  
    9292
    9393
    94   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
    95   this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
    96   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
     94  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
     95  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
     96  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
    9797}
    9898

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

    r10114 r10415  
    124124  //this->minCharge = 2;
    125125
    126   this->setActionSound(WA_SHOOT, "sound/laser.wav");
    127   this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
     126  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
     127  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
    128128
    129129

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

    r10114 r10415  
    9393  //this->getProjectileFactory()->prepare(100);
    9494
    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");
     95  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
     96  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
     97  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
    9898
    9999}

  • trunk/src/world_entities/weather_effects/lightning_effect.cc

    r10317 r10415  
    128128
    129129    //load sound
    130     this->thunderBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/thunder.wav");
     130    this->thunderBuffer = OrxSound::ResourceSoundBuffer("sounds/atmosphere/thunder.wav");
    131131
    132132}

  • trunk/src/world_entities/weather_effects/rain_effect.cc

    r10114 r10415  
    6464
    6565    //load rain sound
    66     this->rainBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/rain.wav");
     66    this->rainBuffer = OrxSound::ResourceSoundBuffer("sounds/atmosphere/rain.wav");
    6767
    6868    //load wind sound
    6969    if (this->rainWindForce != 0) {
    70       this->windBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/wind.wav");
     70      this->windBuffer = OrxSound::ResourceSoundBuffer("sounds/atmosphere/wind.wav");
    7171    }
    7272

  • trunk/src/world_entities/weather_effects/snow_effect.cc

    r10317 r10415  
    5656  if (this->snowWindForce >= 1)
    5757  {
    58     this->windBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/wind.wav");
     58    this->windBuffer = OrxSound::ResourceSoundBuffer("sounds/atmosphere/wind.wav");
    5959  }
    6060
Note: See TracChangeset for help on using the changeset viewer.