Changeset 4878

Timestamp:

Jun 14, 2007, 2:23:49 AM (17 years ago)

Author:

landauf

Message:

 

Location:

data/contentcreation/pps/FabianLandau/mover

Files:

• environments/mover.cc (modified) (4 diffs)
• sound (added)
• sound/sound_engine.cc (added)
• sound/sound_source.cc (added)
• sound/sound_source.h (added)

data/contentcreation/pps/FabianLandau/mover/environments/mover.cc

@@ -15 +15 @@
 
 #include "sound/resource_sound_buffer.h"
+#include "sound_engine.h"
 #include "util/loading/load_param_xml.h"
 #include "util/loading/load_param.h"
@@ -236 +237 @@
     if (this->triggers && this->triggers->isTriggered())
     {
-        this->soundSource_moving.play();
+        this->soundSource_moving.play(this->stations->getMovingSound(this->station), OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.5, true);
         return MOVE;
     }
@@ -278 +279 @@
 
     if (this->stations->getStartingSound(this->station).loaded())
-        this->soundSource_starting.play(this->stations->getStartingSound(this->station));
+        this->soundSource_starting.play(this->stations->getStartingSound(this->station), OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.5);
     if (this->stations->getMovingSound(this->station).loaded())
-        this->soundSource_moving.play(this->stations->getMovingSound(this->station), 1.0, true);
+        this->soundSource_moving.play(this->stations->getMovingSound(this->station), OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.5, true);
 
     this->time = 0;
@@ -315 +316 @@
 
         if (this->stations->getEndingSound(this->station).loaded())
-            this->soundSource_ending.play(this->stations->getEndingSound(this->station));
+            this->soundSource_ending.play(this->stations->getEndingSound(this->station), OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.5);
         this->soundSource_moving.stop();