Changeset 8608

Timestamp:

May 26, 2011, 4:58:18 PM (13 years ago)

Author:

landauf

Message:

removed some redundant code in MoodManager

Location:

code/branches/presentation/src/orxonox

Files:

• MoodManager.cc (modified) (2 diffs)
• MoodManager.h (modified) (1 diff)
• sound/AmbientSound.cc (modified) (2 diffs)

code/branches/presentation/src/orxonox/MoodManager.cc

@@ -93 +93 @@
 
 
-    std::string MoodListener::mood_s;
-
     MoodListener::MoodListener()
     {
@@ -102 +100 @@
     /*static*/ void MoodListener::changedMood(const std::string& mood)
     {
-        mood_s = mood;
         for (ObjectList<MoodListener>::iterator it = ObjectList<MoodListener>::begin(); it; ++it)
-            it->moodChanged(mood_s);
+            it->moodChanged(mood);
     }
 }

code/branches/presentation/src/orxonox/MoodManager.h

@@ -50 +50 @@
             virtual ~MoodListener() {}
 
-            const std::string& getMood() const { return mood_s; }
-
         private:
             virtual void moodChanged(const std::string& mood) = 0;
 
             static void changedMood(const std::string& mood);
-            static std::string mood_s;
     };
 

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

@@ -82 +82 @@
     {
         this->ambientSource_ = source;
-        this->moodChanged(this->getMood());
+        this->moodChanged(MoodManager::getInstance().getMood());
     }
 
@@ -89 +89 @@
         if (GameMode::playsSound())
         {
-            const std::string& path = "ambient/" + MoodManager::getInstance().getMood() + '/' + this->ambientSource_;
+            const std::string& path = "ambient/" + mood + '/' + this->ambientSource_;
             shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
             if (fileInfo != NULL)