Changeset 6370 for code/branches/presentation2/src/orxonox/MoodManager.cc

Timestamp:

Dec 17, 2009, 11:10:39 AM (14 years ago)

Author:

rgrieder

Message:

Little cleanup in sound stuff and MoodManager.
Caution: Renamed SoundTypes to {All, Music, Effects}!

File:

• code/branches/presentation2/src/orxonox/MoodManager.cc (modified) (4 diffs)

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

@@ -41 +41 @@
     {
         RegisterRootObject(MoodManager);
-        moodOld_ = "default";
         this->setConfigValues();
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&MoodManager::setMood, this), "setMood"));
@@ -57 +56 @@
     }
 
-    /**
-     *  Sets the mood
-     *  @note TODO: Inform dependent classes of mood change
-     */
+    /** Sets the mood
+    @note
+        TODO: Inform dependent classes of mood change
+    */
     void MoodManager::setMood(const std::string& mood)
     {
@@ -66 +65 @@
     }
     
-    // gets the current mood
+    //! Gets the current mood
     const std::string& MoodManager::getMood()
     {
@@ -74 +73 @@
     void MoodManager::checkMoodValidity()
     {
-        if(mood_ != "default" && mood_ != "dnb")        // Insert new moods here
-        {
+        if (mood_ != "default" && mood_ != "dnb") // Insert new moods here; TODO: make this generic
             ResetConfigValue(mood_);
-        }
-        COUT(3) << "MoodManager: Mood now set to " << mood_ << std::endl;
-        return;
+        COUT(4) << "MoodManager: Mood set to " << mood_ << std::endl;
     }
 }