Changeset 6072

Timestamp:

Nov 15, 2009, 10:40:53 PM (14 years ago)

Author:

rgrieder

Message:

Removed some tabs.

Location:

code/branches/sound3/src/orxonox

Files:

• MoodManager.cc (modified) (2 diffs)
• MoodManager.h (modified) (1 diff)
• gamestates/GSMainMenu.cc (modified) (4 diffs)
• gamestates/GSMainMenu.h (modified) (2 diffs)

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

@@ -44 +44 @@
         moodOld_ = "default";
         this->setConfigValues();
-                CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&MoodManager::setMood, this), "setMood"));
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&MoodManager::setMood, this), "setMood"));
     }
 
@@ -58 +58 @@
     }
 
-        /**
+    /**
      *  Sets the mood
      *  @note TODO: Inform dependent classes of mood change
      */
-        void MoodManager::setMood(const std::string& mood) {
-                ModifyConfigValue(mood_, set, mood);
-        }
-        
-        // gets the current mood
-        const std::string& MoodManager::getMood() {
-                return mood_;
-        }
+    void MoodManager::setMood(const std::string& mood)
+    {
+        ModifyConfigValue(mood_, set, mood);
+    }
+    
+    // gets the current mood
+    const std::string& MoodManager::getMood()
+    {
+        return mood_;
+    }
 
     void MoodManager::checkMoodValidity()

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

@@ -53 +53 @@
             void setConfigValues();
 
-                        void setMood(const std::string& mood);
-                        const std::string& getMood();
+            void setMood(const std::string& mood);
+            const std::string& getMood();
 
             static MoodManager& getInstance()    { return Singleton<MoodManager>::getInstance(); } // tolua_export
 
         private:
-           
+
             // config values
             std::string mood_;

code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc

@@ -50 +50 @@
         , inputState_(0)
     {
-                RegisterRootObject(GSMainMenu);
+        RegisterRootObject(GSMainMenu);
         inputState_ = InputManager::getInstance().createInputState("mainMenu");
         inputState_->setMouseMode(MouseMode::Nonexclusive);
@@ -93 +93 @@
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startMainMenu), "startMainMenu"));
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startIOConsole), "startIOConsole"));
-                
-                // create command to change sound path
-                CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::setMainMenuSoundPath, this), "setMMSoundPath"));
+        
+        // create command to change sound path
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::setMainMenuSoundPath, this), "setMMSoundPath"));
 
         KeyBinderManager::getInstance().setToDefault();
@@ -106 +106 @@
         }
 
-                this->setConfigValues();
+        this->setConfigValues();
     }
 
@@ -126 +126 @@
     }
 
-        void GSMainMenu::setConfigValues()
+    void GSMainMenu::setConfigValues()
     {
         SetConfigValue(soundPathMain_, "mainmenu.wav")
             .description("Contains the path to the main menu sound file.")
-                        .callback(this, &GSMainMenu::reloadSound);
+            .callback(this, &GSMainMenu::reloadSound);
     }
 
-        void GSMainMenu::reloadSound() {
-                if (GameMode::playsSound())
+    void GSMainMenu::reloadSound()
+    {
+        if (GameMode::playsSound())
         {
             this->ambient_->setAmbientSource(soundPathMain_);
-                }
-        }
+        }
+    }
 
-        const std::string& GSMainMenu::getMainMenuSoundPath() {
-                return soundPathMain_;
-        }
+    const std::string& GSMainMenu::getMainMenuSoundPath()
+    {
+        return soundPathMain_;
+    }
 
-        void GSMainMenu::setMainMenuSoundPath(const std::string& path) {
-                ModifyConfigValue(soundPathMain_, set, path);
-        }
+    void GSMainMenu::setMainMenuSoundPath(const std::string& path)
+    {
+        ModifyConfigValue(soundPathMain_, set, path);
+    }
 
     void GSMainMenu::startStandalone()

code/branches/sound3/src/orxonox/gamestates/GSMainMenu.h

@@ -48 +48 @@
         void update(const Clock& time);
 
-                void setConfigValues();
-                void reloadSound();
-                const std::string& getMainMenuSoundPath();
-                void setMainMenuSoundPath(const std::string& path);
+        void setConfigValues();
+        void reloadSound();
+        const std::string& getMainMenuSoundPath();
+        void setMainMenuSoundPath(const std::string& path);
 
         static void startStandalone();
@@ -67 +67 @@
         // ambient sound for the main menu
         AmbientSound*     ambient_;
-                std::string               soundPathMain_;
+        std::string       soundPathMain_;
     };
 }