[Orxonox-commit 1354] r6072 - in code/branches/sound3/src/orxonox: . gamestates

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-15 22:40:53 +0100 (Sun, 15 Nov 2009)
New Revision: 6072

Modified:
   code/branches/sound3/src/orxonox/MoodManager.cc
   code/branches/sound3/src/orxonox/MoodManager.h
   code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc
   code/branches/sound3/src/orxonox/gamestates/GSMainMenu.h
Log:
Removed some tabs.

Modified: code/branches/sound3/src/orxonox/MoodManager.cc
===================================================================
--- code/branches/sound3/src/orxonox/MoodManager.cc	2009-11-15 21:36:45 UTC (rev 6071)
+++ code/branches/sound3/src/orxonox/MoodManager.cc	2009-11-15 21:40:53 UTC (rev 6072)
@@ -43,7 +43,7 @@
         RegisterRootObject(MoodManager);
         moodOld_ = "default";
         this->setConfigValues();
-		CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&MoodManager::setMood, this), "setMood"));
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&MoodManager::setMood, this), "setMood"));
     }
 
     MoodManager::~MoodManager()
@@ -57,18 +57,20 @@
             .callback(this, &MoodManager::checkMoodValidity);
     }
 
-	/**
+    /**
      *  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()
     {

Modified: code/branches/sound3/src/orxonox/MoodManager.h
===================================================================
--- code/branches/sound3/src/orxonox/MoodManager.h	2009-11-15 21:36:45 UTC (rev 6071)
+++ code/branches/sound3/src/orxonox/MoodManager.h	2009-11-15 21:40:53 UTC (rev 6072)
@@ -52,13 +52,13 @@
 
             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_;
             std::string moodOld_;

Modified: code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc	2009-11-15 21:36:45 UTC (rev 6071)
+++ code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc	2009-11-15 21:40:53 UTC (rev 6072)
@@ -49,7 +49,7 @@
         : GameState(info)
         , inputState_(0)
     {
-		RegisterRootObject(GSMainMenu);
+        RegisterRootObject(GSMainMenu);
         inputState_ = InputManager::getInstance().createInputState("mainMenu");
         inputState_->setMouseMode(MouseMode::Nonexclusive);
         inputState_->setHandler(GUIManager::getInstancePtr());
@@ -92,9 +92,9 @@
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startDedicated), "startDedicated"));
         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();
         InputManager::getInstance().enterState("mainMenu");
@@ -105,7 +105,7 @@
             this->ambient_->play(); // works without source
         }
 
-		this->setConfigValues();
+        this->setConfigValues();
     }
 
     void GSMainMenu::deactivate()
@@ -125,27 +125,30 @@
     {
     }
 
-	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()
     {

Modified: code/branches/sound3/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- code/branches/sound3/src/orxonox/gamestates/GSMainMenu.h	2009-11-15 21:36:45 UTC (rev 6071)
+++ code/branches/sound3/src/orxonox/gamestates/GSMainMenu.h	2009-11-15 21:40:53 UTC (rev 6072)
@@ -47,10 +47,10 @@
         void deactivate();
         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();
         static void startServer();
@@ -66,7 +66,7 @@
 
         // ambient sound for the main menu
         AmbientSound*     ambient_;
-		std::string		  soundPathMain_;
+        std::string       soundPathMain_;
     };
 }