Changeset 7147 for code/branches/presentation3

Timestamp:

Jun 12, 2010, 12:39:14 PM (14 years ago)

Author:

youngk

Message:

MoodManager works fine now.

Location:

code/branches/presentation3/src/orxonox

Files:

• MoodManager.cc (modified) (3 diffs)
• MoodManager.h (modified) (1 diff)

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

@@ -46 +46 @@
         this->setConfigValues();
 
+        // Need to use a variable to store old data because ResetConfigValues() doesn't seem to work.
+        oldMood_ = MoodManager::defaultMood_;
+        
         // Checking for the existence of the folder for the default mood
-        /* Note: Currently Resource::exists(path) will always return false when the path field points to a folder.
-           MoodManager::checkMoodValidity() performs the same check. Please help.
-        */
-        const std::string& path = "ambient/" + MoodManager::defaultMood_ + '/';
+        const std::string& path = "ambient/" + MoodManager::defaultMood_ + "/.";
         if (!Resource::exists(path))
         {
@@ -69 +69 @@
     void MoodManager::setMood(const std::string& mood)
     {
+        oldMood_ = mood_;
         ModifyConfigValue(mood_, set, mood);
     }
@@ -75 +76 @@
     {
         //  Generic mood validation
-        const std::string& path = "ambient/" + mood_ + '/';
+        const std::string& path = "ambient/" + mood_ + "/.";
         if (!Resource::exists(path))
         {
             COUT(3) << "Mood " << mood_ << " does not exist. Will not change." << std::endl;
-            ResetConfigValue(mood_);
+            this->setMood(oldMood_);
         }
         else

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

@@ -82 +82 @@
             // config values
             std::string mood_;
+            std::string oldMood_;
             static const std::string defaultMood_;