Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 29, 2005, 11:07:43 AM (18 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/aiming_turret.cc

    r5769 r5819  
    4949
    5050  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
    51   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
     51  this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
    5252  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
    5353}
Note: See TracChangeset for help on using the changeset viewer.