Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4967 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Jul 28, 2005, 9:24:18 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: multiple sounds on the turret
this does not really work, as openAL is only really able to play back one effect on a SoundSource, this is rather silly…. check it out …

Location:
orxonox/trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/story_entities/world.cc

    r4961 r4967  
    963963
    964964  SoundEngine::getInstance()->update();
    965   music->update();
     965//  music->update();
    966966}
    967967
  • orxonox/trunk/src/world_entities/player.cc

    r4964 r4967  
    8989  this->weaponMan->addWeapon(wpLeft, 1, 0);
    9090  this->weaponMan->addWeapon(wpRight,1 ,1);
     91  this->weaponMan->addWeapon(turret, 2, 2);
    9192  this->weaponMan->addWeapon(turret, 3, 2);
     93  this->weaponMan->addWeapon(wpLeft, 3, 0);
     94  this->weaponMan->addWeapon(wpRight,3 ,1);
    9295
    9396  this->weaponMan->changeWeaponConfig(0);
  • orxonox/trunk/src/world_entities/weapons/turret.cc

    r4966 r4967  
    6565
    6666  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
     67  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
     68  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
    6769
    6870  this->setProjectile(CL_TEST_BULLET);
  • orxonox/trunk/src/world_entities/weapons/weapon.cc

    r4959 r4967  
    164164    if (this->soundBuffers[action] != NULL)
    165165    {
    166       PRINTF(4)("Loaded sound %s to action %s\n", soundFile, actionToChar(action));
     166      PRINTF(4)("Loaded sound %s to action %s.\n", soundFile, actionToChar(action));
    167167    }
    168168    else
    169169    {
    170       PRINTF(4)("failed to load sound %s to %s\n", soundFile, actionToChar(action));
     170      PRINTF(4)("Failed to load sound %s to %s.\n.", soundFile, actionToChar(action));
    171171    }
    172172  }
     
    508508  PRINT(3)("Energy: max: %f; current: %f;  loadedMax: %f; loadedCurrent: %f; chargeMin: %f, chargeMax %f\n",
    509509            this->energyMax, this->energy, this->energyLoadedMax, this->energyLoaded, this->minCharge, this->maxCharge);
     510
     511
    510512}
    511513
Note: See TracChangeset for help on using the changeset viewer.