Changeset 6406 for code/branches/presentation2/src/orxonox/sound/AmbientSound.cc

Timestamp:

Dec 23, 2009, 8:45:56 PM (16 years ago)

Author:

rgrieder

Message:

Mood changes should now be working and with immediate (but delayed because of loading) effect.

File:

• code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/sound/AmbientSound.cc

@@ -35 +35 @@
 #include "core/XMLPort.h"
 #include "SoundManager.h"
-#include "MoodManager.h"
 
 namespace orxonox
@@ -111 +110 @@
     {
         this->ambientSource_ = source;
+        this->moodChanged(this->getMood());
+    }
+
+    void AmbientSound::moodChanged(const std::string& mood)
+    {
         if (GameMode::playsSound())
         {
-            const std::string& path = "ambient/" + MoodManager::getInstance().getMood() + '/' + source;
+            const std::string& path = "ambient/" + MoodManager::getInstance().getMood() + '/' + this->ambientSource_;
             shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
             if (fileInfo != NULL)
                 this->setSource(path);
             else
-                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
+                COUT(3) << "Sound: " << this->ambientSource_ << ": Not a valid name! Ambient sound will not change." << std::endl;
         }
     }