Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5819 in orxonox.OLD for trunk/src/world_entities/weapons/test_gun.cc


Ignore:
Timestamp:
Nov 29, 2005, 11:07:43 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches world_entities to trunk again
merged with command
svn merge -r5795:HEAD branches/world_entities/ trunk/
no conflicts (what a wonder)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/weapons/test_gun.cc

    r5750 r5819  
    131131  //this->minCharge = 2;
    132132
    133   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
     133  this->setActionSound(WA_SHOOT, "sound/laser.wav");
     134  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
     135
    134136
    135137  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
Note: See TracChangeset for help on using the changeset viewer.