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

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:

• trunk/src/world_entities/weapons/cannon.cc (modified) (1 diff)

trunk/src/world_entities/weapons/cannon.cc

@@ -87 +87 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+  this->setActionSound(WA_SHOOT, "sound/explo.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/cannon.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);